Remove unnecessary init parameter in STHTTPNetTaskQueueHandler.

kevin-lyn · kevin-lyn · commit 96d6d8ee1d48 · 2015-05-07T16:08:04.000+08:00
diff --git a/STNetTaskQueue/STHTTPNetTaskQueueHandler.h b/STNetTaskQueue/STHTTPNetTaskQueueHandler.h
@@ -11,6 +11,6 @@
 
 @interface STHTTPNetTaskQueueHandler : NSObject<STNetTaskQueueHandler>
 
-- (instancetype)initWithQueue:(STNetTaskQueue *)queue baseURL:(NSURL *)baseURL;
+- (instancetype)initWithBaseURL:(NSURL *)baseURL;
 
 @end
diff --git a/STNetTaskQueue/STHTTPNetTaskQueueHandler.m b/STNetTaskQueue/STHTTPNetTaskQueueHandler.m
@@ -13,13 +13,11 @@
 @implementation STHTTPNetTaskQueueHandler
 {
     AFHTTPSessionManager *_httpManager;
-    STNetTaskQueue *_queue;
 }
 
-- (instancetype)initWithQueue:(STNetTaskQueue *)queue baseURL:(NSURL *)baseURL
+- (instancetype)initWithBaseURL:(NSURL *)baseURL
 {
     if (self = [super init]) {
-        _queue = queue;
         _httpManager = [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL];
     }
     return self;
@@ -30,11 +28,11 @@ - (void)netTaskQueue:(STNetTaskQueue *)netTaskQueue task:(STNetTask *)task taskI
     NSAssert([task isKindOfClass:[STHTTPNetTask class]], @"Should be subclass of STHTTPNetTask");
     
     void (^success)(NSURLSessionDataTask *, id) = ^(NSURLSessionDataTask *task, id responseObject) {
-        [_queue didResponse:responseObject taskId:taskId];
+        [netTaskQueue didResponse:responseObject taskId:taskId];
     };
     
     void (^failure)(NSURLSessionDataTask *, NSError *) = ^(NSURLSessionDataTask *task, NSError *error) {
-        [_queue didFailWithError:error taskId:taskId];
+        [netTaskQueue didFailWithError:error taskId:taskId];
     };
     
     STHTTPNetTask *httpTask = (STHTTPNetTask *)task;
@@ -73,7 +71,7 @@ - (void)netTaskQueue:(STNetTaskQueue *)netTaskQueue task:(STNetTask *)task taskI
             break;
         case STHTTPNetTaskHead: {
             [_httpManager HEAD:[httpTask uri] parameters:parameters success:^(NSURLSessionDataTask *task) {
-                [_queue didResponse:@{} taskId:taskId];
+                [netTaskQueue didResponse:@{} taskId:taskId];
             } failure:failure];
         }
             break;
diff --git a/STNetTaskQueueExample/AppDelegate.m b/STNetTaskQueueExample/AppDelegate.m
@@ -21,8 +21,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 {
     // Setup up shared STNetTaskQUeue
     NSURL *baseUrl = [NSURL URLWithString:@"http://api.openweathermap.org"];
-    STHTTPNetTaskQueueHandler *httpHandler = [[STHTTPNetTaskQueueHandler alloc] initWithQueue:[STNetTaskQueue sharedQueue]
-                                                                                      baseURL:baseUrl];
+    STHTTPNetTaskQueueHandler *httpHandler = [[STHTTPNetTaskQueueHandler alloc] initWithBaseURL:baseUrl];
     [STNetTaskQueue sharedQueue].handler = httpHandler;
     
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(`
`21`	`21`	`{`
`22`	`22`	`// Setup up shared STNetTaskQUeue`
`23`	`23`	`NSURL *baseUrl = [NSURL URLWithString:@"http://api.openweathermap.org"];`
`24`		`- STHTTPNetTaskQueueHandler *httpHandler = [[STHTTPNetTaskQueueHandler alloc] initWithQueue:[STNetTaskQueue sharedQueue]`
`25`		`- baseURL:baseUrl];`
	`24`	`+ STHTTPNetTaskQueueHandler *httpHandler = [[STHTTPNetTaskQueueHandler alloc] initWithBaseURL:baseUrl];`
`26`	`25`	`[STNetTaskQueue sharedQueue].handler = httpHandler;`
`27`	`26`
`28`	`27`	`self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];`