refactor(transfer): remove transfer-specific _getAdditionalPayload

noodlefrenzy · Feb 8, 2016 · 0b48a6e · 0b48a6e
1 parent b69040f
commit 0b48a6e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 22 deletions.
diff --git a/lib/frames.js b/lib/frames.js
@@ -2,6 +2,7 @@
 var Builder = require('buffer-builder'),
     AMQPFrame = require('./frames/frame').AMQPFrame,
     Frame = require('./frames/frame').Frame,
+    TransferFrame = require('./frames/transfer_frame'),
     errors = require('./errors'),
     codec = require('./codec'),
     debug = require('debug')('amqp10:framing');
@@ -23,17 +24,14 @@ frames.writeFrame = function(frame, stream) {
     builder.appendUInt16BE(0);
   }
 
-  // TODO: break this out
   var performative = frame.toDescribedType();
   if (performative !== null && performative !== undefined) {
     debug('Encoding performative: ' + JSON.stringify(performative));
     codec.encode(performative, builder);
-    try {
-      var payload = frame._getAdditionalPayload();
-      if (payload !== undefined) {
-        builder.appendBuffer(payload);
-      }
-    } catch (e) {}
+
+    if (frame instanceof TransferFrame) {
+      if (frame.message !== undefined) builder.appendBuffer(frame.message);
+    }
   }
 
   var buffer = builder.get();

diff --git a/lib/frames/frame.js b/lib/frames/frame.js
@@ -113,15 +113,4 @@ AMQPFrame.prototype.toDescribedType = function() {
   throw new errors.NotImplementedError('Children of AMQPFrame must implement `toDescribedType`');
 };
 
-
-/**
- * AMQP Frames consist of two sections of payload - the performative, and the additional actual payload.
- * Some frames don't have any additional payload, but for those that do, they should override this to generate it.
- *
- * @private
- */
-AMQPFrame.prototype._getAdditionalPayload = function() {
-  return undefined;
-};
-
 module.exports.AMQPFrame = AMQPFrame;
diff --git a/lib/frames/transfer_frame.js b/lib/frames/transfer_frame.js
@@ -243,10 +243,6 @@ TransferFrame.prototype.fromDescribedType = function(describedType) {
   });
 };
 
-TransferFrame.prototype._getAdditionalPayload = function() {
-  return this.message;
-};
-
 TransferFrame._possibleFields = {
   'header': M.Header, 'footer': M.Footer, 'deliveryAnnotations': M.DeliveryAnnotations,
   'annotations': M.Annotations, 'properties': M.Properties, 'applicationProperties': M.ApplicationProperties