Refactored

lib/context.js

@@ -356,29 +356,32 @@
          *
          * @method splunkjs.Context
          */
-        get: function(path, params, callback) {
+        get: function(path, params, callback, isAsync) {
             var that = this;
-            var request = function(callback) {
+
+            if(isAsync) {
                 return that.http.get(
                     that.urlify(path),
                     that._headers(),
                     params,
                     that.timeout,
-                    callback
+                    null,
+                    true
                 );
-            };
-
-            return this._requestWrapper(request, callback);
-        },
-
-        getAsync: function(path, params) {
-            var that = this;
-            return that.http.getAsync(
-                that.urlify(path),
-                that._headers(),
-                params,
-                that.timeout,
-            );
+            }
+            else {
+                var request = function(callback) {
+                    return that.http.get(
+                        that.urlify(path),
+                        that._headers(),
+                        params,
+                        that.timeout,
+                        callback
+                    );
+                };
+
+                return this._requestWrapper(request, callback);
+            }
         },
 
         /**

lib/http.js

@@ -133,26 +133,15 @@
          *
          * @method splunkjs.Http
          */
-        get: function(url, headers, params, timeout, callback) {
+        get: function(url, headers, params, timeout, callback, isAsync) {
             var message = {
                 method: "GET",
                 headers: headers,
                 timeout: timeout,
                 query: params
             };
 
-            return this.request(url, message, callback);
-        },
-
-        getAsync: function(url, headers, params, timeout) {
-            var message = {
-                method: "GET",
-                headers: headers,
-                timeout: timeout,
-                query: params
-            };
-
-            return this.request(url, message, true);
+            return this.request(url, message, callback, isAsync);
         },
 
         /**
@@ -213,7 +202,7 @@
          * @method splunkjs.Http
          * @see makeRequest
          */
-        request: function(url, message, callback) {
+        request: function(url, message, callback, isAsync) {
             var that = this;
             var query = utils.getWithVersion(this.version, queryBuilderMap)(message);
             var post = message.post || {};
@@ -241,7 +230,7 @@
 
             // Now we can invoke the user-provided HTTP class,
             // passing in our "wrapped" callback
-            if(callback && typeof callback === 'boolean') {
+            if(isAsync) {
                 return this.makeRequestAsync(encodedUrl, options);
             }
             else {

lib/service.js

@@ -717,7 +717,7 @@
          *
          * @method splunkjs.Service.Endpoint
          */
-        get: function(relpath, params, callback) {
+        get: function(relpath, params, callback, isAsync) {
             var url = this.qualifiedPath;
 
             // If we have a relative path, we will append it with a preceding
@@ -729,22 +729,8 @@
             return this.service.get(
                 url,
                 params,
-                callback
-            );
-        },
-
-        getAsync: function(relpath, params) {
-            var url = this.qualifiedPath;
-
-            // If we have a relative path, we will append it with a preceding
-            // slash.
-            if (relpath) {
-                url = url + "/" + relpath;    
-            }
-
-            return this.service.getAsync(
-                url,
-                params,
+                callback,
+                isAsync
             );
         },
 
@@ -1417,7 +1403,7 @@
             }
 
             var that = this;
-            var response = await that.getAsync("", options);
+            var response = await that.get("", options, null, true);
             that._load(response.body);
             return that;
         },
@@ -3125,7 +3111,7 @@
                 var that = this;
 
                 // 1. Fetch files list
-                var response = await this.getAsync("",  {__conf: filename});
+                var response = await this.get("",  {__conf: filename}, null, true);
 
                 // 2. Filter the files
                 var files = response 
@@ -3169,7 +3155,7 @@
             }
         },
 
-        createAsync: async function (configs, svc, filename, stanza, keyValueMap, callback) {
+        createAsync: async function (filename, stanza, keyValueMap, callback) {
             callback = callback || function() {};
             var that = this;
 

tests/service_tests/configuration.js

@@ -159,7 +159,7 @@ exports.setup = function (svc) {
                         keyValueMap[property1] = value1;
                         keyValueMap[property2] = value2;
 
-                        configs.createAsync(configs, svc, filename, stanza, keyValueMap, done);
+                        configs.createAsync(filename, stanza, keyValueMap, done);
                     },
                     async function (done) {
                         var configs = svc.configurations(namespace);