Use request ID as task description (#1451)

Currently task ID is used as a key in the map. This is OK while there
is only one session because task ID is unique inside the session.
We are creating separate session for requests with proxy so task ID
is not unique anymore. Request ID is unique across the Network instance
and task description is available same a the task ID.

Relates-To: OLPEDGE-2846

Signed-off-by: Rustam Gamidov <ext-rustam.gamidov@here.com>

Author: rustam-gamidov-here

olp-cpp-sdk-core/src/http/ios/OLPHttpClient.mm

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 HERE Europe B.V.
+ * Copyright (C) 2019-2023 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -127,10 +127,10 @@ - (OLPHttpTask*)taskWithId:(olp::http::RequestId)identifier {
   return task;
 }
 
-- (OLPHttpTask*)taskWithTaskIdentifier:(NSUInteger)taskId {
+- (OLPHttpTask*)taskWithTaskDescription:(NSString*)taskDescription {
   OLPHttpTask* task = nil;
   @synchronized(_tasks) {
-    task = self.idTaskMap[@(taskId)];
+    task = [self.idTaskMap objectForKey:taskDescription];
   }
   return task;
 }
@@ -154,7 +154,7 @@ - (void)removeTaskWithId:(olp::http::RequestId)identifier {
     OLPHttpTask* task = _tasks[@(identifier)];
     if (task.dataTask) {
       [task.dataTask cancel];
-      [self.idTaskMap removeObjectForKey:@(task.dataTask.taskIdentifier)];
+      [self.idTaskMap removeObjectForKey:[task createTaskDescription]];
     }
     [_tasks removeObjectForKey:@(identifier)];
     [self.urlSessions removeObjectForKey:@(identifier)];
@@ -176,7 +176,7 @@ - (void)URLSession:(NSURLSession*)session
   }
 
   @autoreleasepool {
-    OLPHttpTask* httpTask = [self taskWithTaskIdentifier:task.taskIdentifier];
+    OLPHttpTask* httpTask = [self taskWithTaskDescription:task.taskDescription];
     if ([httpTask isValid]) {
       [httpTask didCompleteWithError:error];
       [self removeTaskWithId:httpTask.requestId];
@@ -207,7 +207,7 @@ - (void)URLSession:(NSURLSession*)session
 
   @autoreleasepool {
     OLPHttpTask* httpTask =
-        [self taskWithTaskIdentifier:dataTask.taskIdentifier];
+        [self taskWithTaskDescription:dataTask.taskDescription];
     if ([httpTask isValid] && ![httpTask isCancelled]) {
       [httpTask didReceiveResponse:response];
     } else {
@@ -236,7 +236,7 @@ - (void)URLSession:(NSURLSession*)session
 
   @autoreleasepool {
     OLPHttpTask* httpTask =
-        [self taskWithTaskIdentifier:dataTask.taskIdentifier];
+        [self taskWithTaskDescription:dataTask.taskDescription];
     if ([httpTask isValid] && ![httpTask isCancelled]) {
       [httpTask didReceiveData:data];
     } else {
@@ -267,7 +267,7 @@ - (void)URLSession:(NSURLSession*)session
             isEqualToString:NSURLAuthenticationMethodServerTrust]) {
       if (dataTask) {
         OLPHttpTask* httpTask =
-            [self taskWithTaskIdentifier:dataTask.taskIdentifier];
+            [self taskWithTaskDescription:dataTask.taskDescription];
         if (![httpTask isValid]) {
           return;
         }
@@ -429,9 +429,9 @@ - (NSURLSession*)urlSessionWithProxy:
 
 - (void)registerDataTask:(NSURLSessionDataTask*)dataTask
              forHttpTask:(OLPHttpTask*)httpTask {
-  NSNumber* identifier = @(dataTask.taskIdentifier);
+  NSString* identifier = dataTask.taskDescription;
   @synchronized(_tasks) {
-    self.idTaskMap[identifier] = httpTask;
+    [self.idTaskMap setValue:httpTask forKey:identifier];
   }
 }
 

olp-cpp-sdk-core/src/http/ios/OLPHttpTask+Internal.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 HERE Europe B.V.
+ * Copyright (C) 2019-2023 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,4 +35,6 @@
 
 - (void)didCompleteWithError:(NSError*)error;
 
+- (NSString*)createTaskDescription;
+
 @end

olp-cpp-sdk-core/src/http/ios/OLPHttpTask.mm

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 HERE Europe B.V.
+ * Copyright (C) 2019-2023 HERE Europe B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,6 +98,7 @@ - (OLPHttpTaskStatus)run {
   @synchronized(self) {
     if (!self.isCancelled) {
       _dataTask = [_urlSession dataTaskWithRequest:request];
+      _dataTask.taskDescription = [self createTaskDescription];
     }
   }
 
@@ -226,6 +227,10 @@ - (void)didReceiveData:(NSData*)data {
   }
 }
 
+- (NSString*) createTaskDescription {
+  return [NSString stringWithFormat:@"%llu", self.requestId];
+}
+
 #pragma mark - Inquiry methods
 
 - (BOOL)isValid {