Nodes updated to use new url based services utility

Author: chughts

services/alchemy_date_extraction/v1.js

@@ -16,10 +16,11 @@
 
 module.exports = function (RED) {
   const SERVICE_IDENTIFIER = 'gateway-a.watsonplatform.net';
-  var watson = require('watson-developer-cloud');
-
-  var payloadutils = require('../../utilities/payload-utils'),
-    serviceutils = require('../../utilities/service-utils');
+  var watson = require('watson-developer-cloud'),
+    payloadutils = require('../../utilities/payload-utils'),
+    serviceutils = require('../../utilities/service-utils'),
+    apikey, s_apikey,
+    service = serviceutils.getServiceCredsAlchemy(SERVICE_IDENTIFIER);
 
   // Require the Cloud Foundry Module to pull credentials from bound service
   // If they are found then the api key is stored in the variable s_apikey.
@@ -30,14 +31,6 @@ module.exports = function (RED) {
   // user who, when he errenously enters bad credentials, can't figure out why
   // the edited ones are not being taken.
 
-  // Taking this line out as codacy was complaining about it.
-  // var services = cfenv.getAppEnv().services;
-  var service;
-
-  var apikey, s_apikey;
-
-  var service = serviceutils.getServiceCredsAlchemy(SERVICE_IDENTIFIER);
-
   if (service) {
     s_apikey = service.apikey;
   }

services/alchemy_language/v1.js

@@ -38,7 +38,9 @@ module.exports = function (RED) {
   var watson = require('watson-developer-cloud');
 
   var payloadutils = require('../../utilities/payload-utils'),
-    serviceutils = require('../../utilities/service-utils');
+    serviceutils = require('../../utilities/service-utils'),
+    apikey, s_apikey,
+    service = serviceutils.getServiceCredsAlchemy(SERVICE_IDENTIFIER);
 
 
   // Require the Cloud Foundry Module to pull credentials from bound service
@@ -50,14 +52,6 @@ module.exports = function (RED) {
   // user who, when he errenously enters bad credentials, can't figure out why
   // the edited ones are not being taken.
 
-  // Taking this line out as codacy was complaining about it.
-  // var services = cfenv.getAppEnv().services;
-  var service;
-
-  var apikey, s_apikey;
-
-  var service = serviceutils.getServiceCredsAlchemy(SERVICE_IDENTIFIER);
-
   if (service) {
     s_apikey = service.apikey;
   }

utilities/service-utils.js

@@ -23,8 +23,9 @@ ServiceUtils.prototype = {
   // that the url associated with the service, contains the matched
   // input value, hence reducing the chances of a false match.
   checkCFForService: function(serviceName, returnBoolean, alchemyRegex) {
-    var regex = alchemyRegex ? RegExp('(http|https)(://)('+serviceName+').*')
-                         : RegExp('(http|https)(://)([^\/]+)(/)('+serviceName+').*');
+    var regex = alchemyRegex ?
+                RegExp('(http|https)(://)('+serviceName+').*') :
+                RegExp('(http|https)(://)([^\/]+)(/)('+serviceName+').*');
 
     var services = appEnv.getServices();