[WIP] upgrade hapi

lib/database/sthDatabase.js

@@ -31,7 +31,7 @@ const sthConfig = require(ROOT_PATH + '/lib/configuration/sthConfiguration.js');
 const sthUtils = require(ROOT_PATH + '/lib/utils/sthUtils.js');
 const sthDatabaseNaming = require(ROOT_PATH + '/lib/database/model/sthDatabaseNaming');
 const mongoClient = require('mongodb').MongoClient;
-const boom = require('boom');
+const boom = require('@hapi/boom');
 const jsoncsv = require('json-csv');
 const fs = require('fs');
 const path = require('path');

lib/server/handlers/sthGetDataHandlerV2.js

@@ -42,18 +42,20 @@ function getDataHandler(request, reply) {
      */
     function replyHandler(payload) {
         if (payload.isBoom) {
-            return reply({
-                error: payload.output.payload.error.replace(/ /, ''),
-                description: payload.output.payload.message
-            }).code(payload.output.payload.statusCode);
+            return reply
+                .response({
+                    error: payload.output.payload.error.replace(/ /, ''),
+                    description: payload.output.payload.message
+                })
+                .code(payload.output.payload.statusCode);
         }
-        return reply(payload);
+        return reply.response(payload);
     }
 
     request.params.entityType = request.query.type;
     request.params.version = 2;
 
-    sthGetDataHandlerV1(request, replyHandler);
+    return sthGetDataHandlerV1(request, null, replyHandler);
 }
 
 module.exports = getDataHandler;

lib/server/handlers/sthGetLogLevelHandler.js

@@ -53,8 +53,9 @@ function getLogLevelHandler(request, reply) {
 
     sthLogger.info(request.sth.context, 'Responding with logging level: ' + level);
 
-    const response = reply(getLogLevelResponse(level));
+    const response = reply.response(getLogLevelResponse(level));
     sthServerUtils.addFiwareCorrelator(request, response);
+    return response;
 }
 
 module.exports = getLogLevelHandler;

lib/server/handlers/sthGetVersionHandler.js

@@ -31,7 +31,7 @@ const sthUtils = require(ROOT_PATH + '/lib/utils/sthUtils');
  */
 function getVersionHandler(request, reply) {
     const message = sthUtils.getVersion();
-    return reply(message);
+    return reply.response(message);
 }
 
 module.exports = getVersionHandler;

lib/server/handlers/sthNotFoundHandler.js

@@ -41,11 +41,12 @@ function notFoundHandler(request, reply) {
         '404 - Not Found route for the request: ' + request.method.toUpperCase() + ' ' + request.url.path
     );
     if (request.path.startsWith('/STH/v2')) {
-        response = reply({ error: 'NotFound', description: 'invalid path' }).code(404);
+        response = reply.response({ error: 'NotFound', description: 'invalid path' }).code(404);
     } else {
-        response = reply({ statusCode: 404, error: 'Not Found' }).code(404);
+        response = reply.response({ statusCode: 404, error: 'Not Found' }).code(404);
     }
     sthServerUtils.addFiwareCorrelator(request, response);
+    return response;
 }
 
 module.exports = notFoundHandler;

lib/server/handlers/sthNotificationHandler.js

@@ -28,7 +28,7 @@ const sthLogger = require('logops');
 const sthConfig = require(ROOT_PATH + '/lib/configuration/sthConfiguration');
 const sthServerUtils = require(ROOT_PATH + '/lib/server/utils/sthServerUtils');
 const sthDatabase = require(ROOT_PATH + '/lib/database/sthDatabase');
-const boom = require('boom');
+const boom = require('@hapi/boom');
 
 /**
  * Returns the total number of attributes to be processed
@@ -163,7 +163,7 @@ function storeRawData(data, reply, callback) {
                 // There was an error when getting the collection
                 sthLogger.error(request.sth.context, 'Error when getting the raw data collection for storing:' + err);
                 if (++counterObj.counter === totalTasks) {
-                    response = reply(err);
+                    response = reply.response(err);
                     sthServerUtils.addFiwareCorrelator(request, response);
                 }
                 process.nextTick(callback.bind(null, err));
@@ -195,7 +195,7 @@ function storeRawData(data, reply, callback) {
                                 sthLogger.debug(request.sth.context, 'Raw data successfully stored');
                             }
                             if (++counterObj.counter === totalTasks) {
-                                response = reply(err);
+                                response = reply.response(err);
                                 sthServerUtils.addFiwareCorrelator(request, response);
                             }
                             process.nextTick(callback.bind(null, err));
@@ -255,7 +255,7 @@ function storeAggregatedData(data, reply) {
                 // There was an error when getting the collection
                 sthLogger.error(request.sth.context, 'Error when getting the aggregated data collection for storing');
                 if (++counterObj.counter === totalTasks) {
-                    response = reply(err);
+                    response = reply.response(err);
                     sthServerUtils.addFiwareCorrelator(request, response);
                 }
             } else {
@@ -282,7 +282,7 @@ function storeAggregatedData(data, reply) {
                                 sthLogger.debug(request.sth.context, 'Aggregated data successfully stored');
                             }
                             if (++counterObj.counter === totalTasks) {
-                                response = reply(err);
+                                response = reply.response(err);
                                 sthServerUtils.addFiwareCorrelator(request, response);
                             }
                         }
@@ -334,13 +334,13 @@ function processAttribute(data, reply) {
                         err = null;
                     }
                     if (++data.counterObj.counter === data.totalTasks) {
-                        reply(err);
+                        reply.response(err);
                     }
                 } else if (isAggregatableValue) {
                     // Store the aggregated data into the database
                     storeAggregatedData(data, reply);
                 } else if (++data.counterObj.counter === data.totalTasks) {
-                    reply();
+                    reply.response();
                 }
             });
         } else {
@@ -390,7 +390,7 @@ function processNotification(recvTime, request, reply) {
         );
         const error = boom.badRequest(message);
         error.output.payload.validation = { source: 'payload', keys: ['attributes'] };
-        return reply(error);
+        return reply.response(error);
     }
 
     for (let i = 0; i < contextResponses.length; i++) {

lib/server/handlers/sthRemoveDataHandler.js

@@ -26,7 +26,7 @@ const sthLogger = require('logops');
 const sthConfig = require(ROOT_PATH + '/lib/configuration/sthConfiguration');
 const sthServerUtils = require(ROOT_PATH + '/lib/server/utils/sthServerUtils');
 const sthDatabase = require(ROOT_PATH + '/lib/database/sthDatabase');
-const boom = require('boom');
+const boom = require('@hapi/boom');
 
 /**
  * Returns a textual description of the received request and the data included in it
@@ -74,7 +74,7 @@ function removeDataHandler(request, reply) {
                     sthLogger.debug(request.sth.context, 'Responding with 500- Internal error');
                     const error = boom.internal(message);
                     error.output.payload.message = message;
-                    reply(error);
+                    reply.response(error);
                 } else if (
                     err.name === 'MongoError' &&
                     err.message.includes('does not exist. Currently in strict mode')
@@ -85,19 +85,19 @@ function removeDataHandler(request, reply) {
                         'No data associated to the provided ' + getRequestDescription(request) + ' available'
                     );
                     // Reply with no error
-                    response = reply();
+                    response = reply.response();
                     response.code(204);
                 } else {
                     sthLogger.warn(request.sth.context, 'Error when removing the data associated to an entity: ' + err);
                     // Reply with error
-                    response = reply(err);
+                    response = reply.response(err);
                 }
             } else {
                 sthLogger.debug(
                     request.sth.context,
                     'Data associated to the provided ' + getRequestDescription(request) + ' successfully removed'
                 );
-                response = reply();
+                response = reply.response();
                 response.code(204);
             }
             sthServerUtils.addFiwareCorrelator(request, response);

lib/server/handlers/sthSetLogLevelHandler.js

@@ -41,8 +41,9 @@ function setLogLevelHandler(request, reply) {
 
     sthLogger.info(request.sth.context, 'Log level set to: ' + level);
 
-    const response = reply();
+    const response = reply.response();
     sthServerUtils.addFiwareCorrelator(request, response);
+    return response;
 }
 
 module.exports = setLogLevelHandler;