Skip to content

Commit b76e9a1

Browse files
rafidzalrafidzal
committed
Update references to zone and context to zoneId and contextId for all service layer code.
1 parent 4d97478 commit b76e9a1

16 files changed

Lines changed: 307 additions & 147 deletions

File tree

‎Code/Sif3Framework/Sif.Framework/Providers/BasicProvider.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public override IHttpActionResult Post(List<T> objs, [MatrixParameter] string[]
8686

8787
if (mustUseAdvisory.HasValue && mustUseAdvisory.Value == true)
8888
{
89-
status.id = service.Create(obj, mustUseAdvisory, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0])).RefId;
89+
status.id = service.Create(obj, mustUseAdvisory, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0])).RefId;
9090
status.statusCode = ((int)HttpStatusCode.Created).ToString();
9191
}
9292
else
@@ -106,7 +106,7 @@ public override IHttpActionResult Post(List<T> objs, [MatrixParameter] string[]
106106
}
107107
else
108108
{
109-
status.id = service.Create(obj, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0])).RefId;
109+
status.id = service.Create(obj, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0])).RefId;
110110
status.statusCode = ((int)HttpStatusCode.Created).ToString();
111111
}
112112

@@ -185,7 +185,7 @@ public override IHttpActionResult Put(List<T> objs, [MatrixParameter] string[] z
185185

186186
try
187187
{
188-
service.Update(obj, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]));
188+
service.Update(obj, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
189189
status.statusCode = ((int)HttpStatusCode.NoContent).ToString();
190190
}
191191
catch (ArgumentException e)

‎Code/Sif3Framework/Sif.Framework/Providers/FunctionalServiceProvider.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,14 @@ public virtual HttpResponseMessage Post([FromUri] string serviceName, [FromUri]
104104
return Request.CreateErrorResponse(HttpStatusCode.BadRequest, "Request requires use of advisory id, but none has been supplied.");
105105
}
106106

107-
Guid id = service.Create(item, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]));
107+
Guid id = service.Create(item, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
108108

109109
if (SettingsManager.ProviderSettings.JobBinding)
110110
{
111111
service.Bind(id, getOwnerId(sessionToken));
112112
}
113113

114-
jobType job = service.Retrieve(id, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]));
114+
jobType job = service.Retrieve(id, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
115115

116116
string uri = Url.Link("ServicesRoute", new { controller = serviceName, id = id });
117117

@@ -168,7 +168,7 @@ public virtual HttpResponseMessage Post([FromUri] string serviceName, [FromBody]
168168
{
169169
throw new ArgumentException("Service " + serviceName + " does not handle jobs named " + job.name);
170170
}
171-
Guid id = service.Create(job, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]));
171+
Guid id = service.Create(job, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
172172

173173
if (SettingsManager.ProviderSettings.JobBinding)
174174
{
@@ -243,7 +243,7 @@ public virtual ICollection<jobType> Get([FromUri] string serviceName, [MatrixPar
243243
try
244244
{
245245
IFunctionalService service = getService(serviceName);
246-
ICollection<jobType> jobs = service.Retrieve(zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]));
246+
ICollection<jobType> jobs = service.Retrieve(zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
247247
foreach (jobType job in jobs)
248248
{
249249
if (!SettingsManager.ProviderSettings.JobBinding
@@ -283,7 +283,7 @@ public virtual HttpResponseMessage Get([FromUri] string serviceName, [FromUri] G
283283
try
284284
{
285285
IFunctionalService service = getService(serviceName);
286-
item = service.Retrieve(id, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]));
286+
item = service.Retrieve(id, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
287287

288288
if (SettingsManager.ProviderSettings.JobBinding
289289
&& !service.IsBound(Guid.Parse(item.id), getOwnerId(sessionToken)))
@@ -351,7 +351,7 @@ public virtual HttpResponseMessage Delete([FromUri] string serviceName, [FromUri
351351
throw new InvalidSessionException("Request failed as one or more jobs referred to in this request do not belong to this consumer.");
352352
}
353353

354-
service.Delete(id, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]));
354+
service.Delete(id, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
355355

356356
if (SettingsManager.ProviderSettings.JobBinding)
357357
{
@@ -391,7 +391,7 @@ public virtual HttpResponseMessage Delete([FromUri] string serviceName, [FromBod
391391
throw new InvalidSessionException("Request failed as job does not belong to this consumer.");
392392
}
393393

394-
service.Delete(Guid.Parse(deleteId.id), zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]));
394+
service.Delete(Guid.Parse(deleteId.id), zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
395395

396396
if (SettingsManager.ProviderSettings.JobBinding)
397397
{
@@ -450,7 +450,7 @@ public virtual HttpResponseMessage Post([FromUri] string serviceName, [FromUri]
450450
{
451451
throw new InvalidSessionException("Request failed as the job referred to in this request does not belong to this consumer.");
452452
}
453-
return OKResult(service.CreateToPhase(id, phaseName, body, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]), contentType: HttpUtils.GetContentType(Request), accept: HttpUtils.GetAccept(Request)));
453+
return OKResult(service.CreateToPhase(id, phaseName, body, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]), contentType: HttpUtils.GetContentType(Request), accept: HttpUtils.GetAccept(Request)));
454454
}
455455
catch (ArgumentException e)
456456
{
@@ -491,7 +491,7 @@ public virtual HttpResponseMessage Get([FromUri] string serviceName, [FromUri] G
491491
{
492492
throw new InvalidSessionException("Request failed as the job referred to in this request does not belong to this consumer.");
493493
}
494-
return OKResult(service.RetrieveToPhase(id, phaseName, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]), contentType: HttpUtils.GetContentType(Request), accept: HttpUtils.GetAccept(Request)));
494+
return OKResult(service.RetrieveToPhase(id, phaseName, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]), contentType: HttpUtils.GetContentType(Request), accept: HttpUtils.GetAccept(Request)));
495495
}
496496
catch (ArgumentException e)
497497
{
@@ -530,7 +530,7 @@ public virtual HttpResponseMessage Put([FromUri] string serviceName, [FromUri] G
530530
{
531531
throw new InvalidSessionException("Request failed as the job referred to in this request does not belong to this consumer.");
532532
}
533-
return OKResult(service.UpdateToPhase(id, phaseName, body, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]), contentType: HttpUtils.GetContentType(Request), accept: HttpUtils.GetAccept(Request)));
533+
return OKResult(service.UpdateToPhase(id, phaseName, body, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]), contentType: HttpUtils.GetContentType(Request), accept: HttpUtils.GetAccept(Request)));
534534
}
535535
catch (ArgumentException e)
536536
{
@@ -571,7 +571,7 @@ public virtual HttpResponseMessage Delete([FromUri] string serviceName, [FromUri
571571
{
572572
throw new InvalidSessionException("Request failed as the job referred to in this request does not belong to this consumer.");
573573
}
574-
return OKResult(service.DeleteToPhase(id, phaseName, body, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]), contentType: HttpUtils.GetContentType(Request), accept: HttpUtils.GetAccept(Request)));
574+
return OKResult(service.DeleteToPhase(id, phaseName, body, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]), contentType: HttpUtils.GetContentType(Request), accept: HttpUtils.GetAccept(Request)));
575575
}
576576
catch (ArgumentException e)
577577
{
@@ -615,7 +615,7 @@ public virtual HttpResponseMessage Post([FromUri] string serviceName, [FromUri]
615615
{
616616
throw new InvalidSessionException("Request failed as the job referred to in this request does not belong to this consumer.");
617617
}
618-
stateType state = service.CreateToState(id, phaseName, item, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]));
618+
stateType state = service.CreateToState(id, phaseName, item, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
619619

620620
string uri = Url.Link("ServiceStatesRoute", new { controller = serviceName, id = id, phaseName = phaseName, stateId = state.id });
621621
result = Request.CreateResponse<stateType>(HttpStatusCode.Created, state);

‎Code/Sif3Framework/Sif.Framework/Providers/Provider.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public virtual IHttpActionResult Post(TSingle obj, [MatrixParameter] string[] zo
113113

114114
if (mustUseAdvisory.HasValue && mustUseAdvisory.Value == true)
115115
{
116-
TSingle createdObject = service.Create(obj, mustUseAdvisory, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]));
116+
TSingle createdObject = service.Create(obj, mustUseAdvisory, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
117117
string uri = Url.Link("DefaultApi", new { controller = typeof(TSingle).Name, id = createdObject.RefId });
118118
result = Created(uri, createdObject);
119119
}
@@ -132,7 +132,7 @@ public virtual IHttpActionResult Post(TSingle obj, [MatrixParameter] string[] zo
132132
}
133133
else
134134
{
135-
TSingle createdObject = service.Create(obj, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]));
135+
TSingle createdObject = service.Create(obj, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
136136
string uri = Url.Link("DefaultApi", new { controller = typeof(TSingle).Name, id = createdObject.RefId });
137137
result = Created(uri, createdObject);
138138
}
@@ -188,7 +188,7 @@ public virtual IHttpActionResult Post(TMultiple obj, [MatrixParameter] string[]
188188

189189
bool? mustUseAdvisory = HttpUtils.GetMustUseAdvisory(Request.Headers);
190190
MultipleCreateResponse multipleCreateResponse =
191-
((IProviderService<TSingle, TMultiple>)service).Create(obj, mustUseAdvisory, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]));
191+
((IProviderService<TSingle, TMultiple>)service).Create(obj, mustUseAdvisory, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
192192
createResponseType createResponse = MapperFactory.CreateInstance<MultipleCreateResponse, createResponseType>(multipleCreateResponse);
193193
IHttpActionResult result = Ok(createResponse);
194194

@@ -222,7 +222,7 @@ public virtual IHttpActionResult Get([FromUri(Name = "id")] string refId, [Matri
222222

223223
try
224224
{
225-
TSingle obj = service.Retrieve(refId, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]));
225+
TSingle obj = service.Retrieve(refId, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
226226

227227
if (obj == null)
228228
{
@@ -508,7 +508,7 @@ public virtual IHttpActionResult Get(string object1,
508508

509509
}
510510

511-
TMultiple objs = service.Retrieve(conditions, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]));
511+
TMultiple objs = service.Retrieve(conditions, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
512512

513513
if (objs == null)
514514
{
@@ -567,7 +567,7 @@ public virtual IHttpActionResult Put([FromUri(Name = "id")] string refId, TSingl
567567

568568
try
569569
{
570-
service.Update(obj, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]));
570+
service.Update(obj, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
571571
result = StatusCode(HttpStatusCode.NoContent);
572572
}
573573
catch (ArgumentException e)
@@ -609,7 +609,7 @@ public virtual IHttpActionResult Put(TMultiple obj, [MatrixParameter] string[] z
609609
}
610610

611611
MultipleUpdateResponse multipleUpdateResponse =
612-
((IProviderService<TSingle, TMultiple>)service).Update(obj, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]));
612+
((IProviderService<TSingle, TMultiple>)service).Update(obj, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
613613
updateResponseType updateResponse = MapperFactory.CreateInstance<MultipleUpdateResponse, updateResponseType>(multipleUpdateResponse);
614614
IHttpActionResult result = Ok(updateResponse);
615615

@@ -638,7 +638,7 @@ public virtual IHttpActionResult Delete([FromUri(Name = "id")] string refId, [Ma
638638

639639
try
640640
{
641-
service.Delete(refId, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]));
641+
service.Delete(refId, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
642642
result = StatusCode(HttpStatusCode.NoContent);
643643
}
644644
catch (ArgumentException e)
@@ -692,7 +692,7 @@ public virtual IHttpActionResult Delete(deleteRequestType deleteRequest, [Matrix
692692

693693
try
694694
{
695-
service.Delete(deleteId.id, zone: (zoneId == null ? null : zoneId[0]), context: (contextId == null ? null : contextId[0]));
695+
service.Delete(deleteId.id, zoneId: (zoneId == null ? null : zoneId[0]), contextId: (contextId == null ? null : contextId[0]));
696696
status.statusCode = ((int)HttpStatusCode.NoContent).ToString();
697697
}
698698
catch (ArgumentException e)

0 commit comments

Comments
 (0)