Minor code refactoring

Author: sharadraju

lib/connection.js

@@ -1266,7 +1266,7 @@ class Connection extends EventEmitter {
     errors.assert(this._impl, errors.ERR_INVALID_CONNECTION);
 
     const inSubscr = _subscriptions.get(name);
-    let outValue = await this._impl.subscribe(inSubscr, options);
+    const outValue = await this._impl.subscribe(inSubscr, options);
     let subscription;
     if (options.namespace === constants.SUBSCR_NAMESPACE_DBCHANGE) {
       subscription = outValue.subscription;

lib/thin/sqlnet/connStrategy.js

@@ -251,10 +251,12 @@ class DownHostsCache {
     }
     return cOpts;
   }
-
+  /**
+   * Return if a desc is cached.
+   * A desc is cached if all the connection options(addresses)
+   * in that description are cached.
+   */
   isDownDescCached(desc) {
-    //const desc = this.descriptionList[d];
-    //let cOpts = new Array();
     const cOpts = desc.getConnectOptions();
     for (let i = 0; i < cOpts.length; i++) {
       if (!this.isDownHostsCached(cOpts[i]))
@@ -263,7 +265,7 @@ class DownHostsCache {
     return true;
   }
   /**
-   * Reorder description list such that description with all connection options in downcache 
+   * Reorder description list such that description with all connection options in downcache
    * is pushed to the end of the description list
    */
   reorderDescriptionList(descs) {
@@ -273,12 +275,12 @@ class DownHostsCache {
 
     while (topIdx < btmIdx) {
 
-      // increment topIdx if the address is not cached
+      // increment topIdx if the desc is not cached
       while (topIdx <= btmIdx
           && !this.isDownDescCached(descs[topIdx]))
         topIdx++;
 
-      // decrement btmIdx if address is cached
+      // decrement btmIdx if desc is cached
       while (btmIdx >= topIdx
           && this.isDownDescCached(descs[btmIdx]))
         btmIdx--;

test/aq5.js

@@ -27,7 +27,7 @@
  *
  * DESCRIPTION
  *   Test Oracle Advanced Queueing (AQ).
- *   The test cases are for subscribe callback function parameter message 
+ *   The test cases are for subscribe callback function parameter message
  *   to have msgId field
  *
  *****************************************************************************/
@@ -68,7 +68,7 @@ describe('283.aq5.js', function() {
     } else {
       await testsUtil.createAQtestUser(AQ_USER, AQ_USER_PWD);
 
-      let credential = {
+      const credential = {
         user:          AQ_USER,
         password:      AQ_USER_PWD,
         connectString: dbConfig.connectString
@@ -95,7 +95,7 @@ describe('283.aq5.js', function() {
     }
   });    //before
 
-  after(async function () {
+  after(async function() {
     if (!isRunnable) {
       return;
     } else {
@@ -104,29 +104,29 @@ describe('283.aq5.js', function() {
     }
   });
 
-  it('283.1 subscribe dequeue messages', async() => {
-       const options = {
-         namespace: oracledb.SUBSCR_NAMESPACE_AQ,
-         callback: cbSubscribe,
-         timeout: 300
-       };
+  it('283.1 subscribe dequeue messages', async () => {
+    const options = {
+      namespace: oracledb.SUBSCR_NAMESPACE_AQ,
+      callback: cbSubscribe,
+      timeout: 300
+    };
 
-       await conn.subscribe(objQueueName, options);
+    await conn.subscribe(objQueueName, options);
 
-       // Enqueue
-       const queue1 = await conn.getQueue(objQueueName);
-       const messageString = 'This is my message';
-       await queue1.enqOne(messageString);
-       await conn.commit ();
+    // Enqueue
+    const queue1 = await conn.getQueue(objQueueName);
+    const messageString = 'This is my message';
+    await queue1.enqOne(messageString);
+    await conn.commit ();
 
 
-       // Dequeue
-       const queue2 = await conn.getQueue(objQueueName);
-       const msg = await queue2.deqOne ();
-       await conn.commit ();
-       assert(msg);
+    // Dequeue
+    const queue2 = await conn.getQueue(objQueueName);
+    const msg = await queue2.deqOne ();
+    await conn.commit ();
+    assert(msg);
 
-       await conn.unsubscribe(objQueueName);
+    await conn.unsubscribe(objQueueName);
   });
-  
+
 });

test/dataTypeRaw.js

@@ -499,15 +499,15 @@ describe('42. dataTypeRaw.js', function() {
     assert.deepStrictEqual(result.rows[0][0], expected);
   };
 
-  describe ('42.7 DB_TYPE_RAW in Advanced Queue (AQ)', function () {
+  describe('42.7 DB_TYPE_RAW in Advanced Queue (AQ)', function() {
     let isRunnable = true;
     let conn;
     const AQ_USER = 'NODB_SCHEMA_AQTEST8';
     const AQ_USER_PWD = testsUtil.generateRandomPassword();
     const rawQueueName = "NODB_RAW_QUEUE8";
     const RAW_TABLE = "NODB_RAW_QUEUE_TAB";
 
-    before(async function () {
+    before(async function() {
       if (!dbConfig.test.DBA_PRIVILEGE || oracledb.thin) {
         isRunnable = false;
       }
@@ -541,7 +541,7 @@ describe('42. dataTypeRaw.js', function() {
       }
     });   //before
 
-    after (async function () {
+    after(async function() {
       if (!isRunnable) {
         return;
       } else {
@@ -550,9 +550,10 @@ describe('42. dataTypeRaw.js', function() {
       }
     });   // after
 
-    it('42.7.1 enqOne/deqOne with DB_TYPE_RAW specified', async() => {
+    it('42.7.1 enqOne/deqOne with DB_TYPE_RAW specified', async () => {
       const queue1 = await conn.getQueue(rawQueueName,
-          { payloadType: oracledb.DB_TYPE_RAW });
+        { payloadType: oracledb.DB_TYPE_RAW }
+      );
       const messageString = 'This is my message';
       const msgBuf = Buffer.from(messageString, 'utf8');
       await queue1.enqOne(msgBuf);
@@ -570,10 +571,10 @@ describe('42. dataTypeRaw.js', function() {
         {payloadType: oracledb.DB_TYPE_RAW});
       const messages1 = [
         "Message 1",
-         Buffer.from ("Message 2", "utf-8"),
-         Buffer.from ("Message 3", "utf-8"),
-         "Message 4"
-       ];
+        Buffer.from ("Message 2", "utf-8"),
+        Buffer.from ("Message 3", "utf-8"),
+        "Message 4"
+      ];
       await queue1.enqMany(messages1);
       await conn.commit ();