Skip to content
This repository has been archived by the owner on May 5, 2023. It is now read-only.

Commit

Permalink
Renaming ATOM_METADATA_MARKER to simply METADATA_MARKER.
Browse files Browse the repository at this point in the history
  • Loading branch information
Andre Rodrigues committed Apr 17, 2012
1 parent d4d5167 commit 801d3d6
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 56 deletions.
2 changes: 1 addition & 1 deletion lib/serviceruntime/runtimeversionprotocolclient.js
View file
Expand Up @@ -42,7 +42,7 @@ RuntimeVersionProtocolClient.prototype.getVersionMap = function (connectionPath,

for (var endpoint in endpoints) {
var currentEndpoint = endpoints[endpoint];
versions[currentEndpoint[Constants.ATOM_METADATA_MARKER].version] = currentEndpoint[Constants.ATOM_METADATA_MARKER].path;
versions[currentEndpoint[Constants.METADATA_MARKER].version] = currentEndpoint[Constants.METADATA_MARKER].path;
}
}

Expand Down
4 changes: 2 additions & 2 deletions lib/serviceruntime/xmlcurrentstateserializer.js
View file
Expand Up @@ -28,8 +28,8 @@ XmlCurrentStateSerializer.prototype.serialize = function (currentState) {
var currentStateXml = {};
currentStateXml[ServiceRuntimeConstants.CURRENT_STATE] = {};
currentStateXml[ServiceRuntimeConstants.CURRENT_STATE][ServiceRuntimeConstants.STATUS_LEASE] = {};
currentStateXml[ServiceRuntimeConstants.CURRENT_STATE][ServiceRuntimeConstants.STATUS_LEASE][Constants.ATOM_METADATA_MARKER] = {};
currentStateXml[ServiceRuntimeConstants.CURRENT_STATE][ServiceRuntimeConstants.STATUS_LEASE][Constants.ATOM_METADATA_MARKER][ServiceRuntimeConstants.CLIENT_ID] = currentState.clientId;
currentStateXml[ServiceRuntimeConstants.CURRENT_STATE][ServiceRuntimeConstants.STATUS_LEASE][Constants.METADATA_MARKER] = {};
currentStateXml[ServiceRuntimeConstants.CURRENT_STATE][ServiceRuntimeConstants.STATUS_LEASE][Constants.METADATA_MARKER][ServiceRuntimeConstants.CLIENT_ID] = currentState.clientId;

// If it is a request for a change of status
if (currentState.status) {
Expand Down
32 changes: 16 additions & 16 deletions lib/serviceruntime/xmlroleenvironmentdatadeserializer.js
View file
Expand Up @@ -26,8 +26,8 @@ XmlRoleEnvironmentDataDeserializer.prototype.deserialize = function (xml) {
var configurationSettings = this._translateConfigurationSettings(xml);
var localResources = this._translateLocalResources(xml);
var currentInstance = this._translateCurrentInstance(xml);
var isEmulated = xml[ServiceRuntimeConstants.DEPLOYMENT][Constants.ATOM_METADATA_MARKER][ServiceRuntimeConstants.EMULATED] === 'true';
var deploymentId = xml[ServiceRuntimeConstants.DEPLOYMENT][Constants.ATOM_METADATA_MARKER][ServiceRuntimeConstants.DEPLOYMENT_ID];
var isEmulated = xml[ServiceRuntimeConstants.DEPLOYMENT][Constants.METADATA_MARKER][ServiceRuntimeConstants.EMULATED] === 'true';
var deploymentId = xml[ServiceRuntimeConstants.DEPLOYMENT][Constants.METADATA_MARKER][ServiceRuntimeConstants.DEPLOYMENT_ID];
var roles = this._translateRoles(xml, currentInstance, currentInstance.roleName);

var roleEnvironmentData = {
Expand Down Expand Up @@ -56,7 +56,7 @@ XmlRoleEnvironmentDataDeserializer.prototype._translateConfigurationSettings = f

for (var configurationSetting in configurationSettings) {
var currentConfigurationSetting = configurationSettings[configurationSetting];
configurationSettingsMap[currentConfigurationSetting[Constants.ATOM_METADATA_MARKER].name] = currentConfigurationSetting[Constants.ATOM_METADATA_MARKER].value;
configurationSettingsMap[currentConfigurationSetting[Constants.METADATA_MARKER].name] = currentConfigurationSetting[Constants.METADATA_MARKER].value;
}
}

Expand All @@ -77,10 +77,10 @@ XmlRoleEnvironmentDataDeserializer.prototype._translateLocalResources = function

for (var localResource in localResources) {
var currentLocalResource = localResources[localResource];
var currentLocalResourceName = currentLocalResource[Constants.ATOM_METADATA_MARKER].name;
delete currentLocalResource[Constants.ATOM_METADATA_MARKER].name;
var currentLocalResourceName = currentLocalResource[Constants.METADATA_MARKER].name;
delete currentLocalResource[Constants.METADATA_MARKER].name;

localResourcesMap[currentLocalResourceName] = currentLocalResource[Constants.ATOM_METADATA_MARKER];
localResourcesMap[currentLocalResourceName] = currentLocalResource[Constants.METADATA_MARKER];
}
}

Expand All @@ -90,10 +90,10 @@ XmlRoleEnvironmentDataDeserializer.prototype._translateLocalResources = function
XmlRoleEnvironmentDataDeserializer.prototype._translateCurrentInstance = function (xml) {
var currentInstance = {};

currentInstance.id = xml[ServiceRuntimeConstants.CURRENT_INSTANCE][Constants.ATOM_METADATA_MARKER].id;
currentInstance.roleName = xml[ServiceRuntimeConstants.CURRENT_INSTANCE][Constants.ATOM_METADATA_MARKER].roleName;
currentInstance.faultDomain = xml[ServiceRuntimeConstants.CURRENT_INSTANCE][Constants.ATOM_METADATA_MARKER].faultDomain;
currentInstance.updateDomain = xml[ServiceRuntimeConstants.CURRENT_INSTANCE][Constants.ATOM_METADATA_MARKER].updateDomain;
currentInstance.id = xml[ServiceRuntimeConstants.CURRENT_INSTANCE][Constants.METADATA_MARKER].id;
currentInstance.roleName = xml[ServiceRuntimeConstants.CURRENT_INSTANCE][Constants.METADATA_MARKER].roleName;
currentInstance.faultDomain = xml[ServiceRuntimeConstants.CURRENT_INSTANCE][Constants.METADATA_MARKER].faultDomain;
currentInstance.updateDomain = xml[ServiceRuntimeConstants.CURRENT_INSTANCE][Constants.METADATA_MARKER].updateDomain;

if (xml[ServiceRuntimeConstants.CURRENT_INSTANCE][ServiceRuntimeConstants.ENDPOINTS]) {
currentInstance.endpoints = this._translateRoleInstanceEndpoints(xml[ServiceRuntimeConstants.CURRENT_INSTANCE][ServiceRuntimeConstants.ENDPOINTS]);
Expand Down Expand Up @@ -122,7 +122,7 @@ XmlRoleEnvironmentDataDeserializer.prototype._translateRoles = function (xml, cu

for (var role in roles) {
var currentIterationRole = roles[role];
var currentIterationRoleName = currentIterationRole[Constants.ATOM_METADATA_MARKER].name;
var currentIterationRoleName = currentIterationRole[Constants.METADATA_MARKER].name;
roleInstances = this._translateRoleInstances(currentIterationRole);

if (currentIterationRoleName === currentRole) {
Expand Down Expand Up @@ -166,17 +166,17 @@ XmlRoleEnvironmentDataDeserializer.prototype._translateRoleInstances = function

for (var instance in instances) {
var currentIterationInstance = instances[instance];
var currentIterationInstanceId = currentIterationInstance[Constants.ATOM_METADATA_MARKER].id;
var currentIterationInstanceId = currentIterationInstance[Constants.METADATA_MARKER].id;

var endpoints = this._translateRoleInstanceEndpoints(currentIterationInstance[ServiceRuntimeConstants.ENDPOINTS]);

for (var endpoint in endpoints) {
endpoints[endpoint].roleInstanceId = currentIterationInstanceId;
}

currentIterationInstance[Constants.ATOM_METADATA_MARKER].endpoints = endpoints;
currentIterationInstance[Constants.METADATA_MARKER].endpoints = endpoints;

roleInstancesMap[currentIterationInstanceId] = currentIterationInstance[Constants.ATOM_METADATA_MARKER];
roleInstancesMap[currentIterationInstanceId] = currentIterationInstance[Constants.METADATA_MARKER];
}
}

Expand All @@ -196,9 +196,9 @@ XmlRoleEnvironmentDataDeserializer.prototype._translateRoleInstanceEndpoints = f

for (var endpoint in endpoints) {
var currentEndpoint = endpoints[endpoint];
var currentEndpointName = currentEndpoint[Constants.ATOM_METADATA_MARKER].name;
var currentEndpointName = currentEndpoint[Constants.METADATA_MARKER].name;

endpointsMap[currentEndpointName] = currentEndpoint[Constants.ATOM_METADATA_MARKER];
endpointsMap[currentEndpointName] = currentEndpoint[Constants.METADATA_MARKER];
}
}

Expand Down
12 changes: 6 additions & 6 deletions lib/services/table/models/entityresult.js
View file
Expand Up @@ -37,17 +37,17 @@ EntityResult.serialize = function (entity) {

if (entity[name] === null) {
var newValue = {};
newValue[Constants.ATOM_METADATA_MARKER] = {};
newValue[Constants.ATOM_METADATA_MARKER][AtomHandler.NSMETA + ':null'] = 'true';
newValue[Constants.METADATA_MARKER] = {};
newValue[Constants.METADATA_MARKER][AtomHandler.NSMETA + ':null'] = 'true';

properties[AtomHandler.NSDATA + ':' + name] = newValue;
} else if (entity[name][Constants.ATOM_METADATA_MARKER] &&
entity[name][Constants.ATOM_METADATA_MARKER].type) {
} else if (entity[name][Constants.METADATA_MARKER] &&
entity[name][Constants.METADATA_MARKER].type) {

properties[AtomHandler.NSDATA + ':' + name] = entity[name];
properties[AtomHandler.NSDATA + ':' + name][Constants.ATOM_METADATA_MARKER][AtomHandler.NSMETA + ':type'] = properties[AtomHandler.NSDATA + ':' + name][Constants.ATOM_METADATA_MARKER].type;
properties[AtomHandler.NSDATA + ':' + name][Constants.METADATA_MARKER][AtomHandler.NSMETA + ':type'] = properties[AtomHandler.NSDATA + ':' + name][Constants.METADATA_MARKER].type;

delete properties[AtomHandler.NSDATA + ':' + name][Constants.ATOM_METADATA_MARKER].type;
delete properties[AtomHandler.NSDATA + ':' + name][Constants.METADATA_MARKER].type;
}
else {
properties[AtomHandler.NSDATA + ':' + name] = entity[name];
Expand Down
32 changes: 16 additions & 16 deletions lib/util/atomhandler.js
View file
Expand Up @@ -54,27 +54,27 @@ AtomHandler.prototype.parse = function (entityXml, innerTag, convertTypes) {
}

if (entityXml.link &&
entityXml.link[Constants.ATOM_METADATA_MARKER] &&
entityXml.link[Constants.ATOM_METADATA_MARKER].href) {
entityXml.link[Constants.METADATA_MARKER] &&
entityXml.link[Constants.METADATA_MARKER].href) {

entity.link = entityXml.link[Constants.ATOM_METADATA_MARKER].href;
entity.link = entityXml.link[Constants.METADATA_MARKER].href;
}

if (entityXml.updated) {
entity.updated = entityXml.updated;
}

if (entityXml[Constants.ATOM_METADATA_MARKER] &&
entityXml[Constants.ATOM_METADATA_MARKER][this._xmlQualifyXmlTagName('etag', this.nsMeta)]) {
if (entityXml[Constants.METADATA_MARKER] &&
entityXml[Constants.METADATA_MARKER][this._xmlQualifyXmlTagName('etag', this.nsMeta)]) {

entity.etag = entityXml[Constants.ATOM_METADATA_MARKER][this._xmlQualifyXmlTagName('etag', this.nsMeta)];
entity.etag = entityXml[Constants.METADATA_MARKER][this._xmlQualifyXmlTagName('etag', this.nsMeta)];
}

var propertiesXmlTag = this._xmlQualifyXmlTagName(innerTag, this.nsMeta);

if (entityXml.content && entityXml.content[propertiesXmlTag]) {
for (var property in entityXml.content[propertiesXmlTag]) {
if (property !== Constants.ATOM_METADATA_MARKER) {
if (property !== Constants.METADATA_MARKER) {
var propertyName = property;
if (property.indexOf(this.nsData) !== -1) {
propertyName = property.substr(2, property.length - 2);
Expand All @@ -86,14 +86,14 @@ AtomHandler.prototype.parse = function (entityXml, innerTag, convertTypes) {
} else if (entityXml.content[propertiesXmlTag][property][Constants.ATOM_VALUE_MARKER]) {
// Has an entry for value
if (convertTypes) {
if (entityXml.content[propertiesXmlTag][property][Constants.ATOM_METADATA_MARKER] &&
entityXml.content[propertiesXmlTag][property][Constants.ATOM_METADATA_MARKER][this._xmlQualifyXmlTagName('type', this.nsMeta)]) {
if (entityXml.content[propertiesXmlTag][property][Constants.METADATA_MARKER] &&
entityXml.content[propertiesXmlTag][property][Constants.METADATA_MARKER][this._xmlQualifyXmlTagName('type', this.nsMeta)]) {
// Has metadata for type
this._setProperty(
entity,
propertyName,
entityXml.content[propertiesXmlTag][property][Constants.ATOM_VALUE_MARKER],
entityXml.content[propertiesXmlTag][property][Constants.ATOM_METADATA_MARKER][this._xmlQualifyXmlTagName('type', this.nsMeta)]);
entityXml.content[propertiesXmlTag][property][Constants.METADATA_MARKER][this._xmlQualifyXmlTagName('type', this.nsMeta)]);
} else {
entity[propertyName] = this._propertyFromString(entityXml.content[propertiesXmlTag][property][Constants.ATOM_VALUE_MARKER]);
}
Expand Down Expand Up @@ -213,11 +213,11 @@ AtomHandler.prototype._writeAtomEntryValue = function (parentElement, name, valu
typeof value === 'object') {

if (!azureutil.objectIsNull(value[Constants.ATOM_VALUE_MARKER]) &&
!azureutil.objectIsNull(value[Constants.ATOM_METADATA_MARKER]) &&
!azureutil.objectIsNull(value[Constants.ATOM_METADATA_MARKER][this._xmlQualifyXmlTagName('type', this.nsMeta)])) {
!azureutil.objectIsNull(value[Constants.METADATA_MARKER]) &&
!azureutil.objectIsNull(value[Constants.METADATA_MARKER][this._xmlQualifyXmlTagName('type', this.nsMeta)])) {

// Primitive value + type
var propertyType = value[Constants.ATOM_METADATA_MARKER].type;
var propertyType = value[Constants.METADATA_MARKER].type;
parentElement = parentElement.ele(propertyTagName)
.txt(this._convertToAtomPropertyText(value[Constants.ATOM_VALUE_MARKER], propertyType));
} else if (this._isDate(value)) {
Expand All @@ -233,7 +233,7 @@ AtomHandler.prototype._writeAtomEntryValue = function (parentElement, name, valu
} else if (typeof value === 'object') {
parentElement = parentElement.ele(propertyTagName);
for (var propertyName in value) {
if (propertyName !== Constants.ATOM_METADATA_MARKER) {
if (propertyName !== Constants.METADATA_MARKER) {
parentElement = this._writeAtomEntryValue(parentElement, propertyName, value[propertyName]);
}
}
Expand All @@ -248,9 +248,9 @@ AtomHandler.prototype._writeAtomEntryValue = function (parentElement, name, valu
}
}

if (value && value[Constants.ATOM_METADATA_MARKER]) {
if (value && value[Constants.METADATA_MARKER]) {
// include the metadata
var attributeList = value[Constants.ATOM_METADATA_MARKER];
var attributeList = value[Constants.METADATA_MARKER];
for (var attribute in attributeList) {
parentElement = parentElement.att(attribute, attributeList[attribute]);
}
Expand Down
10 changes: 1 addition & 9 deletions lib/util/constants.js
View file
Expand Up @@ -727,7 +727,7 @@ var Constants = {
* @const
* @type {string}
*/
ATOM_METADATA_MARKER: '@',
METADATA_MARKER: '@',

/**
* Marker for atom value.
Expand Down Expand Up @@ -2361,14 +2361,6 @@ var Constants = {
*/
FILTER: '$filter',

/**
* The order by query string argument.
*
* @const
* @type {string}
*/
ORDER_BY: '$orderby',

/**
* The top query string argument.
*
Expand Down
12 changes: 6 additions & 6 deletions lib/util/js2xml.js
View file
Expand Up @@ -32,9 +32,9 @@ exports.serialize = function (entity) {

doc = doc.begin(rootElementName, { version: '1.0', encoding: 'utf-8', standalone: 'yes' });

if (entity[rootElementName][Constants.ATOM_METADATA_MARKER]) {
for (var metadata in entity[rootElementName][Constants.ATOM_METADATA_MARKER]) {
doc.att(metadata, entity[rootElementName][Constants.ATOM_METADATA_MARKER][metadata]);
if (entity[rootElementName][Constants.METADATA_MARKER]) {
for (var metadata in entity[rootElementName][Constants.METADATA_MARKER]) {
doc.att(metadata, entity[rootElementName][Constants.METADATA_MARKER][metadata]);
}
}

Expand Down Expand Up @@ -73,7 +73,7 @@ function _writeAtomEntryValue (parentElement, name, value) {
} else if (typeof value === 'object') {
parentElement = parentElement.ele(propertyTagName);
for (var propertyName in value) {
if (propertyName !== Constants.ATOM_METADATA_MARKER) {
if (propertyName !== Constants.METADATA_MARKER) {
parentElement = _writeAtomEntryValue(parentElement, propertyName, value[propertyName]);
}
}
Expand All @@ -88,9 +88,9 @@ function _writeAtomEntryValue (parentElement, name, value) {
}
}

if (value && value[Constants.ATOM_METADATA_MARKER]) {
if (value && value[Constants.METADATA_MARKER]) {
// include the metadata
var attributeList = value[Constants.ATOM_METADATA_MARKER];
var attributeList = value[Constants.METADATA_MARKER];
for (var attribute in attributeList) {
parentElement = parentElement.att(attribute, attributeList[attribute]);
}
Expand Down

0 comments on commit 801d3d6

Please sign in to comment.