@sap/xsodata 8.2.1 → 8.3.1

package/lib/processor/resourceProcessorPut.js

@@ -1,25 +1,25 @@
 'use strict';
 
-var async = require('async');
-var connect = require('../db/connect');
-var contentIdHelper = require('./contentIdHelper');
-var contentTypeCheck = require('./../utils/checkContentType');
-var dataCollectorGet = require('./../sql/dataCollectorGet');
-var dataCollectorPut = require('./../sql/dataCollectorPut');
-var exitProcessor = require('./exitProcessor');
-var serializer = require('./../serializer/serializer');
-var sqlPut = require('./../sql/createPutStatements');
-var utils = require('./../utils/utils');
-
-var AtomXmlSerializer = require('./../serializer/atomXmlToJsonSerializer');
-var BadRequestError = require('./../utils/errors/http/badRequest');
-var InternalError = require('./../utils/errors/internalError');
-var UnsupportedMediaType = require('./../utils/errors/http/unsupportedMediaType');
+const async = require('async');
+const connect = require('../db/connect');
+const contentIdHelper = require('./contentIdHelper');
+const contentTypeCheck = require('./../utils/checkContentType');
+const dataCollectorGet = require('./../sql/dataCollectorGet');
+const dataCollectorPut = require('./../sql/dataCollectorPut');
+const exitProcessor = require('./exitProcessor');
+const serializer = require('./../serializer/serializer');
+const sqlPut = require('./../sql/createPutStatements');
+const utils = require('./../utils/utils');
+
+const AtomXmlSerializer = require('./../serializer/atomXmlToJsonSerializer');
+const BadRequestError = require('./../utils/errors/http/badRequest');
+const InternalError = require('./../utils/errors/internalError');
+const UnsupportedMediaType = require('./../utils/errors/http/unsupportedMediaType');
 
 function movePayloadToDbSegment_RecordNV(context, asyncDone) {
 
-    var req = context.request;
-    var contentType = req.headers['content-type'];
+    const req = context.request;
+    const contentType = req.headers['content-type'];
 
     try {
 
@@ -27,7 +27,7 @@ function movePayloadToDbSegment_RecordNV(context, asyncDone) {
 
         if (contentType) {
 
-            var isSupportedContentType = contentTypeCheck.isSupportedContentType(contentType);
+            const isSupportedContentType = contentTypeCheck.isSupportedContentType(contentType);
 
             if (isSupportedContentType === false) {
                 throw new UnsupportedMediaType('Content-Type ' + contentType + ' not supported.');
@@ -54,15 +54,15 @@ function movePayloadToDbSegment_RecordNV(context, asyncDone) {
         }
         try {
 
-            var dbSeg = context.oData.dbSegmentLast;
+            const dbSeg = context.oData.dbSegmentLast;
 
-            var data = buffer.toString('utf-8');
+            const data = buffer.toString('utf-8');
 
             if (contentTypeCheck.isContentTypeXml(contentType) === true && utils.isXml(data) === true) {
 
-                var typeModel = dbSeg.entityType.propertiesMap;
+                const typeModel = dbSeg.entityType.propertiesMap;
 
-                var serializer = new AtomXmlSerializer(data, typeModel);
+                const serializer = new AtomXmlSerializer(data, typeModel);
 
                 return serializer.serialize(function (err, innerContext) {
 
@@ -71,17 +71,17 @@ function movePayloadToDbSegment_RecordNV(context, asyncDone) {
                     }
 
                     if (!Array.isArray(innerContext.result)) {
-                        var err1 = InternalError("Serialization result is not an array", context);
+                        const err1 = InternalError("Serialization result is not an array", context);
                         return asyncDone(err1, context);
                     }
 
-                    var len = innerContext.result.length;
+                    const len = innerContext.result.length;
                     if (len !== 1) {
-                        var err2 = InternalError("Serialization result length must be 1 but is " + len, context);
+                        const err2 = InternalError("Serialization result length must be 1 but is " + len, context);
                         return asyncDone(err2, context);
                     }
 
-                    var result = innerContext.result[0];
+                    const result = innerContext.result[0];
 
                     dbSeg.setRecordFromPutPayload(context, result);
 
@@ -92,7 +92,7 @@ function movePayloadToDbSegment_RecordNV(context, asyncDone) {
             }
 
             if (contentTypeCheck.isContentTypeJson(contentType) === true) {
-                var json;
+                let json;
 
                 try {
                     json = JSON.parse(data);
@@ -116,17 +116,13 @@ function movePayloadToDbSegment_RecordNV(context, asyncDone) {
         } catch (err) {
             return asyncDone(err, context);
         }
-
-        return asyncDone(null, context);
     }
-
-
 }
 
 
 function eventBefore(context, asyncDone) {
     context.logger.info('update', 'event start before');
-    var eventFunction = exitProcessor.eventHandler('before', 'update');
+    const eventFunction = exitProcessor.eventHandler('before', 'update');
     eventFunction(context, function (err, context) {
         context.logger.info('modify event end', 'before');
         if (err) {
@@ -138,7 +134,7 @@ function eventBefore(context, asyncDone) {
 
 function eventAfter(context, asyncDone) {
     context.logger.info('update', 'event start after');
-    var eventFunction = exitProcessor.eventHandler('after', 'update');
+    const eventFunction = exitProcessor.eventHandler('after', 'update');
     eventFunction(context, function (err, context) {
         context.logger.info('modify event end', 'after');
         if (err) {
@@ -150,7 +146,7 @@ function eventAfter(context, asyncDone) {
 
 function eventPreCommit(context, asyncDone) {
     context.logger.info('update', 'event start precommit');
-    var eventFunction = exitProcessor.eventHandler('precommit', 'update');
+    const eventFunction = exitProcessor.eventHandler('precommit', 'update');
     eventFunction(context, function (err, context) {
         context.logger.info('modify event end', 'precommit');
         if (err) {
@@ -162,7 +158,7 @@ function eventPreCommit(context, asyncDone) {
 
 function eventPostCommit(context, asyncDone) {
     context.logger.info('update', 'event start postcommit');
-    var eventFunction = exitProcessor.eventHandler('postcommit', 'update');
+    const eventFunction = exitProcessor.eventHandler('postcommit', 'update');
     eventFunction(context, function (err, context) {
         context.logger.info('modify event end', 'postcommit');
         if (err) {
@@ -173,9 +169,9 @@ function eventPostCommit(context, asyncDone) {
 }
 
 function insertTmpTableToRealTables(context, asyncDone) {
-    var dbSeg = context.oData.dbSegmentLast;
-    var entityType = dbSeg.entityType;
-    var create = (entityType.modifications || {}).update || {};
+    const dbSeg = context.oData.dbSegmentLast;
+    const entityType = dbSeg.entityType;
+    const create = (entityType.modifications || {}).update || {};
 
     if (create.using) {
         exitProcessor.executeExit(create.using, 'using', 'update', context, asyncDone);
@@ -232,7 +228,7 @@ exports.process = function (context, asyncDone) {
         ],
         function (err, context) {
             if (err) {
-                var dbClient = context.db.client;
+                const dbClient = context.db.client;
                 if (dbClient) {
                     //ROLLBack the changes
                     return connect.dbRollback(context, dbClient, function (errDB) {

package/lib/processor/resourceProcessorPutPostLinks.js

@@ -1,25 +1,25 @@
 'use strict';
 
-var async = require('async');
-var connect = require('../db/connect');
-var sqlPutPostLinks = require('./../sql/createPutPostLinksStatements');
-var dataCollectorLinks = require('./../sql/dataCollectorLinks');
-var dataCollectorPutPostLinks = require('./../sql/dataCollectorPutPostLinks');
-var DBSegment = require('./../db/dbSegment');
-var serializer = require('./../serializer/serializer');
-var exitProcessor = require('./exitProcessor');
-var utils = require('./../utils/utils');
-var contenTypeCheck = require('./../utils/checkContentType');
-var oDataSegmentParser = require('../parsers/jison_segment_parser');
-
-
-var UnsupportedMediaType = require('./../utils/errors/http/unsupportedMediaType');
-var BadRequest = require('./../utils/errors/http/badRequest');
+const async = require('async');
+const connect = require('../db/connect');
+const sqlPutPostLinks = require('./../sql/createPutPostLinksStatements');
+const dataCollectorLinks = require('./../sql/dataCollectorLinks');
+const dataCollectorPutPostLinks = require('./../sql/dataCollectorPutPostLinks');
+const DBSegment = require('./../db/dbSegment');
+const serializer = require('./../serializer/serializer');
+const exitProcessor = require('./exitProcessor');
+const utils = require('./../utils/utils');
+const contenTypeCheck = require('./../utils/checkContentType');
+const oDataSegmentParser = require('../parsers/jison_segment_parser');
+
+
+const UnsupportedMediaType = require('./../utils/errors/http/unsupportedMediaType');
+const BadRequest = require('./../utils/errors/http/badRequest');
 
 function movePayloadToDbSegment(context, asyncDone) {
 
-    var req = context.request;
-    var contentType = req.headers['content-type'];
+    const req = context.request;
+    const contentType = req.headers['content-type'];
 
     try {
         context.logger.silly('resourceProcessorPutPostLinks', 'movePayloadToDbSegment');
@@ -75,7 +75,6 @@ function movePayloadToDbSegment(context, asyncDone) {
         } catch (err) {
             return asyncDone(err, context);
         }
-        return asyncDone(null, context);
     }
 }
 
@@ -91,8 +90,8 @@ function getKeyFromPostPutDeleteLinksUrl(linksPayload, refEntity, baseUrl) {
         throw new BadRequest('Error in Payload: Missing URI parameter');
     }
 
-    var count = 0;
-    for (var p in linksPayload) {
+    let count = 0;
+    for (const p in linksPayload) {
         if (linksPayload.hasOwnProperty(p)) {
             count++;
         }
@@ -103,9 +102,9 @@ function getKeyFromPostPutDeleteLinksUrl(linksPayload, refEntity, baseUrl) {
 
     linksPayload.uri = decodeURIComponent(linksPayload.uri);
 
-    var lastSegIndexBegin = linksPayload.uri.lastIndexOf("/");
+    const lastSegIndexBegin = linksPayload.uri.lastIndexOf("/");
     if (lastSegIndexBegin > 0) { // Absolute URL
-        var payloadBaseUrl = linksPayload.uri.substring(0, lastSegIndexBegin + 1);
+        const payloadBaseUrl = linksPayload.uri.substring(0, lastSegIndexBegin + 1);
         if (payloadBaseUrl !== baseUrl) {
             throw new BadRequest('Error in Payload: The base URL does not match the request base URL.');
         }
@@ -129,7 +128,7 @@ function getKeyFromPostPutDeleteLinksUrl(linksPayload, refEntity, baseUrl) {
 
 function eventBefore(context, asyncDone) {
     context.logger.info(context.oData.links.sOperation, 'event start before');
-    var eventFunction = exitProcessor.eventHandler('before', context.oData.links.sOperation);
+    const eventFunction = exitProcessor.eventHandler('before', context.oData.links.sOperation);
     eventFunction(context, function (err, context) {
         context.logger.info('modify event end', 'before');
         if (err) {
@@ -141,7 +140,7 @@ function eventBefore(context, asyncDone) {
 
 function eventAfter(context, asyncDone) {
     context.logger.info(context.oData.links.sOperation, 'event start after');
-    var eventFunction = exitProcessor.eventHandler('after', context.oData.links.sOperation);
+    const eventFunction = exitProcessor.eventHandler('after', context.oData.links.sOperation);
     eventFunction(context, function (err, context) {
         context.logger.info('modify event end', 'after');
         if (err) {
@@ -153,7 +152,7 @@ function eventAfter(context, asyncDone) {
 
 function eventPrecommit(context, asyncDone) {
     context.logger.info(context.oData.links.sOperation, 'event start precommit');
-    var eventFunction = exitProcessor.eventHandler('precommit', context.oData.links.sOperation);
+    const eventFunction = exitProcessor.eventHandler('precommit', context.oData.links.sOperation);
     eventFunction(context, function (err, context) {
         context.logger.info('modify event end', 'precommit');
         if (err) {
@@ -165,7 +164,7 @@ function eventPrecommit(context, asyncDone) {
 
 function eventPostCommit(context, asyncDone) {
     context.logger.info(context.oData.links.sOperation, 'event start postcommit');
-    var eventFunction = exitProcessor.eventHandler('postcommit', context.oData.links.sOperation);
+    const eventFunction = exitProcessor.eventHandler('postcommit', context.oData.links.sOperation);
     eventFunction(context, function (err, context) {
         context.logger.info('modify event end', 'postcommit');
         if (err) {
@@ -176,9 +175,9 @@ function eventPostCommit(context, asyncDone) {
 }
 
 function insertTmpTableToRealTable(context, asyncDone) {
-    var dbSeg = context.oData.dbSegmentLast;
-    var entityType = dbSeg.entityType;
-    var create = (entityType.modifications || {}).update || {};
+    const dbSeg = context.oData.dbSegmentLast;
+    const entityType = dbSeg.entityType;
+    const create = (entityType.modifications || {}).update || {};
 
     if (create.using) {
         exitProcessor.executeExit(create.using, 'using', context.oData.links.sOperation, context, asyncDone);
@@ -188,10 +187,10 @@ function insertTmpTableToRealTable(context, asyncDone) {
 }
 
 function insertTmpTableToRealMNTable(context, asyncDone) {
-    var dbSeg = context.oData.links.toBeUpdated;
+    const dbSeg = context.oData.links.toBeUpdated;
 
-    var entityType = dbSeg.entityType;
-    var create = (entityType.modifications || {}).create || {};
+    const entityType = dbSeg.entityType;
+    const create = (entityType.modifications || {}).create || {};
     if (create.using) {
         exitProcessor.executeExit(create.using, 'using', 'create', context, asyncDone);
     } else {
@@ -214,8 +213,8 @@ exports.process = function (context, asyncDone) {
         context.oData.links.sOperation = 'update';
     }
 
-    var execArr;
-    var m2n = (context.oData.dbSegmentLast.getOver() !== undefined);
+    let execArr;
+    const m2n = (context.oData.dbSegmentLast.getOver() !== undefined);
     if (m2n) { // INSERT into 3rd table
         context.oData.dbSegmentLast.m2n = true;
         execArr = [
@@ -299,7 +298,7 @@ exports.process = function (context, asyncDone) {
         execArr,
         function (err, context) {
             if (err) {
-                var dbClient = context.db.client;
+                const dbClient = context.db.client;
                 if (dbClient) {
                     //ROLLBack the changes
                     return connect.dbRollback(context, dbClient, function (errDB) {
@@ -320,8 +319,8 @@ exports.process = function (context, asyncDone) {
 exports.processInBatchCreateTables = function (context, asyncDone) {
     context.logger.silly('resourceProcessorPutPostLinks', 'processInBatchCreateTables');
 
-    var execArr;
-    var m2n = (context.oData.dbSegmentLast.getOver() !== undefined);
+    let execArr;
+    const m2n = (context.oData.dbSegmentLast.getOver() !== undefined);
     if (m2n) { // INSERT into 3rd table
         context.oData.dbSegmentLast.m2n = true;
         execArr = [
@@ -355,8 +354,8 @@ exports.processInBatchCreateTables = function (context, asyncDone) {
 exports.processInBatch = function (context, asyncDone) {
     context.logger.silly('resourceProcessorPutPostLinks', 'processInBatch');
 
-    var execArr;
-    var m2n = (context.oData.dbSegmentLast.getOver() !== undefined);
+    let execArr;
+    const m2n = (context.oData.dbSegmentLast.getOver() !== undefined);
     if (m2n) { // INSERT into 3rd table
         context.oData.dbSegmentLast.m2n = true;
         execArr = [

package/lib/security/securityContext.js

@@ -1,9 +1,9 @@
 "use strict";
 
-var BadRequestError = require("../utils/errors/http/badRequest");
+const BadRequestError = require("../utils/errors/http/badRequest");
 
-var xsenv = require('@sap/xsenv');
-var xssec = require("@sap/xssec");
+const xsenv = require('@sap/xsenv');
+const xssec = require("@sap/xssec");
 
 /**
  * Validates and extracts the authorization token from OData context without prefixes.
@@ -40,7 +40,7 @@ exports.getAuthToken = function getAuthToken(context) {
 exports.checkScopes = function checkScopes(context, token, scopes, callback) {
 
     // The UAA service is read (using xsenv module) from the default-services.json file at root-dir
-    var uaaService = xsenv.getServices({ uaa: { tag: 'xsuaa' } }).uaa || xsenv.getServices({ uaa: 'uaa' }).uaa;
+    const uaaService = xsenv.getServices({ uaa: { tag: 'xsuaa' } }).uaa || xsenv.getServices({ uaa: 'uaa' }).uaa;
 
     xssec.createSecurityContext(token, uaaService, function (err, externalSecurityContext) {
 
@@ -54,7 +54,7 @@ exports.checkScopes = function checkScopes(context, token, scopes, callback) {
             });
         }
 
-        var isAuthorized = true;
+        let isAuthorized = true;
         scopes.forEach(function (scope) {
             if (externalSecurityContext.checkLocalScope(scope) !== true) {
                 isAuthorized = false;

package/lib/serializer/atomSerializer.js

@@ -1,11 +1,11 @@
 'use strict';
-var XMLWriter = require('xml-writer');
-var InternalError = require('./../utils/errors/internalError');
-var typeConverter = require('./../utils/typeConverter');
-var dbSegment = require('./../db/dbSegment');
-var Http404_NotFound = require('./../utils/errors/http/notFound');
-var associationsUtil = require('./../utils/associations');
-var NotImplemented = require('./../utils/errors/http/notImplemented');
+const XMLWriter = require('xml-writer');
+const InternalError = require('./../utils/errors/internalError');
+const typeConverter = require('./../utils/typeConverter');
+const dbSegment = require('./../db/dbSegment');
+const Http404_NotFound = require('./../utils/errors/http/notFound');
+const associationsUtil = require('./../utils/associations');
+const NotImplemented = require('./../utils/errors/http/notImplemented');
 
 module.exports = AtomSerializer;
 
@@ -31,7 +31,7 @@ function startDocument(xmlWriter) {
 AtomSerializer.prototype.serializeFeed = function(dbSegment, inlineCount) {
     startDocument(this._xmlWriter);
 
-    var feedInfo = createRootFeedInfo(this._context, dbSegment);
+    const feedInfo = createRootFeedInfo(this._context, dbSegment);
     _serializeFeed(this._context, this._xmlWriter, feedInfo, dbSegment, inlineCount);
 
     this._xmlWriter.endDocument();
@@ -46,8 +46,8 @@ AtomSerializer.prototype.serializeFeed = function(dbSegment, inlineCount) {
 AtomSerializer.prototype.serializeEntity = function(dbSegment) {
     startDocument(this._xmlWriter);
 
-    var entity = getEntityFromSegment(dbSegment);
-    var converters = createConverters(dbSegment);
+    const entity = getEntityFromSegment(dbSegment);
+    const converters = createConverters(dbSegment);
     _serializeEntry(this._context, this._xmlWriter, dbSegment, entity, converters, createNamespaceAttributes(this._context));
 
     this._xmlWriter.endDocument();
@@ -70,9 +70,9 @@ function _serializeFeed(context, xmlWriter, feedInfo, segment, inlineCount) {
     createFeedHeader(context, xmlWriter, feedInfo);
     addInlineCount(xmlWriter, inlineCount);
 
-    var converters = createConverters(segment);
-    for (var i = 0; i < feedInfo.entries.length; i++) {
-        _serializeEntry(context, xmlWriter, segment, feedInfo.entries[i], converters);
+    const converters = createConverters(segment);
+    for (const feedInfoEntry of feedInfo.entries) {
+        _serializeEntry(context, xmlWriter, segment, feedInfoEntry, converters);
     }
     xmlWriter.endElement();
 }
@@ -141,7 +141,7 @@ function _serializeEntry(context, xmlWriter, segment, entity, converters, attrib
  * required entity.
  */
 function getEntityFromSegment(dbSegment) {
-    var entities = dbSegment.getRowsWithGenKey();
+    const entities = dbSegment.getRowsWithGenKey();
     if(!entities || !entities.length || entities.length === 0) {
         throw new Http404_NotFound('Entity not found.');
     }
@@ -149,9 +149,8 @@ function getEntityFromSegment(dbSegment) {
 }
 
 function serializeNavigationProperties(context, xmlWriter, segment, entity) {
-    for (var i = 0; i < segment._SelectedNavigations.length; i++) {
-        var selectedNavigation = segment._SelectedNavigations[i];
-        var navigationSegment = segment.getRelevantNavigationSegments()[selectedNavigation];
+    for (const selectedNavigation of segment._SelectedNavigations) {
+        const navigationSegment = segment.getRelevantNavigationSegments()[selectedNavigation];
         serializeNavigationProperty(context, xmlWriter, segment, navigationSegment, entity, selectedNavigation);
     }
 }
@@ -165,14 +164,14 @@ function isNavigationCollection(context, parentSegment, navPropertyName, navigat
         return navigationSegment.isCollection;
     }
 
-    var navigation = parentSegment.entityType.getNavigation(navPropertyName);
-    var association = context.gModel.getAssociation(navigation.association);
-    var targetEnd = associationsUtil.getTargetEnd(navigation, association, parentSegment.entityType);
+    const navigation = parentSegment.entityType.getNavigation(navPropertyName);
+    const association = context.gModel.getAssociation(navigation.association);
+    const targetEnd = associationsUtil.getTargetEnd(navigation, association, parentSegment.entityType);
     return targetEnd.multiplicity === "*";
 }
 
 function serializeNavigationProperty(context, xmlWriter, parentSegment, navigationSegment, parentEntity, navPropertyName) {
-    var isCollection = isNavigationCollection(context, parentSegment, navPropertyName, navigationSegment);
+    const isCollection = isNavigationCollection(context, parentSegment, navPropertyName, navigationSegment);
     startNavigationLink(xmlWriter, parentSegment, navPropertyName, isCollection, parentEntity);
 
     if(navigationSegment && navigationSegment.isExpand && navigationSegment.kind === dbSegment.DBS_Navigation) {
@@ -197,14 +196,14 @@ function serializeNavigationProperty(context, xmlWriter, parentSegment, navigati
  * @returns JSON object containing all the required info for the serialization of the multi-valued navigation property.
  */
 function createFeedInfoForNavProperty(navPropertyName, navigationSegment, parentSegment, parentEntity) {
-    var navigationEntities = getNavigationEntities(navigationSegment, parentEntity['1row']);
-    var parentEntityHref = createEntityRelativeUrl(parentSegment, parentEntity);
-    var feedHref = parentEntityHref + "/" + navPropertyName;
+    const navigationEntities = getNavigationEntities(navigationSegment, parentEntity['1row']);
+    const parentEntityHref = createEntityRelativeUrl(parentSegment, parentEntity);
+    const feedHref = parentEntityHref + "/" + navPropertyName;
     return createFeedInfo(navPropertyName, feedHref, navigationEntities);
 }
 
 function serializeNavigationCollection(context, xmlWriter, navPropertyName, navigationSegment, parentSegment, parentEntity) {
-    var feedInfo = createFeedInfoForNavProperty(navPropertyName, navigationSegment, parentSegment, parentEntity);
+    const feedInfo = createFeedInfoForNavProperty(navPropertyName, navigationSegment, parentSegment, parentEntity);
     if(feedInfo.entries.length === 0) {
         return;
     }
@@ -213,14 +212,14 @@ function serializeNavigationCollection(context, xmlWriter, navPropertyName, navi
 }
 
 function startNavigationLink(xmlWriter, parentSegment, navPropertyName, isNavigationCollection, parentEntity) {
-    var type = isNavigationCollection ? "feed" : "entry";
+    const type = isNavigationCollection ? "feed" : "entry";
 
     xmlWriter.startElement('link');
     xmlWriter.writeAttribute('rel', "http://schemas.microsoft.com/ado/2007/08/dataservices/related/" + navPropertyName);
     xmlWriter.writeAttribute('type', "application/atom+xml;type=" + type);
     xmlWriter.writeAttribute('title', navPropertyName);
 
-    var parentEntityUrl = createEntityRelativeUrl(parentSegment, parentEntity);
+    const parentEntityUrl = createEntityRelativeUrl(parentSegment, parentEntity);
     xmlWriter.writeAttribute('href', parentEntityUrl + '/' + navPropertyName);
 }
 
@@ -230,25 +229,26 @@ function startNavigationLink(xmlWriter, parentSegment, navPropertyName, isNaviga
  * @param parentId - ID of the parent entity. i.e. of the entity, which contains the navigation property.
  */
 function getNavigationEntities(navigationSegment, parentId) {
-    var entities = navigationSegment.getRowsWithGenKey();
-    var navigationEntities = [];
+    const entities = navigationSegment.getRowsWithGenKey();
+    const navigationEntities = [];
 
-    var navigationEntity;
-    while((navigationEntity = entities[navigationSegment.sql.readPosition]) && (navigationEntity['0row'] === parentId)) {
+    let navigationEntity = entities[navigationSegment.sql.readPosition];
+    while(navigationEntity && (navigationEntity['0row'] === parentId)) {
         navigationEntities.push(navigationEntity);
         navigationSegment.sql.readPosition++;
+        navigationEntity = entities[navigationSegment.sql.readPosition];
     }
 
     return navigationEntities;
 }
 
 function serializeNavigationEntity(context, xmlWriter, navigationSegment, parentId) {
-    var entity = getNavigationEntity(navigationSegment, parentId);
+    const entity = getNavigationEntity(navigationSegment, parentId);
     if(!entity) {
         return;
     }
 
-    var converters = createConverters(navigationSegment);
+    const converters = createConverters(navigationSegment);
     _serializeEntry(context, xmlWriter, navigationSegment, entity, converters);
 }
 
@@ -258,9 +258,8 @@ function serializeNavigationEntity(context, xmlWriter, navigationSegment, parent
  * @param parentId - ID of the parent OData entity.
  */
 function getNavigationEntity(navigationSegment, parentId) {
-    var entities = navigationSegment.getRowsWithGenKey();
-    for(var i = 0; i < entities.length; i++) {
-        var entity = entities[i];
+    const entities = navigationSegment.getRowsWithGenKey();
+    for(const entity of entities) {
         if(entity["0row"] === parentId) {
             return entity;
         }
@@ -273,11 +272,11 @@ function serializePrimitiveProperties(context, xmlWriter, segment, entity, conve
     xmlWriter.writeAttribute("type", "application/xml");
     xmlWriter.startElement("m:properties");
 
-    var selectedProperties = segment.getSelectedPropsWithGenKey();
-    for(var i = 0; i < selectedProperties.length; i++) {
-        var propertyName = selectedProperties[i];
-        var propertyValue = converters[i](entity[propertyName]);
-        var propertyType = getEdmPropertyType(segment, propertyName);
+    const selectedProperties = segment.getSelectedPropsWithGenKey();
+    for(let i = 0; i < selectedProperties.length; i++) {
+        const propertyName = selectedProperties[i];
+        const propertyValue = converters[i](entity[propertyName]);
+        const propertyType = getEdmPropertyType(segment, propertyName);
         serializeEntityProperty(xmlWriter, propertyName, propertyType, propertyValue);
     }
 
@@ -288,20 +287,20 @@ function serializePrimitiveProperties(context, xmlWriter, segment, entity, conve
 function writeCategory(context, xmlWriter, segment) {
     xmlWriter.startElement("category");
 
-    var term = context.gModel.getNamespace() + "." + segment.entityType.name + "Type";
+    const term = context.gModel.getNamespace() + "." + segment.entityType.name + "Type";
     xmlWriter.writeAttribute("term", term);
     xmlWriter.writeAttribute("scheme", "http://schemas.microsoft.com/ado/2007/08/dataservices/scheme");
     xmlWriter.endElement();
 }
 
 function getEdmPropertyType(segment, propertyName) {
-    var dbType = getPropertyDBType(segment, propertyName);
+    const dbType = getPropertyDBType(segment, propertyName);
     return typeConverter.dbTypeNameToODataTypeName[dbType];
 }
 
 function getPropertyDBType(segment, propertyName) {
-    var entityType = segment.entityType;
-    var property = entityType.propertiesMap[propertyName];
+    const entityType = segment.entityType;
+    const property = entityType.propertiesMap[propertyName];
     if(property) {
         return property.DATA_TYPE_NAME;
     }
@@ -335,7 +334,7 @@ function serializeEntityProperty(xmlWriter, propertyName, propertyType, property
  * Creates top level XML elements for the Atom entry element.
  */
 function createEntryHeader(context, xmlWriter, segment, entry) {
-    var entityUrl = createEntityAbsoluteUrl(context, segment, entry);
+    const entityUrl = createEntityAbsoluteUrl(context, segment, entry);
     xmlWriter.writeElement("id", entityUrl);
     createTitleElement(xmlWriter);
     createAuthorElement(xmlWriter);
@@ -343,7 +342,7 @@ function createEntryHeader(context, xmlWriter, segment, entry) {
 }
 
 function createEntityEditLink(xmlWriter, segment, entity) {
-    var entityRelativeUrl = createEntityRelativeUrl(segment, entity);
+    const entityRelativeUrl = createEntityRelativeUrl(segment, entity);
     createLink(xmlWriter, "edit", segment.entityType.name, entityRelativeUrl);
 }
 
@@ -352,8 +351,8 @@ function createEntityAbsoluteUrl(context, segment, entity) {
 }
 
 function createEntityRelativeUrl(segment, entity) {
-    var relativeUrl = segment.entityType.name;
-    var keysProperties = segment.getKeysProperties();
+    let relativeUrl = segment.entityType.name;
+    const keysProperties = segment.getKeysProperties();
 
     relativeUrl += '(';
 
@@ -362,7 +361,7 @@ function createEntityRelativeUrl(segment, entity) {
     return relativeUrl + ')';
 
     function toValues(keyProperty, index, array) {
-        var value = typeConverter.serializeDbValueToUriLiteral(entity[index.toString()]/*keys[index]*/, keyProperty);
+        const value = typeConverter.serializeDbValueToUriLiteral(entity[index.toString()]/*keys[index]*/, keyProperty);
         if (array.length === 1) {
             return value;
         }
@@ -378,19 +377,19 @@ function createConverters(segment) {
 }
 
 function createRootFeedInfo(context, segment) {
-    var feedTitle = getLastUriSegment(context);
-    var feedInfo = createFeedInfo(feedTitle, feedTitle, segment.getRowsWithGenKey());
+    const feedTitle = getLastUriSegment(context);
+    const feedInfo = createFeedInfo(feedTitle, feedTitle, segment.getRowsWithGenKey());
     feedInfo.attributes = createNamespaceAttributes(context);
     return feedInfo;
 }
 
 function getLastUriSegment(context) {
-    var uriSegments = context.uriTree.segments.decoded;
+    const uriSegments = context.uriTree.segments.decoded;
     return uriSegments[uriSegments.length - 1];
 }
 
 function createFeedInfo(title, href, entries) {
-    var feedInfo = {};
+    const feedInfo = {};
     feedInfo.title = title;
     feedInfo.href = href;
     feedInfo.entries = entries;
@@ -409,7 +408,7 @@ function createNamespaceAttributes(context) {
 
 function addAttributes(xmlWriter, attributes) {
     /*jshint forin: false */
-    for(var attributeName in attributes) {
+    for(const attributeName in attributes) {
         xmlWriter.writeAttribute(attributeName, attributes[attributeName]);
     }
 }