refactor assert options

TechTeamer · Aug 1, 2022 · e25f281 · e25f281
1 parent 3d05c16
commit e25f281
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 33 deletions.
diff --git a/src/GatheringClient.js b/src/GatheringClient.js
@@ -31,11 +31,8 @@ class GatheringClient {
     this._assertExchange = assertExchange === true
     this._assertExchangeOptions = null
 
-    this._assertQueueOptions = Object.assign(assertQueueOptions || {}, { exclusive: true })
-
-    if (this._assertExchange) {
-      this._assertExchangeOptions = Object.assign(assertExchangeOptions || {}, { durable: true })
-    }
+    this._assertQueueOptions = Object.assign({ exclusive: true }, assertQueueOptions || {})
+    this._assertExchangeOptions = Object.assign({ durable: true }, assertExchangeOptions || {})
   }
 
   async initialize () {

diff --git a/src/GatheringServer.js b/src/GatheringServer.js
@@ -25,14 +25,8 @@ class GatheringServer {
     this._responseTimeoutMs = timeoutMs
     this._assertExchange = assertExchange === true
     this._assertExchangeOptions = null
-
-    this._assertQueueOptions = assertQueueOptions
-      ? Object.assign(assertQueueOptions || {}, { exclusive: true })
-      : { exclusive: true } // defaults
-
-    if (this._assertExchange) {
-      this._assertExchangeOptions = Object.assign(assertExchangeOptions || {}, { durable: true })
-    }
+    this._assertQueueOptions = Object.assign({ exclusive: true }, assertQueueOptions || {})
+    this._assertExchangeOptions = Object.assign({ durable: true }, assertExchangeOptions || {})
 
     this.actions = new Map()
   }

diff --git a/src/Publisher.js b/src/Publisher.js
@@ -19,12 +19,10 @@ class Publisher {
       assertExchange = true,
       assertExchangeOptions = null
     } = options || {}
-    this._assertExchange = null
-    if (assertExchange) {
-      const defaults = { durable: true }
-      this._assertExchange = assertExchange === true
-      this._assertExchangeOptions = assertExchangeOptions || defaults
-    }
+
+    this._assertExchange = assertExchange === true
+    this._assertExchangeOptions = Object.assign({ durable: true }, assertExchangeOptions || {})
+
     this.MessageModel = MessageModel || QueueMessage
     this.ContentSchema = ContentSchema || JSON
   }

diff --git a/src/QueueClient.js b/src/QueueClient.js
@@ -17,9 +17,7 @@ class QueueClient extends Publisher {
     } = options || {}
 
     this._assertQueue = assertQueue === true
-    if (this._assertQueue) {
-      this._assertQueueOptions = Object.assign(assertQueueOptions || {}, { durable: true })
-    }
+    this._assertQueueOptions = Object.assign({ durable: true }, assertQueueOptions || {})
   }
 
   /**

diff --git a/src/QueueServer.js b/src/QueueServer.js
@@ -19,9 +19,7 @@ class QueueServer extends Subscriber {
     this._prefetchCount = prefetchCount
 
     this._assertQueue = assertQueue === true
-    if (this._assertQueue) {
-      this._assertQueueOptions = Object.assign(assertQueueOptions || {}, { durable: true })
-    }
+    this._assertQueueOptions = Object.assign({ durable: true }, assertQueueOptions || {})
   }
 
   /**

diff --git a/src/RPCClient.js b/src/RPCClient.js
@@ -32,9 +32,7 @@ class RPCClient {
     this._correlationIdMap = new Map()
 
     this._assertReplyQueue = assertReplyQueue === true
-    if (this._assertReplyQueue) {
-      this._assertReplyQueueOptions = Object.assign(assertReplyQueueOptions || {}, { exclusive: true })
-    }
+    this._assertReplyQueueOptions = Object.assign({ exclusive: true }, assertReplyQueueOptions || {})
 
     this._rpcQueueMaxSize = queueMaxSize
     this._rpcTimeoutMs = timeoutMs

diff --git a/src/Subscriber.js b/src/Subscriber.js
@@ -25,12 +25,10 @@ class Subscriber {
     this._timeoutMs = timeoutMs
     this.MessageModel = MessageModel || QueueMessage
     this.ContentSchema = ContentSchema || JSON
-    this._assertQueueOptions = Object.assign(assertQueueOptions || {}, { exclusive: true })
+
+    this._assertQueueOptions = Object.assign({ exclusive: true }, assertQueueOptions || {})
     this._assertExchange = assertExchange === true
-    if (assertExchange) {
-      const defaults = { durable: true }
-      this._assertExchangeOptions = assertExchangeOptions || defaults
-    }
+    this._assertExchangeOptions = Object.assign({ durable: true }, assertExchangeOptions || {})
 
     this._retryMap = new Map()