- replace all "async" variables to "asyncHandler"

Author: Valodya

src/cache/cache-methods.js

@@ -3,23 +3,19 @@ import Urls from '../urls'
 import Request from '../request'
 
 //TODO: rename me
-export function cacheMethod(method, key, contain, async) {
+export function cacheMethod(method, key, contain, asyncHandler) {
   if (!Utils.isString(key)) {
     throw new Error('The "key" argument must be String')
   }
 
-  //TODO: refactor me
-  let responder = async
-  const isAsync = !!responder
-
-  if (responder) {
-    responder = Utils.wrapAsync(responder)
+  if (asyncHandler) {
+    asyncHandler = Utils.wrapAsync(asyncHandler)
   }
 
   return Request.send({
     method      : method,
     url         : contain ? Urls.cacheItemCheck(key) : Urls.cacheItem(key),
-    isAsync     : isAsync,
-    asyncHandler: responder
+    isAsync     : !!asyncHandler,
+    asyncHandler: asyncHandler
   })
 }

src/cache/contains.js

@@ -1,5 +1,5 @@
 import { cacheMethod } from './cache-methods'
 
-export function contains(key, async) {
-  return cacheMethod('GET', key, true, async)
+export function contains(key, asyncHandler) {
+  return cacheMethod('GET', key, true, asyncHandler)
 }

src/cache/put.js

@@ -3,28 +3,28 @@ import Urls from '../urls'
 import Async from '../request/async'
 import Request from '../request'
 
-export function put(key, value, timeToLive, async) {
+export function put(key, value, timeToLive, asyncHandler) {
   if (!Utils.isString(key)) {
     throw new Error('You can use only String as key to put into Cache')
   }
 
   if (!(timeToLive instanceof Async)) {
     if (typeof timeToLive === 'object' && !arguments[3]) {
-      async = timeToLive
+      asyncHandler = timeToLive
       timeToLive = null
     } else if (typeof timeToLive !== ('number' || 'string') && timeToLive != null) {
       throw new Error('You can use only String as timeToLive attribute to put into Cache')
     }
   } else {
-    async = timeToLive
+    asyncHandler = timeToLive
     timeToLive = null
   }
 
   if (Utils.isObject(value) && value.constructor !== Object) {
     value.___class = value.___class || Utils.getClassName(value)
   }
 
-  let responder = Utils.extractResponder([async])
+  let responder = Utils.extractResponder([asyncHandler])
   const isAsync = !!responder
 
   if (responder) {

src/cache/remove.js

@@ -1,5 +1,5 @@
 import { cacheMethod } from './cache-methods'
 
-export function remove(key, async) {
-  return cacheMethod('DELETE', key, false, async)
+export function remove(key, asyncHandler) {
+  return cacheMethod('DELETE', key, false, asyncHandler)
 }

src/commerce/cancel-play-subscription.js

@@ -4,18 +4,18 @@ import Request from '../request'
 
 import { validateStringArgument } from './validate-string-argument'
 
-export function cancelPlaySubscription(packageName, subscriptionId, token, async) {
+export function cancelPlaySubscription(packageName, subscriptionId, token, asyncHandler) {
   validateStringArgument('Package Name', packageName)
   validateStringArgument('Subscription Id', subscriptionId)
   validateStringArgument('Token', token)
 
-  if (async) {
-    async = Utils.wrapAsync(async)
+  if (asyncHandler) {
+    asyncHandler = Utils.wrapAsync(asyncHandler)
   }
 
   return Request.post({
     url         : Urls.commerceSubCancel(packageName, subscriptionId, token),
-    isAsync     : !!async,
-    asyncHandler: async
+    isAsync     : !!asyncHandler,
+    asyncHandler: asyncHandler
   })
 }

src/commerce/get-play-subscription-status.js

@@ -4,18 +4,18 @@ import Request from '../request'
 
 import { validateStringArgument } from './validate-string-argument'
 
-export function getPlaySubscriptionStatus(packageName, subscriptionId, token, async) {
+export function getPlaySubscriptionStatus(packageName, subscriptionId, token, asyncHandler) {
   validateStringArgument('Package Name', packageName)
   validateStringArgument('Subscription Id', subscriptionId)
   validateStringArgument('Token', token)
 
-  if (async) {
-    async = Utils.wrapAsync(async)
+  if (asyncHandler) {
+    asyncHandler = Utils.wrapAsync(asyncHandler)
   }
 
   return Request.get({
     url         : Urls.commerceSubStatus(packageName, subscriptionId, token),
-    isAsync     : !!async,
-    asyncHandler: async
+    isAsync     : !!asyncHandler,
+    asyncHandler: asyncHandler
   })
 }

src/commerce/validate-play-purchase.js

@@ -4,18 +4,18 @@ import Request from '../request'
 
 import { validateStringArgument } from './validate-string-argument'
 
-export function validatePlayPurchase(packageName, productId, token, async) {
+export function validatePlayPurchase(packageName, productId, token, asyncHandler) {
   validateStringArgument('Package Name', packageName)
   validateStringArgument('Product Id', productId)
   validateStringArgument('Token', token)
 
-  if (async) {
-    async = Utils.wrapAsync(async)
+  if (asyncHandler) {
+    asyncHandler = Utils.wrapAsync(asyncHandler)
   }
 
   return Request.get({
     url         : Urls.commerceValidate(packageName, productId, token),
-    isAsync     : !!async,
-    asyncHandler: async
+    isAsync     : !!asyncHandler,
+    asyncHandler: asyncHandler
   })
 }

src/commerce/validate-string-argument.js

@@ -7,19 +7,3 @@ export function validateStringArgument(label, value) {
     throw new Error(`${label} be provided and must be not an empty STRING!`)
   }
 }
-
-export function cancelPlaySubscription(packageName, subscriptionId, token, async) {
-  validateStringArgument('Package Name', packageName)
-  validateStringArgument('Subscription Id', subscriptionId)
-  validateStringArgument('Token', token)
-
-  if (async) {
-    async = Utils.wrapAsync(async)
-  }
-
-  return Request.post({
-    url         : Urls.commerceSubCancel(packageName, subscriptionId, token),
-    isAsync     : !!async,
-    asyncHandler: async
-  })
-}

src/counters/add-and-get.js

@@ -1,5 +1,5 @@
 import { implementMethodWithValue } from './implement-method-with-value'
 
-export function addAndGet(counterName, value, async) {
-  return implementMethodWithValue(counterName, 'incrementby/get' + '?value=', value, async)
+export function addAndGet(counterName, value, asyncHandler) {
+  return implementMethodWithValue(counterName, 'incrementby/get' + '?value=', value, asyncHandler)
 }

src/counters/decrement-and-get.js

@@ -1,5 +1,5 @@
 import { implementMethod } from './implement-method'
 
-export function decrementAndGet(counterName, async) {
-  return implementMethod(counterName, 'decrement/get', async)
+export function decrementAndGet(counterName, asyncHandler) {
+  return implementMethod(counterName, 'decrement/get', asyncHandler)
 }