Cleanup constructors

lib/auth/basic.js

@@ -18,8 +18,6 @@ exports = module.exports = internals.Scheme = function (server, options) {
     Utils.assert(server, 'Server is required');
 
     this.settings = Utils.clone(options);                                               // Options can be reused
-
-    return this;
 };
 
 

lib/auth/bewit.js

@@ -20,8 +20,6 @@ exports = module.exports = internals.Scheme = function (server, options) {
 
     this.settings = Utils.clone(options);
     this.settings.hostHeaderName = this.settings.hostHeaderName || 'host';
-
-    return this;
 };
 
 

lib/auth/cookie.js

@@ -40,8 +40,6 @@ exports = module.exports = internals.Scheme = function (server, options) {
     if (typeof this.settings.appendNext === 'boolean') {
         this.settings.appendNext = (this.settings.appendNext ? 'next' : '');
     }
-
-    return this;
 };
 
 

lib/auth/hawk.js

@@ -20,8 +20,6 @@ exports = module.exports = internals.Scheme = function (server, options) {
 
     this.settings = Utils.clone(options);
     this.settings.hostHeaderName = this.settings.hostHeaderName || 'host';
-
-    return this;
 };
 
 

lib/auth/index.js

@@ -28,8 +28,6 @@ exports = module.exports = internals.Auth = function (server) {
         name: null,
         mode: 'required'
     };
-
-    return this;
 };
 
 

lib/client.js

@@ -168,8 +168,6 @@ internals.Collector = function (options, callback) {
     this.length = 0;
 
     this.once('finish', callback);
-
-    return this;
 };
 
 Utils.inherits(internals.Collector, Stream.Writable);

lib/composer.js

@@ -49,8 +49,6 @@ exports = module.exports = internals.Composer = function (manifest) {
     }
 
     this._packs = [];
-
-    return this;
 };
 
 

lib/pack.js

@@ -51,8 +51,6 @@ exports = module.exports = internals.Pack = function (options) {
     }
 
     this._cache = new Catbox.Client(cacheOptions);   // Common cache (defaults to memory-based)
-
-    return this;
 };
 
 

lib/proxy.js

@@ -29,8 +29,6 @@ exports = module.exports = internals.Proxy = function (options, route) {
     this.settings.isCustomPostResponse = !!options.postResponse;
     this.settings.postResponse = options.postResponse || internals.postResponse;     // function (request, settings, response, payload)
     this.settings.redirects = options.redirects || false;
-
-    return this;
 };
 
 

lib/request.js

@@ -119,8 +119,6 @@ exports = module.exports = internals.Request = function (server, req, res, optio
     };
 
     this._log(['received'], about, now);     // Must be last for object to be fully constructed
-
-    return this;
 };
 
 

lib/response/buffer.js

@@ -18,8 +18,6 @@ exports = module.exports = internals.Buffer = function (buffer) {
     this.varieties.buffer = true;
 
     this._payload.push(buffer);
-
-    return this;
 };
 
 Utils.inherits(internals.Buffer, Generic);

lib/response/cacheable.js

@@ -18,8 +18,6 @@ exports = module.exports = internals.Cacheable = function () {
     Generic.call(this);
     this.variety = 'cacheable';
     this.varieties.cacheable = true;
-
-    return this;
 };
 
 Utils.inherits(internals.Cacheable, Generic);

lib/response/cached.js

@@ -23,8 +23,6 @@ exports = module.exports = internals.Cached = function (item, ttl) {
 
     Utils.merge(this._flags, item.flags);
     this._flags.ttl = ttl;
-
-    return this;
 };
 
 Utils.inherits(internals.Cached, Generic);

lib/response/closed.js

@@ -12,6 +12,4 @@ exports = module.exports = internals.Closed = function () {
 
     this.variety = 'closed';
     this.varieties = { closed: true };
-
-    return this;
 };

lib/response/directory.js

@@ -31,8 +31,6 @@ exports = module.exports = internals.Directory = function (paths, options) {
     this._index = options.index === false ? false : true;       // Defaults to true
     this._listing = !!options.listing;                          // Defaults to false
     this._showHidden = !!options.showHidden;                    // Defaults to false
-
-    return this;
 };
 
 Utils.inherits(internals.Directory, Cacheable);

lib/response/empty.js

@@ -16,8 +16,6 @@ exports = module.exports = internals.Empty = function () {
     Cacheable.call(this);
     this.variety = 'empty';
     this.varieties.empty = true;
-
-    return this;
 };
 
 Utils.inherits(internals.Empty, Cacheable);

lib/response/error.js

@@ -30,8 +30,6 @@ exports = module.exports = internals.Error = function (options) {
     if (options.type) {
         this._headers['Content-Type'] = options.type;
     }
-
-    return this;
 };
 
 Utils.inherits(internals.Error, Obj);

lib/response/file.js

@@ -30,8 +30,6 @@ exports = module.exports = internals.File = function (filePath, options) {
 
     this._filePath = Path.normalize(filePath);
     this._mode = options ? options.mode : false;
-
-    return this;
 };
 
 Utils.inherits(internals.File, StreamResponse);

lib/response/generic.js

@@ -33,8 +33,6 @@ exports = module.exports = internals.Generic = function () {
     this._headers = {};
 
     this._preview = new internals.Peek();
-
-    return this;
 };
 
 
@@ -279,7 +277,6 @@ internals.Generic.prototype.unstate = function (name) {
 internals.Peek = function () {
 
     Stream.Writable.call(this);
-    return this;
 };
 
 Utils.inherits(internals.Peek, Stream.Writable);

lib/response/obj.js

@@ -20,8 +20,6 @@ exports = module.exports = internals.Obj = function (object, type, encoding) {
 
     this.raw = object;              // Can change if reference is modified
     this.update(type, encoding);
-
-    return this;
 };
 
 Utils.inherits(internals.Obj, Cacheable);

lib/response/redirection.js

@@ -21,8 +21,6 @@ exports = module.exports = internals.Redirection = function (uri, message, type,
 
     this._code = 302;               // Defaults to temporary/rewritable
     this.uri(uri);
-
-    return this;
 };
 
 Utils.inherits(internals.Redirection, Text);

lib/response/stream.js

@@ -25,8 +25,6 @@ exports = module.exports = internals.Stream = function (stream) {
 
     this._passThrough = {};
     this._setStream(stream);
-
-    return this;
 };
 
 Utils.inherits(internals.Stream, Generic);

lib/response/text.js

@@ -18,8 +18,6 @@ exports = module.exports = internals.Text = function (text, type, encoding) {
     this.varieties.text = true;
 
     this.message(text, type, encoding);
-
-    return this;
 };
 
 Utils.inherits(internals.Text, Cacheable);

lib/response/view.js

@@ -23,8 +23,6 @@ module.exports = internals.View = function (manager, template, context, options)
         context: context,
         options: options
     };
-
-    return this;
 };
 
 Utils.inherits(internals.View, Cacheable);

lib/route.js

@@ -177,8 +177,6 @@ exports = module.exports = internals.Route = function (options, server, env) {
     else if (this.settings.handler === 'notFound') {
         this.settings.handler = internals.notFound();
     }
-
-    return this;
 };
 
 

lib/server.js

@@ -142,8 +142,6 @@ module.exports = internals.Server = function (/* host, port, options */) {
     if (this.info.port) {
         this.info.uri = this.info.protocol + '://' + (this._host || Os.hostname() || 'localhost') + ':' + this.info.port;
     }
-
-    return this;
 };
 
 Utils.inherits(internals.Server, Events.EventEmitter);

lib/views.js

@@ -80,8 +80,6 @@ exports = module.exports = internals.Manager = function (options) {
 
         self._engines[extension] = engine;
     });
-
-    return this;
 };
 
 

test/integration/response.js

@@ -926,8 +926,6 @@ describe('Response', function () {
 
             this.issue = issue;
             this.request = request;
-
-            return this;
         };
 
         Hapi.utils.inherits(TestStream, Stream.Readable);
@@ -980,7 +978,6 @@ describe('Response', function () {
 
                 Stream.Readable.call(this);
                 this.headers = { custom: 'header' };
-                return this;
             };
 
             Hapi.utils.inherits(HeadersStream, Stream.Readable);
@@ -1019,7 +1016,6 @@ describe('Response', function () {
 
                 Stream.Readable.call(this);
                 this.statusCode = 201;
-                return this;
             };
 
             Hapi.utils.inherits(HeadersStream, Stream.Readable);
@@ -1098,7 +1094,6 @@ describe('Response', function () {
         var TimerStream = function () {
 
             Stream.Readable.call(this);
-            return this;
         };
 
         Hapi.utils.inherits(TimerStream, Stream.Readable);