Decorator: use RXRHTTPRequestSerializer to encode request url

Rexxar/Core/Extension/RXRURLRequestSerialization.h

@@ -1,23 +1,11 @@
-// RXRURLRequestSerialization.h
-// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+//  UIColor+Rexxar.h
+//  Rexxar
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+//  Created by bigyelow on 11/24/16.
+//  Copyright © 2016 Douban.Inc. All rights reserved.
+//  Note: This file is copied from AFURLRequestSerialization.h
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
 
 #import <Foundation/Foundation.h>
 #import <TargetConditionals.h>

Rexxar/Core/Extension/RXRURLRequestSerialization.m

@@ -1,23 +1,11 @@
-// RXRURLRequestSerialization.m
-// Copyright (c) 2011–2016 Alamofire Software Foundation ( http://alamofire.org/ )
 //
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
+//  UIColor+Rexxar.h
+//  Rexxar
 //
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
+//  Created by bigyelow on 11/24/16.
+//  Copyright © 2016 Douban.Inc. All rights reserved.
+//  Note: This file is copied from AFURLRequestSerialization.m
 //
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
 
 #import "RXRURLRequestSerialization.h"
 

Rexxar/Decorator/RXRRequestDecorator.m

@@ -6,6 +6,7 @@
 //  Copyright © 2016 Douban.Inc. All rights reserved.
 //
 
+#import "RXRURLRequestSerialization.h"
 #import "RXRRequestDecorator.h"
 
 #import "NSURL+Rexxar.h"
@@ -42,7 +43,7 @@ - (void)decorateRequest:(NSMutableURLRequest *)request
   }];
 
   // Request url parameters
-  NSMutableDictionary *parametersEncoded = [NSMutableDictionary dictionaryWithDictionary:self.parameters];
+  NSMutableDictionary *parameters = [NSMutableDictionary dictionaryWithDictionary:self.parameters];
   for (NSString *pair in [request.URL.query componentsSeparatedByString:@"&"]) {
 
     NSArray *keyValuePair = [pair componentsSeparatedByString:@"="];
@@ -51,17 +52,14 @@ - (void)decorateRequest:(NSMutableURLRequest *)request
     }
 
     NSString *key = [keyValuePair[0] stringByRemovingPercentEncoding];
-    if (parametersEncoded[key] == nil) {
-      parametersEncoded[key] = [keyValuePair[1] stringByRemovingPercentEncoding];
+    if (parameters[key] == nil) {
+      parameters[key] = [keyValuePair[1] stringByRemovingPercentEncoding];
     }
   }
 
-  NSString *query = [NSURL rxr_queryFromDictionary:parametersEncoded];
-  if (query) {
-    NSURLComponents *urlComps = [NSURLComponents componentsWithURL:request.URL resolvingAgainstBaseURL:YES];
-    urlComps.query = query;
-    request.URL = urlComps.URL;
-  }
+  request = [[[RXRHTTPRequestSerializer serializer] requestBySerializingRequest:request
+                                                                 withParameters:parameters
+                                                                          error:nil] mutableCopy];
 }
 
 @end