Skip to content

Commit 4d97478

Browse files
rafidzalrafidzal
committed
Update references to zone and context to zoneId and contextId for all Consumer-side code.
1 parent 8b95d14 commit 4d97478

9 files changed

Lines changed: 162 additions & 162 deletions

File tree

‎Code/Sif3Framework/Sif.Framework/Consumers/Consumer.cs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -161,15 +161,15 @@ public void Unregister(bool? deleteOnUnregister = null)
161161
/// <summary>
162162
/// <see cref="IConsumer{TSingle,TMultiple,TPrimaryKey}.GetChangesSinceMarker(string, string)">GetChangesSinceMarker</see>
163163
/// </summary>
164-
public string GetChangesSinceMarker(string zone = null, string context = null)
164+
public string GetChangesSinceMarker(string zoneId = null, string contextId = null)
165165
{
166166

167167
if (!RegistrationService.Registered)
168168
{
169169
throw new InvalidOperationException("Consumer has not registered.");
170170
}
171171

172-
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + HttpUtils.MatrixParameters(zone, context);
172+
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + HttpUtils.MatrixParameters(zoneId, contextId);
173173
WebHeaderCollection responseHeaders = HttpUtils.HeadRequest(url, RegistrationService.AuthorisationToken);
174174

175175
return responseHeaders[HttpUtils.RequestHeader.changesSinceMarker.ToDescription()];
@@ -178,15 +178,15 @@ public string GetChangesSinceMarker(string zone = null, string context = null)
178178
/// <summary>
179179
/// <see cref="IConsumer{TSingle,TMultiple,TPrimaryKey}.Create(TSingle, string, string)">Create</see>
180180
/// </summary>
181-
public virtual TSingle Create(TSingle obj, string zone = null, string context = null)
181+
public virtual TSingle Create(TSingle obj, string zoneId = null, string contextId = null)
182182
{
183183

184184
if (!RegistrationService.Registered)
185185
{
186186
throw new InvalidOperationException("Consumer has not registered.");
187187
}
188188

189-
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + "/" + TypeName + HttpUtils.MatrixParameters(zone, context);
189+
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + "/" + TypeName + HttpUtils.MatrixParameters(zoneId, contextId);
190190
string body = SerialiseSingle(obj);
191191
string xml = HttpUtils.PostRequest(url, RegistrationService.AuthorisationToken, body);
192192
if (log.IsDebugEnabled) log.Debug("XML from POST request ...");
@@ -198,15 +198,15 @@ public virtual TSingle Create(TSingle obj, string zone = null, string context =
198198
/// <summary>
199199
/// <see cref="IConsumer{TSingle,TMultiple,TPrimaryKey}.Create(TMultiple, string, string)">Create</see>
200200
/// </summary>
201-
public virtual MultipleCreateResponse Create(TMultiple obj, string zone = null, string context = null)
201+
public virtual MultipleCreateResponse Create(TMultiple obj, string zoneId = null, string contextId = null)
202202
{
203203

204204
if (!RegistrationService.Registered)
205205
{
206206
throw new InvalidOperationException("Consumer has not registered.");
207207
}
208208

209-
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + HttpUtils.MatrixParameters(zone, context);
209+
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + HttpUtils.MatrixParameters(zoneId, contextId);
210210
string body = SerialiseMultiple(obj);
211211
string xml = HttpUtils.PostRequest(url, RegistrationService.AuthorisationToken, body);
212212
if (log.IsDebugEnabled) log.Debug("XML from POST request ...");
@@ -220,7 +220,7 @@ public virtual MultipleCreateResponse Create(TMultiple obj, string zone = null,
220220
/// <summary>
221221
/// <see cref="IConsumer{TSingle,TMultiple,TPrimaryKey}.Query(TPrimaryKey, string, string)">Query</see>
222222
/// </summary>
223-
public virtual TSingle Query(TPrimaryKey refId, string zone = null, string context = null)
223+
public virtual TSingle Query(TPrimaryKey refId, string zoneId = null, string contextId = null)
224224
{
225225

226226
if (!RegistrationService.Registered)
@@ -232,7 +232,7 @@ public virtual TSingle Query(TPrimaryKey refId, string zone = null, string conte
232232

233233
try
234234
{
235-
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + "/" + refId + HttpUtils.MatrixParameters(zone, context);
235+
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + "/" + refId + HttpUtils.MatrixParameters(zoneId, contextId);
236236
string xml = HttpUtils.GetRequest(url, RegistrationService.AuthorisationToken);
237237
if (log.IsDebugEnabled) log.Debug("XML from GET request ...");
238238
if (log.IsDebugEnabled) log.Debug(xml);
@@ -268,15 +268,15 @@ public virtual TSingle Query(TPrimaryKey refId, string zone = null, string conte
268268
/// <summary>
269269
/// <see cref="IConsumer{TSingle,TMultiple,TPrimaryKey}.Query(uint?, uint?, string, string)">Query</see>
270270
/// </summary>
271-
public virtual TMultiple Query(uint? navigationPage = null, uint? navigationPageSize = null, string zone = null, string context = null)
271+
public virtual TMultiple Query(uint? navigationPage = null, uint? navigationPageSize = null, string zoneId = null, string contextId = null)
272272
{
273273

274274
if (!RegistrationService.Registered)
275275
{
276276
throw new InvalidOperationException("Consumer has not registered.");
277277
}
278278

279-
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + HttpUtils.MatrixParameters(zone, context);
279+
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + HttpUtils.MatrixParameters(zoneId, contextId);
280280
string xml;
281281

282282
if (navigationPage.HasValue && navigationPageSize.HasValue)
@@ -294,15 +294,15 @@ public virtual TMultiple Query(uint? navigationPage = null, uint? navigationPage
294294
/// <summary>
295295
/// <see cref="IConsumer{TSingle,TMultiple,TPrimaryKey}.QueryByExample(TSingle, uint?, uint?, string, string)">QueryByExample</see>
296296
/// </summary>
297-
public virtual TMultiple QueryByExample(TSingle obj, uint? navigationPage = null, uint? navigationPageSize = null, string zone = null, string context = null)
297+
public virtual TMultiple QueryByExample(TSingle obj, uint? navigationPage = null, uint? navigationPageSize = null, string zoneId = null, string contextId = null)
298298
{
299299

300300
if (!RegistrationService.Registered)
301301
{
302302
throw new InvalidOperationException("Consumer has not registered.");
303303
}
304304

305-
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + HttpUtils.MatrixParameters(zone, context);
305+
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + HttpUtils.MatrixParameters(zoneId, contextId);
306306
string body = SerialiseSingle(obj);
307307
// TODO: Update PostRequest to accept paging parameters.
308308
string xml = HttpUtils.PostRequest(url, RegistrationService.AuthorisationToken, body, "GET");
@@ -315,7 +315,7 @@ public virtual TMultiple QueryByExample(TSingle obj, uint? navigationPage = null
315315
/// <summary>
316316
/// <see cref="IConsumer{TSingle,TMultiple,TPrimaryKey}.QueryByServicePath(IEnumerable{EqualCondition}, uint?, uint?, string, string)">QueryByServicePath</see>
317317
/// </summary>
318-
public virtual TMultiple QueryByServicePath(IEnumerable<EqualCondition> conditions, uint? navigationPage = null, uint? navigationPageSize = null, string zone = null, string context = null)
318+
public virtual TMultiple QueryByServicePath(IEnumerable<EqualCondition> conditions, uint? navigationPage = null, uint? navigationPageSize = null, string zoneId = null, string contextId = null)
319319
{
320320

321321
if (!RegistrationService.Registered)
@@ -335,7 +335,7 @@ public virtual TMultiple QueryByServicePath(IEnumerable<EqualCondition> conditio
335335

336336
}
337337

338-
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + servicePath + "/" + TypeName + "s" + HttpUtils.MatrixParameters(zone, context);
338+
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + servicePath + "/" + TypeName + "s" + HttpUtils.MatrixParameters(zoneId, contextId);
339339
if (log.IsDebugEnabled) log.Debug("Service Path URL is " + url);
340340
string xml;
341341

@@ -354,7 +354,7 @@ public virtual TMultiple QueryByServicePath(IEnumerable<EqualCondition> conditio
354354
/// <summary>
355355
/// <see cref="IConsumer{TSingle,TMultiple,TPrimaryKey}.QueryChangesSince(string, out string, uint?, uint?, string, string)">QueryChangesSince</see>
356356
/// </summary>
357-
public TMultiple QueryChangesSince(string changesSinceMarker, out string nextChangesSinceMarker, uint? navigationPage = null, uint? navigationPageSize = null, string zone = null, string context = null)
357+
public TMultiple QueryChangesSince(string changesSinceMarker, out string nextChangesSinceMarker, uint? navigationPage = null, uint? navigationPageSize = null, string zoneId = null, string contextId = null)
358358
{
359359

360360
if (!RegistrationService.Registered)
@@ -363,7 +363,7 @@ public TMultiple QueryChangesSince(string changesSinceMarker, out string nextCha
363363
}
364364

365365
string changesSinceParameter = (changesSinceMarker == null ? string.Empty : "?changesSinceMarker=" + changesSinceMarker);
366-
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + HttpUtils.MatrixParameters(zone, context) + changesSinceParameter;
366+
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + HttpUtils.MatrixParameters(zoneId, contextId) + changesSinceParameter;
367367
WebHeaderCollection responseHeaders;
368368
string xml;
369369

@@ -384,15 +384,15 @@ public TMultiple QueryChangesSince(string changesSinceMarker, out string nextCha
384384
/// <summary>
385385
/// <see cref="IConsumer{TSingle,TMultiple,TPrimaryKey}.Update(TSingle, string, string)">Update</see>
386386
/// </summary>
387-
public virtual void Update(TSingle obj, string zone = null, string context = null)
387+
public virtual void Update(TSingle obj, string zoneId = null, string contextId = null)
388388
{
389389

390390
if (!RegistrationService.Registered)
391391
{
392392
throw new InvalidOperationException("Consumer has not registered.");
393393
}
394394

395-
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + "/" + obj.RefId + HttpUtils.MatrixParameters(zone, context);
395+
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + "/" + obj.RefId + HttpUtils.MatrixParameters(zoneId, contextId);
396396
string body = SerialiseSingle(obj);
397397
string xml = HttpUtils.PutRequest(url, RegistrationService.AuthorisationToken, body);
398398
if (log.IsDebugEnabled) log.Debug("XML from PUT request ...");
@@ -402,15 +402,15 @@ public virtual void Update(TSingle obj, string zone = null, string context = nul
402402
/// <summary>
403403
/// <see cref="IConsumer{TSingle,TMultiple,TPrimaryKeyPK}.Update(TMultiple, string, string)">Update</see>
404404
/// </summary>
405-
public virtual MultipleUpdateResponse Update(TMultiple obj, string zone = null, string context = null)
405+
public virtual MultipleUpdateResponse Update(TMultiple obj, string zoneId = null, string contextId = null)
406406
{
407407

408408
if (!RegistrationService.Registered)
409409
{
410410
throw new InvalidOperationException("Consumer has not registered.");
411411
}
412412

413-
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + HttpUtils.MatrixParameters(zone, context);
413+
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + HttpUtils.MatrixParameters(zoneId, contextId);
414414
string body = SerialiseMultiple(obj);
415415
string xml = HttpUtils.PutRequest(url, RegistrationService.AuthorisationToken, body);
416416
if (log.IsDebugEnabled) log.Debug("XML from PUT request ...");
@@ -424,15 +424,15 @@ public virtual MultipleUpdateResponse Update(TMultiple obj, string zone = null,
424424
/// <summary>
425425
/// <see cref="IConsumer{TSingle,TMultiple,TPrimaryKey}.Delete(TPrimaryKey, string, string)">Delete</see>
426426
/// </summary>
427-
public virtual void Delete(TPrimaryKey refId, string zone = null, string context = null)
427+
public virtual void Delete(TPrimaryKey refId, string zoneId = null, string contextId = null)
428428
{
429429

430430
if (!RegistrationService.Registered)
431431
{
432432
throw new InvalidOperationException("Consumer has not registered.");
433433
}
434434

435-
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + "/" + refId + HttpUtils.MatrixParameters(zone, context);
435+
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + "/" + refId + HttpUtils.MatrixParameters(zoneId, contextId);
436436
string xml = HttpUtils.DeleteRequest(url, RegistrationService.AuthorisationToken);
437437
if (log.IsDebugEnabled) log.Debug("XML from DELETE request ...");
438438
if (log.IsDebugEnabled) log.Debug(xml);
@@ -441,7 +441,7 @@ public virtual void Delete(TPrimaryKey refId, string zone = null, string context
441441
/// <summary>
442442
/// <see cref="IConsumer{TSingle,TMultiple,TPrimaryKey}.Delete(IEnumerable{TPrimaryKey}, string, string)">Delete</see>
443443
/// </summary>
444-
public virtual MultipleDeleteResponse Delete(IEnumerable<TPrimaryKey> refIds, string zone = null, string context = null)
444+
public virtual MultipleDeleteResponse Delete(IEnumerable<TPrimaryKey> refIds, string zoneId = null, string contextId = null)
445445
{
446446

447447
if (!RegistrationService.Registered)
@@ -458,7 +458,7 @@ public virtual MultipleDeleteResponse Delete(IEnumerable<TPrimaryKey> refIds, st
458458
}
459459

460460
deleteRequestType request = new deleteRequestType { deletes = deleteIds.ToArray() };
461-
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + HttpUtils.MatrixParameters(zone, context);
461+
string url = EnvironmentUtils.ParseServiceUrl(EnvironmentTemplate) + "/" + TypeName + "s" + HttpUtils.MatrixParameters(zoneId, contextId);
462462
string body = SerialiserFactory.GetXmlSerialiser<deleteRequestType>().Serialise(request);
463463
string xml = HttpUtils.PutRequest(url, RegistrationService.AuthorisationToken, body, "DELETE");
464464
if (log.IsDebugEnabled) log.Debug("XML from PUT (DELETE) request ...");

0 commit comments

Comments
 (0)