[INTERNAL] sap.ui.model.odata.v4: use URL term

PS1: do it

Change-Id: I46acdac4be6baa15ecc14bfe4c28ddde2289cbdf
JIRA: CPOUI5ODATAV4-3396
CI: 219

Author: larskissel

src/sap.ui.core/src/sap/ui/model/odata/v4/ODataMetaModel.js

@@ -177,7 +177,7 @@ sap.ui.define([
 		 *   The metadata requestor
 		 * @param {string} sUrl
 		 *   The URL to the $metadata document of the service
-		 * @param {string|string[]} [vAnnotationUri]
+		 * @param {string|string[]} [vAnnotationURL]
 		 *   The URL (or an array of URLs) from which the annotation metadata are loaded
 		 *   Supported since 1.41.0
 		 * @param {sap.ui.model.odata.v4.ODataModel} oModel
@@ -559,7 +559,7 @@ sap.ui.define([
 	 *   The metadata requestor
 	 * @param {string} sUrl
 	 *   The URL to the $metadata document of the service
-	 * @param {string|string[]} [vAnnotationUri]
+	 * @param {string|string[]} [vAnnotationURL]
 	 *   The URL (or an array of URLs) from which the annotation metadata are loaded
 	 *   Supported since 1.41.0
 	 * @param {sap.ui.model.odata.v4.ODataModel} oModel
@@ -571,10 +571,10 @@ sap.ui.define([
 	 * @param {string} [sLanguage]
 	 *   The "sap-language" URL parameter
 	 */
-	function constructor(oRequestor, sUrl, vAnnotationUri, oModel, bSupportReferences, sLanguage) {
+	function constructor(oRequestor, sUrl, vAnnotationURL, oModel, bSupportReferences, sLanguage) {
 		MetaModel.call(this);
-		this.aAnnotationUris = vAnnotationUri && !Array.isArray(vAnnotationUri)
-			? [vAnnotationUri] : vAnnotationUri;
+		this.aAnnotationURLs = vAnnotationURL && !Array.isArray(vAnnotationURL)
+			? [vAnnotationURL] : vAnnotationURL;
 		this.sDefaultBindingMode = BindingMode.OneTime;
 		this.mETags = {};
 		this.sForbiddenSchema = undefined; // data service's schema in case of a value help service
@@ -616,35 +616,35 @@ sap.ui.define([
 	ODataMetaModel.prototype.$$valueAsPromise = true;
 
 	/**
-	 * Adds the given reference URI to the map of reference URIs for schemas.
+	 * Adds the given reference URL to the map of reference URLs for schemas.
 	 *
 	 * @param {string} sSchema
 	 *   A namespace of a schema, for example "foo.bar."
-	 * @param {string} sReferenceUri
-	 *   A URI to the metadata document for the given schema
-	 * @param {string} [sDocumentUri]
-	 *   The URI to the metadata document containing the given reference to the given schema
+	 * @param {string} sReferenceURL
+	 *   A URL to the metadata document for the given schema
+	 * @param {string} [sDocumentURL]
+	 *   The URL to the metadata document containing the given reference to the given schema
 	 * @throws {Error}
-	 *   If the schema has already been loaded from a different URI
+	 *   If the schema has already been loaded from a different URL
 	 *
 	 * @private
 	 */
-	ODataMetaModel.prototype._addUrlForSchema = function (sSchema, sReferenceUri, sDocumentUri) {
+	ODataMetaModel.prototype._addUrlForSchema = function (sSchema, sReferenceURL, sDocumentURL) {
 		var sUrl0,
 			mUrls = this.mSchema2MetadataUrl[sSchema];
 
 		if (!mUrls) {
 			mUrls = this.mSchema2MetadataUrl[sSchema] = {};
-			mUrls[sReferenceUri] = false;
-		} else if (!(sReferenceUri in mUrls)) {
+			mUrls[sReferenceURL] = false;
+		} else if (!(sReferenceURL in mUrls)) {
 			sUrl0 = Object.keys(mUrls)[0];
 			if (mUrls[sUrl0]) {
 				// document already processed, no different URLs allowed
 				this._reportAndThrowError("A schema cannot span more than one document: "
-					+ sSchema + " - expected reference URI " + sUrl0 + " but instead saw "
-					+ sReferenceUri, sDocumentUri);
+					+ sSchema + " - expected reference URL " + sUrl0 + " but instead saw "
+					+ sReferenceURL, sDocumentURL);
 			}
-			mUrls[sReferenceUri] = false;
+			mUrls[sReferenceURL] = false;
 		}
 	};
 
@@ -697,7 +697,7 @@ sap.ui.define([
 	 * @see #_getAnnotationsForSchema
 	 */
 	ODataMetaModel.prototype._copyAnnotations = function (oMetaModel) {
-		if (this.aAnnotationUris) {
+		if (this.aAnnotationURLs) {
 			throw new Error("Must not copy annotations when there are local annotation files");
 		}
 
@@ -788,7 +788,7 @@ sap.ui.define([
 	 *   The schema, or a promise which is resolved without details or rejected with an error, or
 	 *   <code>undefined</code>.
 	 * @throws {Error}
-	 *   If the schema has already been loaded and read from a different URI
+	 *   If the schema has already been loaded and read from a different URL
 	 *
 	 * @private
 	 */
@@ -866,7 +866,7 @@ sap.ui.define([
 	 * @param {object[]} aAnnotationFiles
 	 *   The metadata "JSON" of the additional annotation files
 	 * @throws {Error}
-	 *   If metadata cannot be merged or if the schema has already been loaded from a different URI
+	 *   If metadata cannot be merged or if the schema has already been loaded from a different URL
 	 *
 	 * @private
 	 */
@@ -889,17 +889,17 @@ sap.ui.define([
 			var oElement,
 				sQualifiedName;
 
-			that.validate(that.aAnnotationUris[i], mAnnotationScope);
+			that.validate(that.aAnnotationURLs[i], mAnnotationScope);
 			for (sQualifiedName in mAnnotationScope) {
 				if (sQualifiedName[0] !== "$") {
 					if (sQualifiedName in mScope) {
 						that._reportAndThrowError("A schema cannot span more than one document: "
-							+ sQualifiedName, that.aAnnotationUris[i]);
+							+ sQualifiedName, that.aAnnotationURLs[i]);
 					}
 					oElement = mAnnotationScope[sQualifiedName];
 					mScope[sQualifiedName] = oElement;
 					if (oElement.$kind === "Schema") {
-						that._addUrlForSchema(sQualifiedName, that.aAnnotationUris[i]);
+						that._addUrlForSchema(sQualifiedName, that.aAnnotationURLs[i]);
 						that._doMergeAnnotations(oElement, mScope.$Annotations, true);
 					}
 				}
@@ -1139,10 +1139,10 @@ sap.ui.define([
 			aPromises
 				= [SyncPromise.resolve(this.oRequestor.read(this.sUrl, false, bPrefetch))];
 
-			if (this.aAnnotationUris) {
-				this.aAnnotationUris.forEach(function (sAnnotationUri) {
+			if (this.aAnnotationURLs) {
+				this.aAnnotationURLs.forEach(function (sAnnotationURL) {
 					aPromises.push(SyncPromise.resolve(
-						that.oRequestor.read(sAnnotationUri, true, bPrefetch)));
+						that.oRequestor.read(sAnnotationURL, true, bPrefetch)));
 				});
 			}
 			if (!bPrefetch) {
@@ -3749,21 +3749,21 @@ sap.ui.define([
 	 * @returns {object}
 	 *   <code>mScope</code> to allow "chaining"
 	 * @throws {Error}
-	 *   If validation fails or if the schema has already been loaded from a different URI
+	 *   If validation fails or if the schema has already been loaded from a different URL
 	 *
 	 * @private
 	 */
 	ODataMetaModel.prototype.validate = function (sUrl, mScope) {
-		var oDate, oLastModified, sSchema, oReference, sReferenceUri, i;
+		var oDate, oLastModified, sSchema, oReference, sReferenceURL, i;
 
 		if (!this.bSupportReferences) {
 			return mScope;
 		}
 
-		for (sReferenceUri in mScope.$Reference) {
-			oReference = mScope.$Reference[sReferenceUri];
-			// interpret reference URI relative to metadata URL
-			sReferenceUri = _Helper.makeAbsolute(sReferenceUri, this.sUrl);
+		for (sReferenceURL in mScope.$Reference) {
+			oReference = mScope.$Reference[sReferenceURL];
+			// interpret reference URL relative to metadata URL
+			sReferenceURL = _Helper.makeAbsolute(sReferenceURL, this.sUrl);
 
 			if ("$IncludeAnnotations" in oReference) {
 				this._reportAndThrowError("Unsupported IncludeAnnotations", sUrl);
@@ -3775,7 +3775,7 @@ sap.ui.define([
 						+ sSchema + " - is both included and defined",
 						sUrl);
 				}
-				this._addUrlForSchema(sSchema, sReferenceUri, sUrl);
+				this._addUrlForSchema(sSchema, sReferenceURL, sUrl);
 			}
 		}
 

src/sap.ui.core/src/sap/ui/model/odata/v4/ODataModel.js

@@ -209,7 +209,7 @@ sap.ui.define([
 		 *   >"4 Resource Path"</a> in specification "OData Version 4.01. Part 2: URL Conventions"
 		 *   is a valid data binding path within this model if a leading slash is added; for example
 		 *   "/" + "SalesOrderList('A%2FB%26C')" to access an entity instance with key "A/B&C". Note
-		 *   that appropriate URI encoding is necessary, see the example of
+		 *   that appropriate URL encoding is necessary, see the example of
 		 *   {@link sap.ui.model.odata.v4.ODataUtils.formatLiteral}. "4.5.1 Addressing Actions"
 		 *   needs an operation binding, see {@link sap.ui.model.odata.v4.ODataContextBinding}.
 		 *
@@ -1736,7 +1736,7 @@ sap.ui.define([
 	 * @param {object} oEntity
 	 *   The entity instance with the key property values
 	 * @returns {sap.ui.base.SyncPromise<string|undefined>}
-	 *   A promise that gets resolved with the proper URI encoded key predicate, for example
+	 *   A promise that gets resolved with the proper URL encoded key predicate, for example
 	 *   "(Sector='A%2FB%26C',ID='42')" or "('42')", or <code>undefined</code>, if at least one key
 	 *   property is undefined. It gets rejected if the metadata cannot be fetched or in case the
 	 *   entity has no key properties according to metadata.
@@ -2027,7 +2027,7 @@ sap.ui.define([
 	 * @param {object} oEntity
 	 *   The entity instance with the key property values
 	 * @returns {string|undefined}
-	 *   The proper URI-encoded key predicate, for example "(Sector='A%2FB%26C',ID='42')" or
+	 *   The proper URL-encoded key predicate, for example "(Sector='A%2FB%26C',ID='42')" or
 	 *   "('42')", or <code>undefined</code> if at least one key property is undefined.
 	 * @throws {Error}
 	 *   If the key predicate cannot be determined synchronously
@@ -2391,7 +2391,7 @@ sap.ui.define([
 
 	/**
 	 * Normalizes the key predicates of a message's target using the sort order from the metadata,
-	 * including proper URI encoding, e.g. "(Sector='A%2FB%26C',ID='42')" or "('42')".
+	 * including proper URL encoding, e.g. "(Sector='A%2FB%26C',ID='42')" or "('42')".
 	 *
 	 * @param {string} sTarget
 	 *   The message target
@@ -2736,7 +2736,7 @@ sap.ui.define([
 	 * @param {object} oEntity
 	 *   The entity instance with the key property values
 	 * @returns {Promise<string|undefined>}
-	 *   A promise that gets resolved with the proper URI-encoded key predicate, for example
+	 *   A promise that gets resolved with the proper URL-encoded key predicate, for example
 	 *   "(Sector='A%2FB%26C',ID='42')" or "('42')", or <code>undefined</code> if at least one key
 	 *   property is undefined. It gets rejected if the metadata cannot be fetched, or in case the
 	 *   entity has no key properties according to the metadata.

src/sap.ui.core/src/sap/ui/model/odata/v4/lib/_Helper.js

@@ -1499,7 +1499,7 @@ sap.ui.define([
 		 *   is the alias in the key predicate, its value is the path in the instance). If not
 		 *   given, the entity's key is used.
 		 * @returns {string|undefined}
-		 *   A filter using key properties without URI encoding, e.g.
+		 *   A filter using key properties without URL encoding, e.g.
 		 *   "Sector eq 'A/B&C' and ID eq 42)", or <code>undefined</code>, if at least one key
 		 *   property is undefined
 		 * @throws {Error}
@@ -1541,7 +1541,7 @@ sap.ui.define([
 		 *   If true, the property name is not omitted if there is only one property
 		 *   (like "(ID='42')")
 		 * @returns {string|undefined}
-		 *   The key predicate with proper URI encoding, e.g. "(Sector='A%2FB%26C',ID='42')" or
+		 *   The key predicate with proper URL encoding, e.g. "(Sector='A%2FB%26C',ID='42')" or
 		 *   "('42')", or <code>undefined</code>, if at least one key property is undefined
 		 * @throws {Error}
 		 *   In case the entity type has no key properties according to metadata