Refactor header handling in _sendRequestAndWaitResponse function for clarity

Author: yannicktrinh

Project/Sources/Classes/Office365Category.4dm

@@ -3,41 +3,37 @@ Class extends _GraphAPI
 property userId : Text:=""
 
 Class constructor($inProvider : cs.OAuth2Provider; $inParameters : Object)
-    
-    Super($inProvider)
-    This.userId:=(Length(String($inParameters.userId))>0) ? String($inParameters.userId) : ""
-
-
+	
+	Super($inProvider)
+	This.userId:=(Length(String($inParameters.userId))>0) ? String($inParameters.userId) : ""
+	
+	
 	// Mark: - [Public]
-    // ----------------------------------------------------
-    
-    
+	// ----------------------------------------------------
+	
+	
 Function list : cs.GraphCategoryList
-    
+	
 /*
         GET /me/outlook/masterCategories
         GET /users/{id|userPrincipalName}/outlook/masterCategories
 */
-    Super._clearErrorStack()
-    Super._throwErrors(False)
-    
-    var $headers : Object:={}
-    var $urlParams : Text:=""
-    
-    If (Length(String(This.userId))>0)
-        $urlParams:="users/"+This.userId
-    Else 
-        $urlParams:="me"
-    End if 
-    $urlParams+="/outlook/masterCategories"+Super._getURLParamsFromObject($inParameters)
-    
-    If ((Value type($inParameters.search)=Is text) && (Length(String($inParameters.search))>0))
-        $headers.ConsistencyLevel:="eventual"
-    End if 
-    
-    var $URL : Text:=This._getURL()+$urlParams
-    var $result : cs.GraphCategoryList:=cs.GraphCategoryList.new(This._getOAuth2Provider(); $URL; $headers)
-    
-    Super._throwErrors(True)
-    
-    return $result
+	Super._clearErrorStack()
+	Super._throwErrors(False)
+	
+	var $headers : Object:={}
+	var $urlParams : Text:=""
+	
+	If (Length(String(This.userId))>0)
+		$urlParams:="users/"+This.userId
+	Else 
+		$urlParams:="me"
+	End if 
+	$urlParams+="/outlook/masterCategories"
+	
+	var $URL : Text:=This._getURL()+$urlParams
+	var $result : cs.GraphCategoryList:=cs.GraphCategoryList.new(This._getOAuth2Provider(); $URL; $headers)
+	
+	Super._throwErrors(True)
+	
+	return $result

Project/Sources/Classes/_BaseAPI.4dm

@@ -120,7 +120,8 @@ Function _sendRequestAndWaitResponse($inMethod : Text; $inURL : Text; $inHeaders
 
 				: ($contentType="multipart/@")
 					var $headers : Text:="HTTP/1.1 "+This._internals._statusLine+"\r\n"
-					$keys:=OB Keys($request.response.headers)
+					var $keys : Collection:=OB Keys($request.response.headers)
+					var $key : Text
 					For each ($key; $keys)
 						$headers+=$key+": "+$request.response.headers[$key]+"\r\n"
 					End for each