Merge pull request #1010 from callmehiphop/jscs-updates

core: address early return rule per latest jscs release

Author: stephenplusplus

lib/common/util.js

@@ -265,7 +265,8 @@ function shouldRetryRequest(err) {
         var reason = err.errors[i].reason;
         if (reason === 'rateLimitExceeded') {
           return true;
-        } else if (reason === 'userRateLimitExceeded') {
+        }
+        if (reason === 'userRateLimitExceeded') {
           return true;
         }
       }

lib/datastore/request.js

@@ -466,10 +466,10 @@ DatastoreRequest.prototype.save = function(entities, callback) {
     this.requests_.push(req);
     this.requestCallbacks_.push(onCommit);
     return;
-  } else {
-    this.makeReq_('commit', req, onCommit);
   }
 
+  this.makeReq_('commit', req, onCommit);
+
   function onCommit(err, resp) {
     if (err || !resp) {
       callback(err, resp);

lib/storage/bucket.js

@@ -420,9 +420,9 @@ Bucket.prototype.combine = function(sources, destination, callback) {
   function convertToFile(file) {
     if (file instanceof File) {
       return file;
-    } else {
-      return self.file(file);
     }
+
+    return self.file(file);
   }
 };
 

test/common/service.js

@@ -27,9 +27,9 @@ var makeAuthenticatedRequestFactoryOverride;
 util.makeAuthenticatedRequestFactory = function() {
   if (makeAuthenticatedRequestFactoryOverride) {
     return makeAuthenticatedRequestFactoryOverride.apply(this, arguments);
-  } else {
-    return makeAuthenticatedRequestFactoryCache.apply(this, arguments);
   }
+
+  return makeAuthenticatedRequestFactoryCache.apply(this, arguments);
 };
 
 describe('Service', function() {

test/common/stream-router.js

@@ -49,9 +49,9 @@ describe('streamRouter', function() {
 
         if (streamRouterOverrides[streamRouterMethod]) {
           return streamRouterOverrides[streamRouterMethod].apply(this, args);
-        } else {
-          return streamRouterCached[streamRouterMethod].apply(this, args);
         }
+
+        return streamRouterCached[streamRouterMethod].apply(this, args);
       };
     });
   });

test/compute/operation.js

@@ -36,9 +36,9 @@ var fakeUtil = extend({}, util, {
   parseHttpRespBody: function() {
     if (parseHttpRespBodyOverride) {
       return parseHttpRespBodyOverride.apply(null, arguments);
-    } else {
-      return util.parseHttpRespBody.apply(this, arguments);
     }
+
+    return util.parseHttpRespBody.apply(this, arguments);
   }
 });
 

test/datastore/dataset.js

@@ -26,9 +26,9 @@ var makeAuthenticatedRequestFactoryOverride;
 util.makeAuthenticatedRequestFactory = function() {
   if (makeAuthenticatedRequestFactoryOverride) {
     return makeAuthenticatedRequestFactoryOverride.apply(this, arguments);
-  } else {
-    return makeAuthenticatedRequestFactoryCache.apply(this, arguments);
   }
+
+  return makeAuthenticatedRequestFactoryCache.apply(this, arguments);
 };
 
 describe('Dataset', function() {

test/resource/index.js

@@ -48,9 +48,9 @@ var fakeUtil = extend({}, util, {
   makeAuthenticatedRequestFactory: function() {
     if (makeAuthenticatedRequestFactoryOverride) {
       return makeAuthenticatedRequestFactoryOverride.apply(null, arguments);
-    } else {
-      return util.makeAuthenticatedRequestFactory.apply(null, arguments);
     }
+
+    return util.makeAuthenticatedRequestFactory.apply(null, arguments);
   }
 });
 

test/search/index.js

@@ -49,9 +49,9 @@ var fakeUtil = extend({}, util, {
   makeAuthenticatedRequestFactory: function() {
     if (makeAuthenticatedRequestFactoryOverride) {
       return makeAuthenticatedRequestFactoryOverride.apply(null, arguments);
-    } else {
-      return util.makeAuthenticatedRequestFactory.apply(null, arguments);
     }
+
+    return util.makeAuthenticatedRequestFactory.apply(null, arguments);
   }
 });