@sap/xsodata 8.2.1 → 8.3.1

package/lib/uri/resourcePathParser.js

@@ -16,7 +16,7 @@ const EntityType = require('../model/entityType.js');
  * @param {Array} segments Uri Segments
  * @constructor
  */
-var ResourcePathReader = function (context, segments) {
+const ResourcePathReader = function (context, segments) {
     this.context = context;
     this.gModel = context.gModel;
 
@@ -37,19 +37,19 @@ var ResourcePathReader = function (context, segments) {
  * @returns {null|dbSegments.DbSegment}
  */
 ResourcePathReader.prototype.consumeFirstSegment = function consumeFirstSegment() {
-    var segment = this.reduceSegments.shift(); //of type uriSegmentTypes.js#ResourceSegment
+    let segment = this.reduceSegments.shift(); //of type uriSegmentTypes.js#ResourceSegment
 
 
     //load entity from xsodata
-    var entityType = this.gModel.getEntityType(segment.identifier);
+    let entityType = this.gModel.getEntityType(segment.identifier);
     if (entityType === undefined) {
         throw new Http404_NotFound("Resource not found for the segment '" + segment.identifier + "' at position " + segment.position + ".");
     }
 
     // check if this segments is used to supply input parameters for the following calcview segment
-    var inputParameters = null;
-    var keys = null;
-    var isCollection = null;
+    let inputParameters = null;
+    let keys = null;
+    let isCollection = null;
     if (entityType.kind === model.entityKind.inputParameters || entityType.kind === model.entityKind.calculationView) {
         if (entityType._entityType.parameters && entityType._entityType.parameters.viaKey === true) {
             // e.g. FromCalcView(IN_INTEGER=888,IN_NVARCHAR='AAA',KEY_1=1)/nav(IN_INTEGER=999,IN_NVARCHAR='BBB',KEY_2=38)
@@ -81,12 +81,11 @@ ResourcePathReader.prototype.consumeFirstSegment = function consumeFirstSegment(
             segment = this.reduceSegments.shift(); //of type uriSegmentTypes.js#ResourceSegment
             if (segment) {
                 // validate calc view segment and adopt entityType for next segments
-                var navigation = entityType.getNavigation(segment.identifier);
-                var association = this.gModel.getAssociationByName(navigation.association);
+                const navigation = entityType.getNavigation(segment.identifier);
+                const association = this.gModel.getAssociationByName(navigation.association);
                 // ### association is FromCalcViewParameters_to_FromCalcView
 
-                var endTo = this.getTargetEnd(navigation, association, entityType);
-                //var endFrom = this.getFromEnd(navigation, association, entityType);
+                const endTo = this.getTargetEnd(navigation, association, entityType);
                 entityType = this.gModel.getEntityType(endTo.type);
                 if (!entityType) {
                     throw new Http404_NotFound("Resource not found for the segment '" + segment.identifier + "' at position " + segment.position + ".");
@@ -134,7 +133,7 @@ ResourcePathReader.prototype.consumeFirstSegment = function consumeFirstSegment(
 
 ResourcePathReader.prototype.consumeFollowerSegment = function consumeFollowerSegment(prevDbSegment) {
 
-    var segment = this.reduceSegments.shift();
+    let segment = this.reduceSegments.shift();
     // ### segment is nav
     // ### prevDbSegment.kind is "entity"
     if (prevDbSegment.kind === dbSegments.DBS_Property && segment.identifier !== '$value') {
@@ -185,7 +184,7 @@ ResourcePathReader.prototype.consumeFollowerSegment = function consumeFollowerSe
 
     //check for primitive property
     // ### segement.identifier is nav
-    var property = prevDbSegment.entityType.__metadata.getProperty(segment.identifier);
+    const property = prevDbSegment.entityType.__metadata.getProperty(segment.identifier);
     if (property) {
         // segment is a valid property in path
         prevDbSegment.kind = dbSegments.DBS_Property;
@@ -194,26 +193,21 @@ ResourcePathReader.prototype.consumeFollowerSegment = function consumeFollowerSe
     }
 
 
-    var navigation = prevDbSegment.entityType.getNavigation(segment.identifier);
+    const navigation = prevDbSegment.entityType.getNavigation(segment.identifier);
     // ### association is first_to_second
     if (!navigation) {
         //E.g. /Teams('1')/$links/invalid
         throw new Http400_BadRequest("Resource not found for the segment '" + segment.identifier + "'");
     }
-    var association = this.getAssociation(navigation);
+    const association = this.getAssociation(navigation);
     // ### association is first_to_second
 
-    //var navigation = entityType.getNavigation(segment.identifier);
-    //if (!association) {
-    //    // check for generated association between calcview paramters and calcview result
-    //    association = this.gModel.getAssociationByName(navigation.association);
-    //}
-    var endFrom = this.getFromEnd(navigation, association, prevDbSegment.entityType);
-    var endTo = this.getTargetEnd(navigation, association, prevDbSegment.entityType);
+    const endFrom = this.getFromEnd(navigation, association, prevDbSegment.entityType);
+    let endTo = this.getTargetEnd(navigation, association, prevDbSegment.entityType);
 
-    var targetEntity = this.gModel.getEntityType(endTo.type);
+    let targetEntity = this.gModel.getEntityType(endTo.type);
     // ### targetEntity is ToCalcView
-    var dbSegment = new dbSegments.DbSegment(dbSegments.DBS_ResourceNavigation, targetEntity, this.tableCount++);
+    const dbSegment = new dbSegments.DbSegment(dbSegments.DBS_ResourceNavigation, targetEntity, this.tableCount++);
     prevDbSegment.nextDBSegment = dbSegment;
     dbSegment.previousDBSegment = prevDbSegment;
     dbSegment.association = association;
@@ -244,9 +238,7 @@ ResourcePathReader.prototype.consumeFollowerSegment = function consumeFollowerSe
             inputs.forEach(function (kv) {
                 dbSegment.addInputParameter(this.context, kv.name, kv.value);
             }, this);
-            //if (keys.length > 0) {
             dbSegment.setKeyValues(keys);
-            //}
 
             dbSegment.isCollection = keys.length === 0;
         } else {
@@ -263,13 +255,12 @@ ResourcePathReader.prototype.consumeFollowerSegment = function consumeFollowerSe
             }
 
             // validate calc view segment and adopt entityType for next segments
-            var navigation2 = targetEntity.getNavigation(segment.identifier);
-            var association2 = this.gModel.getAssociationByName(navigation2.association);
+            const navigation2 = targetEntity.getNavigation(segment.identifier);
+            const association2 = this.gModel.getAssociationByName(navigation2.association);
             // ### association is FromCalcViewParameters_to_FromCalcView
 
             endTo = this.getTargetEnd(navigation, association2, targetEntity);
-            //var endFrom = this.getFromEnd(navigation, association2, entityType);
-            var entityType2 = this.gModel.getEntityType(endTo.type);
+            const entityType2 = this.gModel.getEntityType(endTo.type);
             // ### entityType is FromCalcview
             if (!entityType2) {
                 throw new Http404_NotFound("Resource not found for the segment '" + segment.identifier + "' at position " + segment.position + ".");
@@ -314,7 +305,7 @@ ResourcePathReader.prototype.consumeFollowerSegment = function consumeFollowerSe
  * @returns {null|dbSegments.DbSegment}
  */
 ResourcePathReader.prototype.consumeLinksSegment = function (prevDbSegment) {
-    var segment = this.reduceSegments.shift();
+    const segment = this.reduceSegments.shift();
 
     if (!segment || !segment.identifier) {
         // E.g. /Teams('1')/$links
@@ -348,19 +339,19 @@ ResourcePathReader.prototype.consumeLinksSegment = function (prevDbSegment) {
     }
 
     // Check for navigation property
-    var navigation = prevDbSegment.entityType.getNavigation(segment.identifier);
+    const navigation = prevDbSegment.entityType.getNavigation(segment.identifier);
     if (!navigation) {
         //E.g. /Teams('1')/$links/invalid
         throw new Http404_NotFound("The request URI is not valid. The segment '" + segment.identifier + "' must refer to a navigation property since the previous segment identifier is '$links'.");
     }
 
-    var association = this.getAssociation(navigation);
-    var endTo = this.getTargetEnd(navigation, association, prevDbSegment.entityType);
-    var endFrom = this.getFromEnd(navigation, association, prevDbSegment.entityType);
+    const association = this.getAssociation(navigation);
+    const endTo = this.getTargetEnd(navigation, association, prevDbSegment.entityType);
+    const endFrom = this.getFromEnd(navigation, association, prevDbSegment.entityType);
 
-    var targetEntity = this.gModel.getEntityType(endTo.type);
+    const targetEntity = this.gModel.getEntityType(endTo.type);
 
-    var dbSegment = new dbSegments.DbSegment(dbSegments.DBS_ResourceNavigation, targetEntity, this.tableCount++);
+    const dbSegment = new dbSegments.DbSegment(dbSegments.DBS_ResourceNavigation, targetEntity, this.tableCount++);
     prevDbSegment.nextDBSegment = dbSegment;
     dbSegment.previousDBSegment = prevDbSegment;
     dbSegment.association = association;
@@ -396,13 +387,11 @@ ResourcePathReader.prototype.consumeLinksSegment = function (prevDbSegment) {
         prevDbSegment.setOver(association.over);
     }
 
-    //this.dbSegments.push(dbSegment);
     return dbSegment;
 };
 
 ResourcePathReader.prototype.processResourcePath = function () {
-
-    var lastDBSegment = null;
+    let lastDBSegment = null;
     while (this.reduceSegments.length > 0) {
         if (lastDBSegment === null) {
             lastDBSegment = this.consumeFirstSegment();
@@ -428,7 +417,7 @@ ResourcePathReader.prototype.addExpand = function (dbSeg, expandNavName, expandI
     if (dbSeg.isLinks) {
         return;
     }
-    var dbSegNew = this._createNavigationSegment(dbSeg, expandNavName);
+    const dbSegNew = this._createNavigationSegment(dbSeg, expandNavName);
     dbSeg.addExpandDbSegment(expandNavName, dbSegNew);
 
     // recurse
@@ -444,18 +433,18 @@ ResourcePathReader.prototype.addExpand = function (dbSeg, expandNavName, expandI
  * @private
  */
 ResourcePathReader.prototype._createNavigationSegment = function (dbSeg, expandNavName) {
-    var navigation = dbSeg.entityType.getNavigation(expandNavName);
+    const navigation = dbSeg.entityType.getNavigation(expandNavName);
     if (!navigation) {
         throw new Http400_BadRequest(`Unknown navigation property '${expandNavName}' in entity type '${dbSeg.entityType.name}'`);
     }
-    var association = this.getAssociation(navigation);
+    const association = this.getAssociation(navigation);
 
-    var endTo = this.getTargetEnd(navigation, association, dbSeg);
-    var endFrom = this.getFromEnd(navigation, association, dbSeg);
+    const endTo = this.getTargetEnd(navigation, association, dbSeg);
+    const endFrom = this.getFromEnd(navigation, association, dbSeg);
 
-    var targetEntity = this.gModel.getEntityType(endTo.type);
+    const targetEntity = this.gModel.getEntityType(endTo.type);
 
-    var dbSegNew = new dbSegments.DbSegment(dbSegments.DBS_Navigation, targetEntity, this.tableCount++);
+    const dbSegNew = new dbSegments.DbSegment(dbSegments.DBS_Navigation, targetEntity, this.tableCount++);
     dbSegNew.previousDBSegment = dbSeg;
     dbSegNew.setFrom(endFrom);
     dbSegNew.setTo(endTo);
@@ -475,14 +464,13 @@ ResourcePathReader.prototype._createNavigationSegment = function (dbSeg, expandN
 ResourcePathReader.prototype.addSelExpTree = function (dbSeg, tree) {
     //first add all known expanded navigation properties
     if (tree.expandAllAvailExpands === true) {
-        for (var expandNavName in tree.availableExpands) {
+        for (const expandNavName in tree.availableExpands) {
             if (tree.availableExpands.hasOwnProperty(expandNavName)) {
                 this.addExpand(dbSeg, expandNavName, tree.availableExpands[expandNavName]);
             }
         }
     } else {
-        for (var i = 0; i < tree.expandNavigations.length; i++) {
-            var name = tree.expandNavigations[i];
+        for (const name of tree.expandNavigations) {
             this.addExpand(dbSeg, name, tree.availableExpands[name]);
         }
     }
@@ -492,11 +480,10 @@ ResourcePathReader.prototype.addSelExpTree = function (dbSeg, tree) {
         this.checkOtherProperties(dbSeg, tree.properties);
         dbSeg.addAllProperties();
     } else {
-        for (var i1 = 0; i1 < tree.properties.length; i1++) {
-            var selectedProperty = tree.properties[i1];
+        for (const selectedProperty of tree.properties) {
             dbSeg.addSelectProperties(selectedProperty);
             if (dbSeg.isNavigationProperty(selectedProperty) && !dbSeg.getRelevantNavigationSegments()[selectedProperty]) {
-                var relevantNavigationSegment = this._createNavigationSegment(dbSeg, selectedProperty);
+                const relevantNavigationSegment = this._createNavigationSegment(dbSeg, selectedProperty);
                 dbSeg.addRelevantNavigationSegment(selectedProperty, relevantNavigationSegment);
             }
         }
@@ -504,10 +491,8 @@ ResourcePathReader.prototype.addSelExpTree = function (dbSeg, tree) {
 };
 
 ResourcePathReader.prototype.checkOtherProperties = function (dbSeg, properties) {
-    var entityType = dbSeg.entityType;
-    for (var i1 = 0; i1 < properties.length; i1++) {
-        var propertyName = properties[i1];
-
+    const entityType = dbSeg.entityType;
+    for (const propertyName of properties) {
         if (!(entityType.propertiesMap[propertyName] || entityType.navPropertiesMap[propertyName]) &&
             entityType.keys.generatedKey !== propertyName) {
             throw(new Http400_BadRequest('property "' + propertyName + '" not allowed'));
@@ -521,9 +506,9 @@ ResourcePathReader.prototype.buildODataTreeTrunk = function () {
 
 ResourcePathReader.prototype.insertODataNavTreeCrone = function (queryParameters) {
     //first check for the $expend and $select parameters.
-    var expands = queryParameters.expand;
-    var selects = queryParameters.select;
-    var expSelTree = sel.processExpandSelectTree(expands, selects);
+    const expands = queryParameters.expand;
+    const selects = queryParameters.select;
+    const expSelTree = sel.processExpandSelectTree(expands, selects);
     this.addSelExpTree(this.lastDBSegment, expSelTree);
     if (this.firstDBSegment.isLinks) {
         this.addSelExpTree(this.firstDBSegment, expSelTree);
@@ -532,7 +517,7 @@ ResourcePathReader.prototype.insertODataNavTreeCrone = function (queryParameters
 
 ResourcePathReader.prototype.insertQueryParameters = function (queryParameters) {
     //first check for the $expend and $select parameters.
-    for (var name in queryParameters) {
+    for (const name in queryParameters) {
         if (queryParameters.hasOwnProperty(name)) {
             //do checks here
             this.lastDBSegment.systemQueryParameter[name] = queryParameters[name];
@@ -542,7 +527,7 @@ ResourcePathReader.prototype.insertQueryParameters = function (queryParameters)
 
 exports.parseResourcePath = function (context, odata) {
 
-    var resourcePathReader = new ResourcePathReader(context, odata.segments);
+    const resourcePathReader = new ResourcePathReader(context, odata.segments);
     // Creates the dbSegment line from the URI up to the "?"
     resourcePathReader.buildODataTreeTrunk();
     // Evaluate the $select and $expand system query parameter and build a tree
@@ -574,7 +559,7 @@ exports.parseResourcePath = function (context, odata) {
             };
         }
         // The corresponding association for the given request will be needed many times for custom exits processing
-        var association = odata.dbSegmentLast.association;
+        const association = odata.dbSegmentLast.association;
         odata.links.association = association;
         if (odata.dbSegmentLast.entityType.name === association.principal.type) {
             odata.links.principal = odata.dbSegmentLast;

package/lib/uri/uriType.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var oDataUriParser = require('../../lib/uri/oDataUriParser');
-var DBSegment = require('../db/dbSegment');
+const oDataUriParser = require('../../lib/uri/oDataUriParser');
+const DBSegment = require('../db/dbSegment');
 
 exports.URI0 = 0; // scheme serviceRoot
 exports.URI1 = 1; // scheme serviceRoot "/" entitySet
@@ -34,8 +34,8 @@ exports.UNKNOWN_URI = -1; // "fallback" uri type, which is used when uri type ca
  * @returns {number} OData URI type (e.g. URI1 having number value of 1).
  */
 exports.determineUriType = function determineUriType(context) {
-	var uriKind = context.oData.kind,
-		dbSegmentLast,
+	const uriKind = context.oData.kind;
+    let dbSegmentLast,
 		isCollection,
 		isCount,
 		isValue,

package/lib/utils/associations.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var ModelFileError = require('./errors/modelFileError');
+const ModelFileError = require('./errors/modelFileError');
 
 function clone(objectToClone) {
     return JSON.parse(JSON.stringify(objectToClone));
@@ -16,7 +16,7 @@ module.exports = {
 
 
 function getTargetEnd(navigation, association, entityType) {
-    var ret = null;
+    let ret = null;
     if (!navigation.from) {
         if (association.principal.type === association.dependent.type) {
             throw new ModelFileError('No "from" clause given', context);
@@ -43,7 +43,7 @@ function getTargetEnd(navigation, association, entityType) {
 }
 
 function getFromEnd(navigation, association, entityType) {
-    var ret = null;
+    let ret = null;
     if (!navigation.from) {
         if (association.principal.type === association.dependent.type) {
             throw new ModelFileError('No "from" clause given', context);
@@ -71,7 +71,7 @@ function getFromEnd(navigation, association, entityType) {
 
 function makeStringCreator(getAssociationEnd) {
     return function createAssociationEndString(navigation, association, entityType) {
-        var associationEnd = getAssociationEnd(navigation, association, entityType);
+        const associationEnd = getAssociationEnd(navigation, association, entityType);
         return associationEnd.type + createPrincipalDependantString(associationEnd, association);
     };
 }

package/lib/utils/batch/batchExecutor.js

@@ -1,26 +1,26 @@
 'use strict';
 
-var async = require('async');
-
-var applyUriChecks = require('./../../uri/applyChecks');
-var authorizationProcessor = require('./../../processor/authorizationProcessor');
-var batchConst = require('./batchConst');
-var configuration = require('./../../configuration');
-var errorProcessor = require('./../../processor/errorProcessor');
-var json = require('./../../serializer/jsonSerializer');
-var metadataDbReader = require('./../../model/metadataReader');
-var oDataUriParser = require('./../../uri/oDataUriParser');
-var oDataProcessor = require('./../../processor/processor');
-var uriChecks = require('./../../uri/checks');
-var uriKeyValueParser = require('./../../parsers/uriKeyValue');
-var uriProcessor = require('./../../http/uriParser');
-var utils = require('./../utils');
-var xsodataFileReader = require('./../../model/xsodataReader');
-
-var ConditionalHttpHandler = require('./../../http/conditionalHttpHandler');
-var DebugInfo = require('./../errors/debugInfo');
-var RequestContext = require('./../requestContext');
-var TestError = require('./../errors/testError');
+const async = require('async');
+
+const applyUriChecks = require('./../../uri/applyChecks');
+const authorizationProcessor = require('./../../processor/authorizationProcessor');
+const batchConst = require('./batchConst');
+const configuration = require('./../../configuration');
+const errorProcessor = require('./../../processor/errorProcessor');
+const json = require('./../../serializer/jsonSerializer');
+const metadataDbReader = require('./../../model/metadataReader');
+const oDataUriParser = require('./../../uri/oDataUriParser');
+const oDataProcessor = require('./../../processor/processor');
+const uriChecks = require('./../../uri/checks');
+const uriKeyValueParser = require('./../../parsers/uriKeyValue');
+const uriProcessor = require('./../../http/uriParser');
+const utils = require('./../utils');
+const xsodataFileReader = require('./../../model/xsodataReader');
+
+const ConditionalHttpHandler = require('./../../http/conditionalHttpHandler');
+const DebugInfo = require('./../errors/debugInfo');
+const RequestContext = require('./../requestContext');
+const TestError = require('./../errors/testError');
 
 exports.processPrePostCommitRun = function (request, response, batchContext, context, done) {
     context.logger.silly('batchProcessor', 'processPrePostCommitRun');
@@ -38,7 +38,7 @@ exports.processPrePostCommitRun = function (request, response, batchContext, con
                         }
                     }
                     if (err instanceof DebugInfo) {
-                        var serializer = new json.JsonSerializer(context, 65536, 200);
+                        const serializer = new json.JsonSerializer(context, 65536, 200);
                         serializer.write(err.message);
                         serializer.flush();
                     } else {
@@ -72,8 +72,8 @@ exports.processPrePostCommitRun = function (request, response, batchContext, con
 // STEP batch create tables --> after createNewContentIdFromRecordMapFromPayload
 // move the contentId information to app.contentID which is an link to the corresponding id in part.contentIds
 function fillContentID(context, asyncDone) {
-    var batchContext = context.batchContext;
-    var app = context.app;
+    const batchContext = context.batchContext;
+    const app = context.app;
     if (batchContext.inChangeSet) {
 
         if (app.contentId) {
@@ -90,12 +90,12 @@ function fillContentID(context, asyncDone) {
 // (in the process step) this key values values must be updated with the calculated values.
 // Updated are only the values in the dbsegment, not in the Uri, also reparsing the Uri MUST be avoided.
 function updateContextIdKeyValues(context, asyncDone) {
-    var batchContext = context.batchContext;
+    const batchContext = context.batchContext;
     if (!batchContext.inChangeSet) {
         return asyncDone(null, context);
     }
 
-    var updateDbSegment = null;
+    let updateDbSegment = null;
     const firstSegment = context.oData.dbSegment;
     if (firstSegment.isLinks === true) {
         // no error if there is only one segment or it is a $links segment and there is only one more segment after the $links segment
@@ -110,32 +110,30 @@ function updateContextIdKeyValues(context, asyncDone) {
         updateDbSegment = firstSegment;
     }
 
-    var part = batchContext.processedPart;
-    var contentIds = part.contentIds.list;
+    const part = batchContext.processedPart;
+    const contentIds = part.contentIds.list;
 
 
-    var contentIdInfo = findContentIdInfo(context.request.urlOrig, contentIds);
+    const contentIdInfo = findContentIdInfo(context.request.urlOrig, contentIds);
     if (!contentIdInfo) {
         return asyncDone(null, context);
     }
 
-    var newKeyNV = contentIdInfo.key_nv;
-    var newKeysNames = Object.keys(newKeyNV);
+    const newKeyNV = contentIdInfo.key_nv;
+    const newKeysNames = Object.keys(newKeyNV);
 
     // instead of rewriting the uri and reparsing the uri, the already parsed keys are directly modified
     if (newKeysNames.length !== updateDbSegment._KeyValues.length) {
         return asyncDone(new Error('The key list of the referenced ContentIDs must fit to the parsed key list'), context);
     }
 
-    var keyName;
-    var i;
-    var oldValue, newValue, newValueUri, keyProperty, newValueParsed;
+    let keyName;
+    let i;
+    let newValue, newValueUri, newValueParsed;
     for (i = 0; i < updateDbSegment._KeyValues.length; i++) {
         keyName = updateDbSegment._KeyValues[i].name;
-        keyProperty = updateDbSegment.entityType.propertiesMap[keyName];
-        oldValue = updateDbSegment._KeyValues[i].value;
         newValue = newKeyNV[keyName];
-        newValueUri = newValue; //typeConv.serializeDbValueToUriLiteral(newValue, keyProperty);
+        newValueUri = newValue;
 
         if (newKeyNV[keyName] === undefined) {
             return asyncDone(new Error('The key ' + keyName + 'has not been set by the referenced request'), context);
@@ -149,8 +147,8 @@ function updateContextIdKeyValues(context, asyncDone) {
 
 
 function findContentIdInfo(urlOrig, contentIds) {
-    var contentIdName;
-    var contentIdIndex;
+    let contentIdName;
+    let contentIdIndex;
     for (contentIdIndex = 0; contentIdIndex < contentIds.length; contentIdIndex++) {
         contentIdName = '$' + contentIds[contentIdIndex].id;
         if (urlOrig.indexOf(contentIdName) > -1) {
@@ -167,19 +165,19 @@ function findContentIdInfo(urlOrig, contentIds) {
 function replaceUriContendIds(context, asyncDone) {
     context.logger.silly('batchExecutor', 'check uri for contentID');
 
-    var uri = context.request.url;
-    var batchContext = context.batchContext;
+    let uri = context.request.url;
+    const batchContext = context.batchContext;
     if (!batchContext.inChangeSet) {
         return asyncDone(null, context);
     }
-    var part = batchContext.processedPart;
-    var contentIds = part.contentIds.list;
+    const part = batchContext.processedPart;
+    const contentIds = part.contentIds.list;
 
-    var id;
-    for (var i = 0; i < contentIds.length; i++) {
-        id = '$' + contentIds[i].id;
+    let id;
+    for (const contentId of contentIds) {
+        id = '$' + contentId.id;
         if (uri.indexOf(id) > -1) {
-            uri = uri.replace(id, contentIds[i].value);
+            uri = uri.replace(id, contentId.value);
         }
     }//TODO add check if not all $ are replaced
 
@@ -195,7 +193,7 @@ exports.processCreateTables = function (app, request, response, batchContext, do
         'batchExecutor', 'process step: ' + batchContext.status + ' ' + batchConst.runStateText[batchContext.status]
     );
 
-    var context = new RequestContext(
+    const context = new RequestContext(
         batchContext.parentContext.networkContext,
         batchContext.parentContext.networkContext.requestOptions
     );
@@ -240,7 +238,7 @@ exports.processCreateTables = function (app, request, response, batchContext, do
                         }
                     }
                     if (err instanceof DebugInfo) {
-                        var serializer = new json.JsonSerializer(context, 65536, 200);
+                        const serializer = new json.JsonSerializer(context, 65536, 200);
                         serializer.write(err.message);
                         serializer.flush();
                     } else {
@@ -274,7 +272,7 @@ exports.processCreateTables = function (app, request, response, batchContext, do
 exports.process = function (request, response, batchContext, context, done) {
     context.logger.silly('batchExecutor', 'process step: ' + batchContext.status + ' ' + batchConst.runStateText[batchContext.status]);
 
-    var app = context.app;
+    const app = context.app;
 
     try {
         async.waterfall(
@@ -294,7 +292,7 @@ exports.process = function (request, response, batchContext, context, done) {
                         }
                     }
                     if (err instanceof DebugInfo) {
-                        var serializer = new json.JsonSerializer(context, 65536, 200);
+                        const serializer = new json.JsonSerializer(context, 65536, 200);
                         serializer.write(err.message);
                         serializer.flush();
                     } else {

package/lib/utils/batch/batchObjects.js

@@ -1,8 +1,8 @@
 'use strict';
 
 
-var generatedKey = require('./../keyGenerator');
-var NotSupported = require('./../errors/http/notSupported');
+const generatedKey = require('./../keyGenerator');
+const NotSupported = require('./../errors/http/notSupported');
 exports.Batch = Batch;
 function Batch(type) {
     this.type = type;
@@ -24,7 +24,7 @@ Batch.prototype.write = function (context, response) {
         this.changeSetErrorResponse.writeToBatchResponse(response);
     } else {
         response.statusCode = 200;
-        var boundary = 'batch_' + generatedKey.createBoundary(context);
+        const boundary = 'batch_' + generatedKey.createBoundary(context);
         if (this.isChangeSet) {
             response.write('Content-Type: multipart/mixed; boundary=' + boundary + '\r\n');
             response.write('\r\n'); //end of header
@@ -33,7 +33,7 @@ Batch.prototype.write = function (context, response) {
         }
 
         response.write('--' + boundary + '\r\n');
-        for (var i = 0; i < this.parts.length; i++) {
+        for (let i = 0; i < this.parts.length; i++) {
             if (i !== 0) {
                 response.write('\r\n--' + boundary + '\r\n');
             }
@@ -90,13 +90,13 @@ exports.BatchContent = BatchContent;
 
 
 function split(input) {
-    var LF = '\n';
-    var CRLF = '\r\n';
-    var a = [];
+    const LF = '\n';
+    const CRLF = '\r\n';
+    const a = [];
 
-    var pL = 0;
-    var p1 = input.indexOf(CRLF, pL);
-    var p2 = input.indexOf(LF, pL);
+    let pL = 0;
+    let p1 = input.indexOf(CRLF, pL);
+    let p2 = input.indexOf(LF, pL);
 
     while (p1 !== -1 || p2 !== -1) {
         if (p1 !== -1 && p1 <= p2) {