Removed obsolated methods from HttpRequest class and updated tests to reflect that...

[arvados.git] / sdk / R / R / HttpRequest.R

diff --git a/sdk/R/R/HttpRequest.R b/sdk/R/R/HttpRequest.R
index 3076eedf9adfe899712c29527413cb53fccdbad7..2a5c4fa556817f6ae650674ddeced7ab7026cf7a 100644 (file)
--- a/sdk/R/R/HttpRequest.R
+++ b/sdk/R/R/HttpRequest.R
@@ -1,117 +1,58 @@
-source("./R/custom_classes.R")
+source("./R/util.R")
 
-HttpRequest <- setRefClass(
+HttpRequest <- R6::R6Class(
 
     "HttrRequest",
 
-    fields = list(
-        send_method         = "character",
-        server_base_url     = "character",
-        server_relative_url = "character",
-        auth_token          = "character",
-        allowed_methods     = "list",
-        query_filters       = "ANY",
-        response_limit      = "ANY",
-        query_offset        = "ANY"
-    ),
+    public = list(
 
-    methods = list(
-        initialize = function(method,
-                              token,
-                              base_url,
-                              relative_url,
-                              filters = NULL,
-                              limit = 100,
-                              offset = 0) 
-        {
-            send_method         <<- method
-            auth_token          <<- token
-            server_base_url     <<- base_url
-            server_relative_url <<- relative_url
-            query_filters       <<- filters
-            response_limit      <<- limit
-            query_offset        <<- offset
-        },
+        validContentTypes = NULL,
+        validVerbs = NULL,
 
-        execute = function() 
+        initialize = function() 
         {
-            http_method <- switch(send_method,
-                                  "GET"    = .self$getRequest,
-                                  "POST"   = .self$postRequest,
-                                  "PUT"    = .self$putRequest,
-                                  "DELETE" = .self$deleteRequest,
-                                  "PATCH"  = .self$pathcRequest)
-            http_method()
+            self$validContentTypes <- c("text", "raw")
+            self$validVerbs <- c("GET", "POST", "PUT", "DELETE", "PROPFIND", "MOVE")
         },
 
-        getRequest = function() 
+        exec = function(verb, url, headers = NULL, body = NULL, queryParams = NULL,
+                        retryTimes = 0)
         {
-            requestHeaders <- httr::add_headers(Authorization = .self$getAuthHeader())
-            requestQuery   <- .self$generateQuery()
-            url            <- paste0(server_base_url, server_relative_url, requestQuery)
+            if(!(verb %in% self$validVerbs))
+                stop("Http verb is not valid.")
 
-            server_data <- httr::GET(url    = url,
-                                     config = requestHeaders)
-        },
+            headers  <- httr::add_headers(unlist(headers))
+            urlQuery <- self$createQuery(queryParams)
+            url      <- paste0(url, urlQuery)
 
-        #Todo(Fudo): Try to make this more generic
-        postRequest = function() 
-        {
-            #Todo(Fudo): Implement this later on.
-            print("POST method")
+            # times = 1 regular call + numberOfRetries
+            response <- httr::RETRY(verb, url = url, body = body,
+                                    config = headers, times = retryTimes + 1)
         },
 
-        putRequest = function() 
+        createQuery = function(queryParams)
         {
-            #Todo(Fudo): Implement this later on.
-            print("PUT method")
-        },
-
-        deleteRequest = function() 
-        {
-            #Todo(Fudo): Implement this later on.
-            print("DELETE method")
-        },
+            queryParams <- Filter(Negate(is.null), queryParams)
 
-        pathcRequest = function() 
-        {
-            #Todo(Fudo): Implement this later on.
-            print("PATCH method")
-        },
+            query <- sapply(queryParams, function(param)
+            {
+                if(is.list(param) || length(param) > 1)
+                    param <- RListToPythonList(param, ",")
 
-        getAuthHeader = function() 
-        {
-            auth_method <- "OAuth2"
-            auth_header <- paste(auth_method, auth_token)
-        },
+                URLencode(as.character(param), reserved = T, repeated = T)
 
-        generateQuery = function() 
-        {
-            finalQuery <- ""
+            }, USE.NAMES = TRUE)
 
-            if(!is.null(query_filters))
+            if(length(query) > 0)
             {
-                filters <- sapply(query_filters, function(filter)
-                {
-                    filter <- sapply(filter, function(component) 
-                    {
-                        component <- paste0("\"", component, "\"")
-                    })
-                    
-                    queryParameter <- paste(filter, collapse = ",+")
-                    queryParameter <- paste0("[[", queryParameter, "]]")
-                })
-
-                encodedQuery <- URLencode(filters, reserved = T, repeated = T)
-
-                #Todo(Fudo): Hardcoded for now. Look for a better solution.
-                finalQuery <- paste0("?alt=json&filters=", encodedQuery)
-
-                #Todo(Fudo): This is a hack for now. Find a proper solution.
-                finalQuery <- str_replace_all(finalQuery, "%2B", "+")
+                query <- paste0(names(query), "=", query, collapse = "&")
+
+                return(paste0("/?", query))
             }
 
-            finalQuery
+            return("")
         }
-    )
+    ),
+
+    cloneable = FALSE
 )