Incorporated review changes

Author: zashraf1985

packages/datafile-manager/__test__/reactNativeAsyncStorageCache.spec.ts

@@ -23,57 +23,41 @@ describe('reactNativeAsyncStorageCache', () => {
     cacheInstance = new ReactNativeAsyncStorageCache()
   })
 
-  describe('get', function() { 
-    it('should return correct object when item is found in cache', function(done) {
-      cacheInstance.get('keyThatExists')
-        .then(v => { 
-          expect(v).toEqual({ name: "Awesome Object" })
-          done()
-        })
+  describe('get', function() {
+    it('should return correct object when item is found in cache', function() {
+      return cacheInstance.get('keyThatExists')
+        .then(v => expect(v).toEqual({ name: "Awesome Object" }))
     })
 
-    it('should return null if item is not found in cache', function(done) {
-      cacheInstance.get('keyThatDoesNotExist')
-        .then(v => { 
-          expect(v).toBeNull()
-          done()
-        })
+    it('should return null if item is not found in cache', function() {
+      return cacheInstance.get('keyThatDoesNotExist').then(v => expect(v).toBeNull())
     })
 
-    it('should reject promise error if string has an incorrect JSON format', function(done) {
-      cacheInstance.get('keyWithInvalidJsonObject')
-        .catch(e => {
-          done()
-        })
+    it('should reject promise error if string has an incorrect JSON format', function() {
+      return cacheInstance.get('keyWithInvalidJsonObject').catch(() => {})
     })
   })
 
   describe('set', function() { 
-    it('should resolve promise if item was successfully set in the cache', function(done) {
+    it('should resolve promise if item was successfully set in the cache', function() {
       const testObj = { name: "Awesome Object" }
-      cacheInstance.set('testKey', testObj).then(() => done())
+      return cacheInstance.set('testKey', testObj)
     })
 
-    it('should reject promise if item was not set in the cache because of json stringifying error', function(done) {
+    it('should reject promise if item was not set in the cache because of json stringifying error', function() {
       const testObj: any = { name: "Awesome Object" }
       testObj.myOwnReference = testObj
-      cacheInstance.set('testKey', testObj).catch(() => done())
+      return cacheInstance.set('testKey', testObj).catch(() => {})
     })
   })
 
-  describe('contains', function() { 
-    it('should return true if object with key exists', function(done) {
-      cacheInstance.contains('keyThatExists').then(v => {
-        expect(v).toBeTruthy()
-        done()
-      })
+  describe('contains', function() {
+    it('should return true if object with key exists', function() {
+      return cacheInstance.contains('keyThatExists').then(v => expect(v).toBeTruthy())
     })
 
-    it('should return false if object with key does not exist', function(done) {
-      cacheInstance.contains('keyThatDoesNotExist').then(v => {
-        expect(v).toBeFalsy()
-        done()
-      })
+    it('should return false if object with key does not exist', function() {
+      return cacheInstance.contains('keyThatDoesNotExist').then(v => expect(v).toBeFalsy())
     })
   })
 })

packages/datafile-manager/src/reactNativeAsyncStorageCache.ts

@@ -24,37 +24,26 @@ const logger = getLogger('DatafileManager')
 export default class ReactNativeAsyncStorageCache implements PersistentKeyValueCache {
 
   get(key: string): Promise<Object | null> {
-    return new Promise((resolve, reject) => {
-      AsyncStorage.getItem(key).then((val: string | null) => {
-        if (val) {
-          try {
-            resolve(JSON.parse(val))
-          } catch (ex) {
-            logger.error('Error Parsing Object from cache - %s', ex)
-            reject(ex)
-          }
-        } else {
-          resolve(null)
-        }
-      }).catch(reject)
-    })
+    try {
+      return AsyncStorage.getItem(key)
+        .then((val: string | null) => val ? JSON.parse(val) : null)
+    } catch (ex) {
+      logger.error('Error Parsing Object from cache - %s', ex)
+      return Promise.resolve(ex);
+    }
   }
-  
-  set(key: string, val: Object): Promise<void> {
-    return new Promise((resolve, reject) => {
-      try {
-        AsyncStorage.setItem(key, JSON.stringify(val)).then(resolve).catch(reject)
-      } catch (e) {
-        logger.error('Error stringifying Object to Json - %s', e)
-        reject(e)
-      }
-    })
+
+  set(key: string, val: Object): Promise<void> {    
+    try {
+      return AsyncStorage.setItem(key, JSON.stringify(val))
+    } catch (e) {
+      logger.error('Error stringifying Object to Json - %s', e)
+      return Promise.reject(e)
+    }
   }
 
   contains(key: string): Promise<Boolean> {
-    return new Promise((resolve, reject) =>
-      AsyncStorage.getItem(key).then((val: string | null) => resolve(val !== null)).catch(reject)
-    )
+    return AsyncStorage.getItem(key).then((val: string | null) => (val !== null))
   }
 
   remove(key: string): Promise<void> {