Skip to content

Commit cbe2de5

Browse files
habarthierry-huehabarthierry-hue
committed
Ticket #28 and #29 : Fix exception + wait the end of the event handlers
1 parent df09b8a commit cbe2de5

10 files changed

Lines changed: 53 additions & 51 deletions

File tree

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>1.0.1</VersionPrefix>
3+
<VersionPrefix>1.0.2</VersionPrefix>
44
<Authors>SimpleIdServer</Authors>
55
<Owners>SimpleIdServer</Owners>
66
</PropertyGroup>

‎src/CaseManagement.AspNetWebApi/App_Start/WebApiConfig.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public static void Register(HttpConfiguration config, ServiceCollection serviceC
1717
Register(container, d);
1818
}
1919

20+
container.RegisterInstance<IServiceProvider>(serviceCollection.BuildServiceProvider());
2021
config.DependencyResolver = new UnityResolver(container);
2122
// Web API routes
2223
config.MapHttpAttributeRoutes();

‎src/CaseManagement.AspNetWebApi/Global.asax.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@ protected void Application_Start()
6161

6262
protected void Application_End()
6363
{
64-
_jobServer.Stop();
64+
if (_jobServer != null)
65+
{
66+
_jobServer.Stop();
67+
}
6568
}
6669

6770
protected void Application_BeginRequest(object sender, EventArgs e)

‎src/CaseManagement.CMMN.AspNet/Apis/CaseFilesController.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public async Task<IHttpActionResult> Add([FromBody] AddCaseFileCommand parameter
6060
}
6161

6262
[HttpPut]
63-
[Route("me/{id:string}")]
63+
[Route("me/{id}")]
6464
public async Task<IHttpActionResult> UpdateMe(string id, [FromBody] UpdateCaseFileCommand parameter)
6565
{
6666
try
@@ -85,7 +85,7 @@ public async Task<IHttpActionResult> UpdateMe(string id, [FromBody] UpdateCaseFi
8585
}
8686

8787
[HttpPut]
88-
[Route("{id:string}")]
88+
[Route("{id}")]
8989
public async Task<IHttpActionResult> Update(string id, [FromBody] UpdateCaseFileCommand parameter)
9090
{
9191
try
@@ -109,7 +109,7 @@ public async Task<IHttpActionResult> Update(string id, [FromBody] UpdateCaseFile
109109
}
110110

111111
[HttpGet]
112-
[Route("me/{id:string}/publish")]
112+
[Route("me/{id}/publish")]
113113
public async Task<IHttpActionResult> PublishMe(string id)
114114
{
115115
try
@@ -137,7 +137,7 @@ public async Task<IHttpActionResult> PublishMe(string id)
137137
}
138138

139139
[HttpGet]
140-
[Route("{id:string}/publish")]
140+
[Route("{id}/publish")]
141141
public async Task<IHttpActionResult> Publish(string id)
142142
{
143143
try
@@ -174,7 +174,7 @@ public async Task<IHttpActionResult> Search()
174174

175175

176176
[HttpGet]
177-
[Route("me/{id:string}")]
177+
[Route("me/{id}")]
178178
public async Task<IHttpActionResult> GetMe(string id)
179179
{
180180
try
@@ -193,7 +193,7 @@ public async Task<IHttpActionResult> GetMe(string id)
193193
}
194194

195195
[HttpGet]
196-
[Route("{id:string}")]
196+
[Route("{id}")]
197197
public async Task<IHttpActionResult> Get(string id)
198198
{
199199
try

‎src/CaseManagement.CMMN.AspNet/Apis/CasePlanInstancesController.cs‎

Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,10 @@
22
using CaseManagement.CMMN.CasePlanInstance;
33
using CaseManagement.CMMN.CasePlanInstance.Commands;
44
using CaseManagement.CMMN.CasePlanInstance.Exceptions;
5-
using CaseManagement.CMMN.CasePlanInstance.Repositories;
6-
using CaseManagement.CMMN.Domains;
7-
using CaseManagement.CMMN.Extensions;
85
using CaseManagement.CMMN.Infrastructures;
9-
using CaseManagement.CMMN.Persistence.Parameters;
10-
using CaseManagement.CMMN.Persistence.Responses;
116
using Newtonsoft.Json.Linq;
127
using System;
138
using System.Collections.Generic;
14-
using System.Linq;
159
using System.Net;
1610
using System.Net.Http;
1711
using System.Threading.Tasks;
@@ -48,7 +42,7 @@ public async Task<IHttpActionResult> SearchMe()
4842
}
4943

5044
[HttpGet]
51-
[Route("{id:string}")]
45+
[Route("{id}")]
5246
public async Task<IHttpActionResult> GetMe(string id)
5347
{
5448
try
@@ -67,7 +61,7 @@ public async Task<IHttpActionResult> GetMe(string id)
6761
}
6862

6963
[HttpGet]
70-
[Route("{id:string}")]
64+
[Route("{id}")]
7165
public async Task<IHttpActionResult> Get(string id)
7266
{
7367
try
@@ -82,7 +76,7 @@ public async Task<IHttpActionResult> Get(string id)
8276
}
8377

8478
[HttpGet]
85-
[Route("{id:string}/casefileitems")]
79+
[Route("{id}/casefileitems")]
8680
public async Task<IHttpActionResult> GetCaseFileItems(string id)
8781
{
8882
var result = await _casePlanInstanceService.GetCaseFileItems(id);
@@ -134,7 +128,7 @@ public async Task<IHttpActionResult> Create([FromBody] CreateCaseInstanceCommand
134128
}
135129

136130
[HttpGet]
137-
[Route("me/{id:string}/launch")]
131+
[Route("me/{id}/launch")]
138132
public async Task<IHttpActionResult> LaunchMe(string id)
139133
{
140134
try
@@ -159,7 +153,7 @@ public async Task<IHttpActionResult> LaunchMe(string id)
159153
}
160154

161155
[HttpGet]
162-
[Route("{id:string}/launch")]
156+
[Route("{id}/launch")]
163157
public async Task<IHttpActionResult> Launch(string id)
164158
{
165159
try
@@ -178,7 +172,7 @@ public async Task<IHttpActionResult> Launch(string id)
178172

179173

180174
[HttpGet]
181-
[Route("me/{id:string}/suspend")]
175+
[Route("me/{id}/suspend")]
182176
public async Task<IHttpActionResult> SuspendMe(string id)
183177
{
184178
try
@@ -214,7 +208,7 @@ public async Task<IHttpActionResult> SuspendMe(string id)
214208
}
215209

216210
[HttpGet]
217-
[Route("{id:string}/suspend")]
211+
[Route("{id}/suspend")]
218212
public async Task<IHttpActionResult> Suspend(string id)
219213
{
220214
try
@@ -250,7 +244,7 @@ public async Task<IHttpActionResult> Suspend(string id)
250244
}
251245

252246
[HttpGet]
253-
[Route("me/{id:string}/suspend/{elt:string}")]
247+
[Route("me/{id}/suspend/{elt}")]
254248
public async Task<IHttpActionResult> SuspendMe(string id, string elt)
255249
{
256250
try
@@ -286,7 +280,7 @@ public async Task<IHttpActionResult> SuspendMe(string id, string elt)
286280
}
287281

288282
[HttpGet]
289-
[Route("{id:string}/suspend/{elt:string}")]
283+
[Route("{id}/suspend/{elt}")]
290284
public async Task<IHttpActionResult> Suspend(string id, string elt)
291285
{
292286
try
@@ -322,7 +316,7 @@ public async Task<IHttpActionResult> Suspend(string id, string elt)
322316
}
323317

324318
[HttpGet]
325-
[Route("me/{id:string}/reactivate")]
319+
[Route("me/{id}/reactivate")]
326320
public async Task<IHttpActionResult> ReactivateMe(string id)
327321
{
328322
try
@@ -358,7 +352,7 @@ public async Task<IHttpActionResult> ReactivateMe(string id)
358352
}
359353

360354
[HttpGet]
361-
[Route("{id:string}/reactivate")]
355+
[Route("{id}/reactivate")]
362356
public async Task<IHttpActionResult> Reactivate(string id)
363357
{
364358
try
@@ -394,7 +388,7 @@ public async Task<IHttpActionResult> Reactivate(string id)
394388
}
395389

396390
[HttpGet]
397-
[Route("{id:string}/reactivate/{elt:string}")]
391+
[Route("{id}/reactivate/{elt}")]
398392
public async Task<IHttpActionResult> Reactivate(string id, string elt)
399393
{
400394
try
@@ -430,7 +424,7 @@ public async Task<IHttpActionResult> Reactivate(string id, string elt)
430424
}
431425

432426
[HttpGet]
433-
[Route("me/{id:string}/resume")]
427+
[Route("me/{id}/resume")]
434428
public async Task<IHttpActionResult> ResumeMe(string id)
435429
{
436430
try
@@ -459,7 +453,7 @@ public async Task<IHttpActionResult> ResumeMe(string id)
459453
}
460454

461455
[HttpGet]
462-
[Route("{id:string}/resume")]
456+
[Route("{id}/resume")]
463457
public async Task<IHttpActionResult> Resume(string id)
464458
{
465459
try
@@ -488,7 +482,7 @@ public async Task<IHttpActionResult> Resume(string id)
488482
}
489483

490484
[HttpGet]
491-
[Route("me/{id:string}/resume/{elt:string}")]
485+
[Route("me/{id}/resume/{elt}")]
492486
public async Task<IHttpActionResult> ResumeMe(string id, string elt)
493487
{
494488
try
@@ -517,7 +511,7 @@ public async Task<IHttpActionResult> ResumeMe(string id, string elt)
517511
}
518512

519513
[HttpGet]
520-
[Route("{id:string}/resume/{elt:string}")]
514+
[Route("{id}/resume/{elt}")]
521515
public async Task<IHttpActionResult> Resume(string id, string elt)
522516
{
523517
try
@@ -546,7 +540,7 @@ public async Task<IHttpActionResult> Resume(string id, string elt)
546540
}
547541

548542
[HttpGet]
549-
[Route("me/{id:string}/terminate")]
543+
[Route("me/{id}/terminate")]
550544
public async Task<IHttpActionResult> TerminateMe(string id)
551545
{
552546
try
@@ -582,7 +576,7 @@ public async Task<IHttpActionResult> TerminateMe(string id)
582576
}
583577

584578
[HttpGet]
585-
[Route("{id:string}/terminate")]
579+
[Route("{id}/terminate")]
586580
public async Task<IHttpActionResult> Terminate(string id)
587581
{
588582
try
@@ -618,7 +612,7 @@ public async Task<IHttpActionResult> Terminate(string id)
618612
}
619613

620614
[HttpGet]
621-
[Route("me/{id:string}/terminate/{elt:string}")]
615+
[Route("me/{id}/terminate/{elt}")]
622616
public async Task<IHttpActionResult> TerminateMe(string id, string elt)
623617
{
624618
try
@@ -654,7 +648,7 @@ public async Task<IHttpActionResult> TerminateMe(string id, string elt)
654648
}
655649

656650
[HttpGet]
657-
[Route("{id:string}/terminate/{elt:string}")]
651+
[Route("{id}/terminate/{elt}")]
658652
public async Task<IHttpActionResult> Terminate(string id, string elt)
659653
{
660654
try
@@ -690,7 +684,7 @@ public async Task<IHttpActionResult> Terminate(string id, string elt)
690684
}
691685

692686
[HttpGet]
693-
[Route("me/{id:string}/close")]
687+
[Route("me/{id}/close")]
694688
public async Task<IHttpActionResult> CloseMe(string id)
695689
{
696690
try
@@ -719,7 +713,7 @@ public async Task<IHttpActionResult> CloseMe(string id)
719713
}
720714

721715
[HttpGet]
722-
[Route("{id:string}/close")]
716+
[Route("{id}/close")]
723717
public async Task<IHttpActionResult> Close(string id)
724718
{
725719
try
@@ -748,7 +742,7 @@ public async Task<IHttpActionResult> Close(string id)
748742
}
749743

750744
[HttpPost]
751-
[Route("me/{id:string}/confirm/{elt:string}")]
745+
[Route("me/{id}/confirm/{elt}")]
752746
public async Task<IHttpActionResult> ConfirmFormMe(string id, string elt, [FromBody] JObject jObj)
753747
{
754748
try
@@ -791,7 +785,7 @@ public async Task<IHttpActionResult> ConfirmFormMe(string id, string elt, [FromB
791785
}
792786

793787
[HttpPost]
794-
[Route("{id:string}/confirm/{elt:string}")]
788+
[Route("{id}/confirm/{elt}")]
795789
public async Task<IHttpActionResult> ConfirmForm(string id, string elt, [FromBody] JObject jObj)
796790
{
797791
try
@@ -834,7 +828,7 @@ public async Task<IHttpActionResult> ConfirmForm(string id, string elt, [FromBod
834828
}
835829

836830
[HttpGet]
837-
[Route("me/{id:string}/activate/{elt:string}")]
831+
[Route("me/{id}/activate/{elt}")]
838832
public async Task<IHttpActionResult> ActivateMe(string id, string elt)
839833
{
840834
try
@@ -870,7 +864,7 @@ public async Task<IHttpActionResult> ActivateMe(string id, string elt)
870864
}
871865

872866
[HttpGet]
873-
[Route("{id:string}/activate/{elt:string}")]
867+
[Route("{id}/activate/{elt}")]
874868
public async Task<IHttpActionResult> Activate(string id, string elt)
875869
{
876870
try

‎src/CaseManagement.CMMN.AspNet/Apis/CasePlansController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public async Task<IHttpActionResult> Count()
2727

2828

2929
[HttpGet]
30-
[Route("me/{id:string}")]
30+
[Route("me/{id}")]
3131
public async Task<IHttpActionResult> GetMe(string id)
3232
{
3333
try
@@ -47,7 +47,7 @@ public async Task<IHttpActionResult> GetMe(string id)
4747

4848

4949
[HttpGet]
50-
[Route("{id:string}")]
50+
[Route("{id}")]
5151
public async Task<IHttpActionResult> Get(string id)
5252
{
5353
try

‎src/CaseManagement.CMMN.AspNet/Apis/FormsController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public FormsController(IFormService formService)
1717
}
1818

1919
[HttpGet]
20-
[Route("{id:string}")]
20+
[Route("{id}")]
2121
public async Task<IHttpActionResult> Get(string id)
2222
{
2323
try
@@ -41,7 +41,7 @@ public async Task<IHttpActionResult> Search()
4141
}
4242

4343
[HttpGet]
44-
[Route("{formId:string}/{version:int}")]
44+
[Route("{formId}/{version:int}")]
4545
public async Task<IHttpActionResult> Get(string formId, int version)
4646
{
4747
try

‎src/CaseManagement.CMMN.AspNet/Apis/RolesController.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public RolesController(IRoleService roleService)
2121
}
2222

2323
[HttpGet]
24-
[Route("{id:string}")]
24+
[Route("{id}")]
2525
public async Task<IHttpActionResult> Get(string id)
2626
{
2727
try
@@ -59,7 +59,7 @@ public async Task<IHttpActionResult> Add([FromBody] AddRoleCommand command)
5959
}
6060

6161
[HttpDelete]
62-
[Route("{id:string}")]
62+
[Route("{id}")]
6363
public async Task<IHttpActionResult> Delete(string id)
6464
{
6565
try
@@ -78,7 +78,7 @@ public async Task<IHttpActionResult> Delete(string id)
7878
}
7979

8080
[HttpPut]
81-
[Route("{id:string}")]
81+
[Route("{id}")]
8282
public async Task<IHttpActionResult> Update(string id, [FromBody] UpdateRoleCommand updateRoleCommand)
8383
{
8484
try

0 commit comments

Comments
 (0)