@sap/cds-dk 7.9.4 → 8.0.2

package/lib/import/odata/v2parser.js

@@ -77,6 +77,7 @@ function _initialize(parserContext) {
 	parserContext.allInheritedEntityTypes = [];
 	parserContext.allowedNamespaces = [];
 	parserContext.allowAllNamespaces = false;
+	parserContext.mockServerUc = true;
 }
 
 // Function to extract allowed namespace attributes from given set of attributes
@@ -138,12 +139,16 @@ function _isValidEDMX(jsonObj) {
 	return isValid;
 }
 
-function _hasEntityContainer(jsonObj) {
-	let isEntityContainerPresent = !!jsonObj["edmx:Edmx"]["edmx:DataServices"].Schema.EntityContainer;
-	if (!isEntityContainerPresent) {
-		throw new Error(messages.MISSING_ENTITY_CONTAINER);
+function _settingMockServerUc(jsonObj, parserContext) {
+	let EntityContainerObj = jsonObj["edmx:Edmx"]["edmx:DataServices"].Schema.EntityContainer;
+	// Setting mockerserverUc to false when there is no EntityContainer or when the EntityContainer exists but has no elements inside it
+	if (!EntityContainerObj || (EntityContainerObj && !EntityContainerObj.EntitySet && !EntityContainerObj.FunctionImport && !EntityContainerObj.AssociationSet)) {
+		parserContext.mockServerUc = false;
+	}
+	// Importer throws an error if AssociationSet is present without corresponding entitySets
+	else if ((EntityContainerObj && !EntityContainerObj.EntitySet && EntityContainerObj.AssociationSet)) {
+		throw new Error(messages.MISSING_ENTITY_SETS);
 	}
-	return isEntityContainerPresent;
 }
 
 function _isValidEDMXProvided(jsonObj) {
@@ -156,13 +161,6 @@ function _isValidEDMXProvided(jsonObj) {
 	return isValid;
 }
 
-function _validateEDMX(jsonObj) {
-	return (
-		_isValidEDMXProvided(jsonObj) &&
-		_hasEntityContainer(jsonObj)
-	);
-}
-
 function _getServiceNameSpace(jsonObj) {
 	let schemaArr = jsonObj["edmx:Edmx"]["edmx:DataServices"].Schema;
 	let schema = schemaArr;
@@ -183,12 +181,21 @@ function _getServiceNameSpace(jsonObj) {
 	return null;
 }
 
+function _checkAssociation(associationSet, parserContext) {
+	Object.keys(associationSet).forEach((i) => {
+		if (!parserContext.allEntitiesMC.includes(associationSet[i]._attributes.EntitySet)) {
+			throw new Error(messages.UNRESOLVED_TYPE + `'${associationSet[i]._attributes.EntitySet}'`);
+		}
+	});
+}
+
 function _extractAssociationSet(associationSet, parserContext) {
 	let associations = {};
 	Object.keys(associationSet).forEach((key) => {
 		if (key === "_attributes") {
 			associations.Name = associationSet[key].Name;
 			associations.End = associationSet.End;
+			_checkAssociation(associations.End, parserContext);
 			parserContext.allAssociationSets[associationSet[key].Association] = associations;
 		}
 	});
@@ -319,8 +326,23 @@ function _extractFunctionImport(functionImport, parserContext) {
 	});
 }
 
+function _checkFunctionImports(functionImports, parserContext) {
+	if(functionImports.length) {
+		functionImports.forEach((functionImport) => {
+			if (functionImport._attributes.EntitySet && !parserContext.allEntitiesMC.includes(functionImport._attributes.EntitySet)) {
+				throw new Error(messages.UNRESOLVED_TYPE + `'${functionImport._attributes.EntitySet}'`);
+			}
+		});
+	} else {
+		if (functionImports._attributes.EntitySet && !parserContext.allEntitiesMC.includes(functionImports._attributes.EntitySet)) {
+			throw new Error(messages.UNRESOLVED_TYPE + `'${functionImports._attributes.EntitySet}'`);
+		}
+	}
+} 
+
 //extracting the function imports from the metadata
 function _extractAllFunctionImports(functionImports, parserContext) {
+	_checkFunctionImports(functionImports, parserContext)
 	if (functionImports.length) {
 		//Has many function imports in metadata
 		for (let i = 0; i < functionImports.length; i++) {
@@ -1077,19 +1099,19 @@ function _generateCSNEntityProperties(entityKeysList, entityPropertiesMap, parse
 	return csnEntity;
 }
 
-function _getAssociatedEntity(associationEnds, toRole, isAssociationSetMissing, mockServerUc, parserContext) {
+function _getAssociatedEntity(associationEnds, toRole, isAssociationSetMissing, parserContext) {
 	let entityName;
 	let entitySetName;
 	let entityTypeName;
 	Object.keys(associationEnds).forEach((i) => {
 		if (toRole === associationEnds[i]._attributes.Role) {
-			if (isAssociationSetMissing) {
+			if (isAssociationSetMissing && parserContext.mockServerUc) {
 				entityTypeName = associationEnds[i]._attributes.Type;
 				entitySetName = parserContext.allEntitySetMapMC[entityTypeName][0];
-			} else  {
+			} else {
 				entitySetName = associationEnds[i]._attributes.EntitySet;
 			}
-			if (mockServerUc) {
+			if (parserContext.mockServerUc) {
 				entityName = parserContext.serviceNamespace + "." + entitySetName;
 			} else {
 				entityName = parserContext.allEntitySetMap[entitySetName];
@@ -1099,7 +1121,7 @@ function _getAssociatedEntity(associationEnds, toRole, isAssociationSetMissing,
 	return entityName;
 }
 
-function _getCSNMultiplicity(associationEnds, toRole, entityName, mockServerUc, parserContext) {
+function _getCSNMultiplicity(associationEnds, toRole, entityName, parserContext) {
 	let csn = "";
 	let multiplicity;
 	let attributes;
@@ -1107,7 +1129,7 @@ function _getCSNMultiplicity(associationEnds, toRole, entityName, mockServerUc,
 	Object.keys(associationEnds).forEach((i) => {
 		if (!stop) {
 			attributes = associationEnds[i]._attributes;
-			if (mockServerUc) {
+			if (parserContext.mockServerUc) {
 				let entityNameWithOutNS = parserContext.allEntitySetMap[_extractEntityFromNamespace(entityName)];
 				if (
 					toRole === attributes.Role &&
@@ -1121,7 +1143,7 @@ function _getCSNMultiplicity(associationEnds, toRole, entityName, mockServerUc,
 					toRole === attributes.Role &&
 					entityName === attributes.Type
 				) {
-					// eslint-disable-line no-lonely-if
+					 
 					multiplicity = attributes.Multiplicity;
 					stop = true;
 				}
@@ -1140,137 +1162,15 @@ function _getCSNMultiplicity(associationEnds, toRole, entityName, mockServerUc,
 	return csn;
 }
 
-function _getCSNRefrenentialCondition(navPropName, from, to) {
-	let csn = "{\n";
-	csn = csn + '"ref": [\n';
-	csn = csn + '"' + navPropName + '",\n';
-	csn = csn + '"' + from + '"\n';
-	csn = csn + "]\n";
-	csn = csn + "},\n";
-
-	csn = csn + '"=",\n';
-
-	csn = csn + "{\n";
-	csn = csn + '"ref": [\n';
-	csn = csn + '"' + to + '"';
-	csn = csn + "]\n";
-	csn = csn + "}\n";
-	return csn;
-}
-
-function _getCSNMultipleRefrenentialConditions(refConstraints, navPropName, role) {
-	let csn = "";
-	csn = csn + '"on": [\n';
-	Object.keys(refConstraints).forEach((i) => {
-		let roleName = refConstraints[i].Principal._attributes.Role;
-		let principalProperties = refConstraints[i].Principal.PropertyRef;
-		let dependentProperties = refConstraints[i].Dependent.PropertyRef;
-		let from = "";
-		let to = "";
-		if (roleName && roleName === role) {
-			from = principalProperties._attributes.Name;
-			to = dependentProperties._attributes.Name;
-		} else {
-			from = dependentProperties._attributes.Name;
-			to = principalProperties._attributes.Name;
-		}
-		csn = csn + _getCSNRefrenentialCondition(navPropName, from, to);
-		if (i < refConstraints.length - 1) {
-			csn = csn + ",\n";
-			csn = csn + '"and",\n';
-		}
-	});
-	csn = csn + "]\n";
-	return csn;
-}
-
-function _getCSNRefrenentialConditions(refConstraints, navPropName, role) {
-	let csn = "";
-	let from;
-	let to;
-	let roleName = refConstraints.Principal._attributes.Role;
-	let principalProperties = refConstraints.Principal.PropertyRef;
-	let dependentProperties = refConstraints.Dependent.PropertyRef;
-	if (dependentProperties.length > 0) {
-		// Multiple principal and dependents within Referential Constraint
-		csn = csn + '"on": [\n';
-		Object.keys(dependentProperties).forEach((i) => {
-			if (roleName && roleName === role) {
-				from = principalProperties[i]._attributes.Name;
-				to = dependentProperties[i]._attributes.Name;
-			} else {
-				from = dependentProperties[i]._attributes.Name;
-				to = principalProperties[i]._attributes.Name;
-			}
-			csn = csn + _getCSNRefrenentialCondition(navPropName, from, to);
-			if (i < dependentProperties.length - 1) {
-				csn = csn + ",\n";
-				csn = csn + '"and",\n';
-			}
-		});
-		csn = csn + "]\n";
-	} else {
-		// Single principal and dependents within Referential Constraint
-		csn = csn + '"on": [\n';
-		if (roleName && roleName === role) {
-			from = principalProperties._attributes.Name;
-			to = dependentProperties._attributes.Name;
-		} else {
-			from = dependentProperties._attributes.Name;
-			to = principalProperties._attributes.Name;
-		}
-		csn = csn + _getCSNRefrenentialCondition(navPropName, from, to);
-		csn = csn + "]\n";
-	}
-	return csn;
-}
-
-function _getCSNRefrenentialConstraints(associations, navPropName, toRole) {
-	let csn = "";
-	let endProperties;
-	let matchingRole = "";
-	let refConstraints = associations.ReferentialConstraint;
-	if (!refConstraints) {
-		return csn;
-	}
-	endProperties = associations.End;
-	Object.keys(endProperties).forEach((i) => {
-		let role = endProperties[i]._attributes.Role;
-		if (role && role === toRole) {
-			matchingRole = endProperties[i]._attributes.Role;
-		}
-	});
-	if (refConstraints.length > 0) {
-		// Multiple referential constraints within Association
-		csn = csn +
-			_getCSNMultipleRefrenentialConditions(
-				refConstraints,
-				navPropName,
-				matchingRole
-			);
-	} else {
-		// Single referential constraint within Association
-		csn = csn +
-			_getCSNRefrenentialConditions(
-				refConstraints,
-				navPropName,
-				matchingRole
-			);
-	}
-	return csn;
-}
-
 function _getCSNAssociatedRefrenentialConstraints(
 	associations,
 	toRole,
 	entityName,
 	navPropName,
-	mockServerUc,
 	parserContext
 ) {
 	let csn = "";
 	let multiplicity;
-	let referentialConstraint;
 	csn = csn + '"target": "' + entityName + '"';
 	if (!associations) {
 		return csn;
@@ -1279,21 +1179,12 @@ function _getCSNAssociatedRefrenentialConstraints(
 		associations.End,
 		toRole,
 		entityName,
-		mockServerUc,
 		parserContext
 	);
 	if (multiplicity) {
 		csn = csn + ",\n" + multiplicity;
 	}
-	referentialConstraint = _getCSNRefrenentialConstraints(
-		associations,
-		navPropName,
-		toRole,
-		mockServerUc
-	);
-	if (referentialConstraint) {
-		csn = csn + ",\n" + referentialConstraint;
-	}
+
 	return csn;
 }
 
@@ -1301,7 +1192,6 @@ function _getCSNAssociatedEntitySet(
 	relationshipName,
 	toRole,
 	navPropName,
-	mockServerUc,
 	parserContext
 ) {
 	let associationSet = parserContext.allAssociationSets[relationshipName];
@@ -1313,13 +1203,11 @@ function _getCSNAssociatedEntitySet(
 	if (associationSet === undefined) {
 		isAssociationSetMissing = true;
 	}
-
 	let associationEnd = associationSet ? associationSet.End : association.End;
 	let entityName = _getAssociatedEntity(
 		associationEnd,
 		toRole,
 		isAssociationSetMissing,
-		mockServerUc,
 		parserContext
 	);
 	let differentAssociationNames;
@@ -1341,7 +1229,6 @@ function _getCSNAssociatedEntitySet(
 		toRole,
 		entityName,
 		navPropName,
-		mockServerUc,
 		parserContext
 	);
 }
@@ -1371,7 +1258,7 @@ function _findAssociationType(relationshipName, fromRole, parserContext) {
 	return '"type": "cds.' + (associationType === "composition" ? 'Composition"' : 'Association"') + ',\n';
 }
 
-function _getServiceEntityNavigationProperty(navPropAttributes, mockServerUc, parserContext) {
+function _getServiceEntityNavigationProperty(navPropAttributes, parserContext) {
 	let csn = "";
 	let navPropName;
 	let relationshipName;
@@ -1392,12 +1279,6 @@ function _getServiceEntityNavigationProperty(navPropAttributes, mockServerUc, pa
 	if (allowedNamespaceAttributes.length) {
 		csn += _generateNamespaceAttributes(allowedNamespaceAttributes, false);
 	}
-	// annotation for on conditions
-	csn = csn + `"@cds.ambiguous": "missing on condition?",\n`;
-
-	//Code for notNull working but change is not reflecting when we use: cds compile {file-path} -2 edmx > {newFileName} 
-	/*if (navPropAttributes.Nullable === "false")
-		csn = csn + '"notNull": true,\n';*/
 
 	// if documentation exists for navigation property
 	if (navPropDoc)
@@ -1409,7 +1290,6 @@ function _getServiceEntityNavigationProperty(navPropAttributes, mockServerUc, pa
 			relationshipName,
 			toRole,
 			navPropName,
-			mockServerUc,
 			parserContext
 		);
 	// Convert managed associations and compositions in unmanaged with empty key to avoid
@@ -1425,7 +1305,6 @@ function _getServiceEntityNavigationProperty(navPropAttributes, mockServerUc, pa
 function _generateCSNEntityNavigationProperties(
 	entityNavigationPropertiesMap,
 	hasProperties,
-	mockServerUc,
 	parserContext
 ) {
 	let csn = "";
@@ -1447,7 +1326,6 @@ function _generateCSNEntityNavigationProperties(
 		csn = csn +
 			_getServiceEntityNavigationProperty(
 				navPropAttributes,
-				mockServerUc,
 				parserContext
 			);
 		if (i < entityNavProperties.length - 1) {
@@ -1474,7 +1352,6 @@ function _constructServiceEntity(
 	entityNavigationPropertiesMap,
 	entityAttributes,
 	ignorePersistenceSkip,
-	mockServerUc,
 	documentation,
 	parserContext
 ) {
@@ -1547,7 +1424,6 @@ function _constructServiceEntity(
 		_generateCSNEntityNavigationProperties(
 			entityNavigationPropertiesMap,
 			hasProperties,
-			mockServerUc,
 			parserContext
 		);
 	csnEntity = csnEntity + "}\n";
@@ -1591,7 +1467,7 @@ function _addBlobElement(properties) {
 	properties['blob'] = blobElement;
 }
 
-function _parseServiceEntity(entityName, entity, ignorePersistenceSkip, mockServerUc, parserContext) {
+function _parseServiceEntity(entityName, entity, ignorePersistenceSkip, parserContext) {
 	let entityAttributes;
 	let entityKeysList;
 	let entityPropertiesMap;
@@ -1642,18 +1518,17 @@ function _parseServiceEntity(entityName, entity, ignorePersistenceSkip, mockServ
 		entityNavigationPropertiesMap,
 		entityAttributes,
 		ignorePersistenceSkip,
-		mockServerUc,
 		documentation,
 		parserContext
 	);
 }
 
-function _getEntitesWithNamesFromEntitySets(entityJson, mockServerUc, parserContext) {
-	const getEntityName = mockServerUc
+function _getEntitesWithNamesFromEntitySets(entityJson, parserContext) {
+	const getEntityName = parserContext.mockServerUc
 		? (entity) => parserContext.allEntitySetMapMC[parserContext.serviceNamespace + "." + _getEntityName(entity)]
 		: (entity) => [_getEntityName(entity)];
 
-	const isNameInEntitySet = mockServerUc
+	const isNameInEntitySet = parserContext.mockServerUc
 		? (name) => parserContext.allEntitiesMC.indexOf(name) >= 0
 		: (name) => parserContext.allEntities.indexOf(name) >= 0;
 
@@ -1693,31 +1568,30 @@ function _getEntitesWithNamesFromEntityTypes(entityJson, parserContext) {
 	return entities;
 }
 
-function _parsingServiceEntities(entitiesWithNames, ignorePersistenceSkip, mockServerUc, parserContext) {
+function _parsingServiceEntities(entitiesWithNames, ignorePersistenceSkip, parserContext) {
 	return entitiesWithNames.map((entityWithName) =>
 		entityWithName.name.map((entityName) =>
 			_parseServiceEntity(
 				entityName,
 				entityWithName.entity,
 				ignorePersistenceSkip,
-				mockServerUc,
 				parserContext
 			)
 		).join("},") + "}"
 	);
 }
 
-function _getServiceEntitites(entityJson = [], ignorePersistenceSkip, mockServerUc, parserContext) {
+function _getServiceEntitites(entityJson = [], ignorePersistenceSkip, parserContext) {
 	const entities = Array.isArray(entityJson) ? entityJson : [entityJson];
 	let entitiesWithNames = []; // [0]-> entity set, [1]-> entity type
 	let parsedEntities = []; // [0]-> entity set, [1]-> entity type
 
-	entitiesWithNames[0] = _getEntitesWithNamesFromEntitySets(entities, mockServerUc, parserContext);
+	entitiesWithNames[0] = _getEntitesWithNamesFromEntitySets(entities, parserContext);
 	entitiesWithNames[1] = _getEntitesWithNamesFromEntityTypes(entities, parserContext);
 
 	for (let i = 0; i < 2; i++) {
 		if (entitiesWithNames[i].length) {
-			parsedEntities[i] = _parsingServiceEntities(entitiesWithNames[i], ignorePersistenceSkip, mockServerUc, parserContext);
+			parsedEntities[i] = _parsingServiceEntities(entitiesWithNames[i], ignorePersistenceSkip, parserContext);
 		}
 	}
 
@@ -1747,33 +1621,28 @@ function _getServiceEntitites(entityJson = [], ignorePersistenceSkip, mockServer
 	return "";
 }
 
-function _generateEDMXJSON2CSN(jsonObj, ignorePersistenceSkip, mockServerUc, parserContext) {
+function _checkEntityType(entityJson, parserContext) {
+	const entity = Object.values(entityJson).map(item => item._attributes.Name);
+
+	Object.keys(parserContext.allEntities).forEach((i) => {
+		if (!entity.includes(parserContext.allEntities[i])) {
+			throw new Error(messages.UNRESOLVED_TYPE + `'${parserContext.allEntities[i]}'`);
+		}
+	});
+}
+
+function _generateEDMXJSON2CSN(jsonObj, ignorePersistenceSkip, parserContext) {
 	const csn = {};
 	csn.meta = {};
 	csn.meta.creator = 'cds-dk ' + versionInfo;
 	csn.$version = '2.0';
 	csn.definitions = {};
 
-	// Extract association sets
-	let associationSets = jsonObj["edmx:Edmx"]["edmx:DataServices"].Schema.EntityContainer.AssociationSet;
-	if (associationSets) {
-		_extractAllAssociationSets(associationSets, parserContext);
-	}
 	// Extract associations
 	const associations = jsonObj["edmx:Edmx"]["edmx:DataServices"].Schema.Association;
 	if (associations) {
 		_extractAllAssociations(associations, parserContext);
 	}
-	// Extract entities from EntitySets
-	const entitySets = jsonObj["edmx:Edmx"]["edmx:DataServices"].Schema.EntityContainer.EntitySet;
-	if (entitySets) {
-		_extractAllEntityFromEntitySets(entitySets, parserContext);
-	}
-	// Extract function imports
-	const functionImports = jsonObj["edmx:Edmx"]["edmx:DataServices"].Schema.EntityContainer.FunctionImport;
-	if (functionImports) {
-		_extractAllFunctionImports(functionImports, parserContext);
-	}
 	// Extract complex types
 	const complexTypes = jsonObj["edmx:Edmx"]["edmx:DataServices"].Schema.ComplexType;
 	if (complexTypes) {
@@ -1784,7 +1653,7 @@ function _generateEDMXJSON2CSN(jsonObj, ignorePersistenceSkip, mockServerUc, par
 	const entityJson = jsonObj["edmx:Edmx"]["edmx:DataServices"].Schema.EntityType;
 	const definitions = [];
 
-	if (mockServerUc) {
+	if (parserContext.mockServerUc) {
 		let def = '"' + parserContext.serviceNamespace + '": {"kind": "service"' + ',\n' + '"@cds.external": true';
 		let serviceDoc = jsonObj["edmx:Edmx"]["edmx:DataServices"]["Schema"].EntityContainer.Documentation;
 		let namespaceAttributes = namespaceAttributeFilter(
@@ -1799,10 +1668,26 @@ function _generateEDMXJSON2CSN(jsonObj, ignorePersistenceSkip, mockServerUc, par
 			def += _generateNamespaceAttributes(namespaceAttributes, true);
 		def += "}";
 		definitions.push(def);
+		// Extract entities from EntitySets
+		const entitySets = jsonObj["edmx:Edmx"]["edmx:DataServices"].Schema.EntityContainer.EntitySet;
+		if (entitySets) {
+			_extractAllEntityFromEntitySets(entitySets, parserContext);
+			_checkEntityType(entityJson, parserContext);
+		}
+		// Extract association sets
+		let associationSets = jsonObj["edmx:Edmx"]["edmx:DataServices"].Schema.EntityContainer.AssociationSet;
+		if (associationSets) {
+			_extractAllAssociationSets(associationSets, parserContext);
+		}
+		// Extract function imports
+		const functionImports = jsonObj["edmx:Edmx"]["edmx:DataServices"].Schema.EntityContainer.FunctionImport;
+		if (functionImports) {
+			_extractAllFunctionImports(functionImports, parserContext);
+		}
 	}
 
 	if (entityJson) {
-		definitions.push(_getServiceEntitites(entityJson, ignorePersistenceSkip, mockServerUc, parserContext));
+		definitions.push(_getServiceEntitites(entityJson, ignorePersistenceSkip, parserContext));
 	}
 
 	// If complex type exists
@@ -1832,6 +1717,7 @@ function getEdmxv2CSN(edmx2jsonModel, ignorePersistenceSkip, mockServerUc, conte
 
 	const parserContext = {};
 	_initialize(parserContext);
+	parserContext.mockServerUc = mockServerUc
 	
 	if (!context.include_all_namespaces && context.namespaces.length) {
 		parserContext.allowedNamespaces = parserContext.allowedNamespaces.concat(context.namespaces)
@@ -1840,7 +1726,8 @@ function getEdmxv2CSN(edmx2jsonModel, ignorePersistenceSkip, mockServerUc, conte
 		parserContext.allowAllNamespaces = true;
 	}
 
-	isValid = _validateEDMX(edmx2jsonModel);
+	isValid = _isValidEDMXProvided(edmx2jsonModel);
+	_settingMockServerUc(edmx2jsonModel, parserContext)
 	if (isValid) {
 		parserContext.serviceNamespace = _getServiceNameSpace(edmx2jsonModel);
 		context.schemaNamespace = parserContext.serviceNamespace; // required for `--keep-namespace` scenario
@@ -1853,7 +1740,6 @@ function getEdmxv2CSN(edmx2jsonModel, ignorePersistenceSkip, mockServerUc, conte
 		csnDataModel = _generateEDMXJSON2CSN(
 			edmx2jsonModel,
 			ignorePersistenceSkip,
-			mockServerUc,
 			parserContext
 		);
 	}

package/lib/import/odata/v4parser.js

@@ -636,21 +636,7 @@ function _generateStructuredDataTypeCsn(dataType, propertyObject, isPrimaryKey,
 
 function _parseAssociationProperty(foreignReference, associationNode, parserContext) {
     const associationProperty = {};
-    let foreignKeys;
-    // var foreignReference = associationNode.$Type;
-    let refConstraint = associationNode.$ReferentialConstraint;
-    let data;
-    let ref;
-
     associationProperty.type = (associationNode.$OnDelete === 'Cascade') ? 'cds.Composition' : 'cds.Association';
-    // annotation for ON condition
-    associationProperty["@cds.ambiguous"] = 'missing on condition?';
-    // associationProperty.target = associationNode.$Type;
-
-    // Code for NavigationProperty for notNull
-    // if (!associationProperty.$Nullable) {
-    //     associationProperty["notNull"] = true;
-    // }
 
     let resolvedEntityName;
     let entityTypeMapping = (
@@ -686,29 +672,6 @@ function _parseAssociationProperty(foreignReference, associationNode, parserCont
     } else {
         associationProperty.cardinality.max = 1;
     }
-    // on -> "SalesOrders.CustomerID=CustomerID and SalesOrders.Type=Type"
-    if (refConstraint) {
-        associationProperty.on = [];
-        foreignKeys = Object.keys(refConstraint);
-
-        for (let i = 0; i < foreignKeys.length; i++) {
-            data = {};
-            ref = [];
-            ref.push(foreignReference);
-            ref.push(refConstraint[foreignKeys[i]]);
-            data.ref = ref;
-            associationProperty.on.push(data);
-            associationProperty.on.push('=');
-            data = {};
-            ref = [];
-            ref.push(foreignKeys[i]);
-            data.ref = ref;
-            associationProperty.on.push(data);
-            if (i < foreignKeys.length - 1) {
-                associationProperty.on.push(' and ');
-            }
-        }
-    }
     // Convert managed associations and compositions in unmanaged with empty key to avoid
     // "generation" of keys, that do not exist in the external service.
     if (common.checkForEmptyKeys(associationProperty, "V4")) {
@@ -1723,7 +1686,7 @@ function _generateEDMX2JSON(edmx, name_space) {
             const v4Conv = MetadataConverterFactory.createEdmxV40XmlToV40Json(name_space);
             v4Conv.execute(inputBuffer, (error, json, missingReferencedDocuments) => {
                 if (missingReferencedDocuments?.length > 0) {
-                    console.log(missingReferencedDocuments); // eslint-disable-line no-console
+                    console.log(missingReferencedDocuments);  
                 }
                 resolve(json);
             });