Skip to content

Commit 337e0e0

Browse files
committed
Fix naming in controllers
1 parent c90aa9e commit 337e0e0

File tree

4 files changed

+23
-25
lines changed

4 files changed

+23
-25
lines changed

IntegrationEngine.Tests/Api/Controllers/CronTriggerControllerTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void ShouldScheduleJobWhenCronTriggerIsCreated()
2626
esRepository.Setup(x => x.Insert(expected)).Returns(expected);
2727
subject.Repository = esRepository.Object;
2828

29-
subject.PostIntegrationJob(expected);
29+
subject.PostCronTrigger(expected);
3030

3131
engineScheduler.Verify(x => x
3232
.ScheduleJobWithCronTrigger(It.Is<CronTrigger>(y => y.JobType == jobType &&

IntegrationEngine/Api/Controllers/CronTriggerController.cs

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ public class CronTriggerController : ApiController
1414
public IEngineScheduler EngineScheduler { get; set; }
1515

1616
public CronTriggerController()
17-
{
18-
}
17+
{}
1918

2019
public CronTriggerController(ESRepository<CronTrigger> repository, IEngineScheduler engineScheduler)
2120
: this()
@@ -24,24 +23,24 @@ public CronTriggerController(ESRepository<CronTrigger> repository, IEngineSchedu
2423
EngineScheduler = engineScheduler;
2524
}
2625

27-
// GET api/IntegrationJob
28-
public IEnumerable<CronTrigger> GetIntegrationJobs()
26+
// GET api/CronTrigger
27+
public IEnumerable<CronTrigger> GetCronTriggers()
2928
{
3029
return Repository.SelectAll();
3130
}
3231

33-
// GET api/IntegrationJob/5
32+
// GET api/CronTrigger/5
3433
[ResponseType(typeof(CronTrigger))]
35-
public IHttpActionResult GetIntegrationJob(string id)
34+
public IHttpActionResult GetCronTrigger(string id)
3635
{
3736
var trigger = Repository.SelectById(id);
3837
if (trigger == null)
3938
return NotFound();
4039
return Ok(trigger);
4140
}
4241

43-
// PUT api/IntegrationJob/5
44-
public IHttpActionResult PutIntegrationJob(string id, CronTrigger trigger)
42+
// PUT api/CronTrigger/5
43+
public IHttpActionResult PutCronTrigger(string id, CronTrigger trigger)
4544
{
4645
if (id != trigger.Id)
4746
return BadRequest();
@@ -50,9 +49,9 @@ public IHttpActionResult PutIntegrationJob(string id, CronTrigger trigger)
5049
return StatusCode(HttpStatusCode.NoContent);
5150
}
5251

53-
// POST api/IntegrationJob
52+
// POST api/CronTrigger
5453
[ResponseType(typeof(CronTrigger))]
55-
public IHttpActionResult PostIntegrationJob(CronTrigger trigger)
54+
public IHttpActionResult PostCronTrigger(CronTrigger trigger)
5655
{
5756
if (trigger.CronExpressionString.IsValidCronExpression())
5857
return BadRequest("Cron expression is not valid: " + trigger.CronExpressionString);
@@ -61,9 +60,9 @@ public IHttpActionResult PostIntegrationJob(CronTrigger trigger)
6160
return CreatedAtRoute("DefaultApi", new { id = triggerWithId.Id }, triggerWithId);
6261
}
6362

64-
// DELETE api/IntegrationJob/5
63+
// DELETE api/CronTrigger/5
6564
[ResponseType(typeof(CronTrigger))]
66-
public IHttpActionResult DeleteIntegrationJob(string id)
65+
public IHttpActionResult DeleteCronTrigger(string id)
6766
{
6867
var trigger = Repository.SelectById(id);
6968
if (trigger == null)

IntegrationEngine/Api/Controllers/JobController.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ public class JobController : ApiController
1616
public IEngineScheduler EngineScheduler { get; set; }
1717

1818
public JobController()
19-
{
20-
}
19+
{}
2120

2221
public JobController(IEngineScheduler engineScheduler)
2322
: this()

IntegrationEngine/Api/Controllers/SimpleTriggerController.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,24 @@ public SimpleTriggerController(ESRepository<SimpleTrigger> repository, IEngineSc
2929
EngineScheduler = engineScheduler;
3030
}
3131

32-
// GET api/IntegrationJob
33-
public IEnumerable<SimpleTrigger> GetIntegrationJobs()
32+
// GET api/SimpleTrigger
33+
public IEnumerable<SimpleTrigger> GetSimpleTriggers()
3434
{
3535
return Repository.SelectAll();
3636
}
3737

38-
// GET api/IntegrationJob/5
38+
// GET api/SimpleTrigger/5
3939
[ResponseType(typeof(SimpleTrigger))]
40-
public IHttpActionResult GetIntegrationJob(string id)
40+
public IHttpActionResult GetSimpleTrigger(string id)
4141
{
4242
var trigger = Repository.SelectById(id);
4343
if (trigger == null)
4444
return NotFound();
4545
return Ok(trigger);
4646
}
4747

48-
// PUT api/IntegrationJob/5
49-
public IHttpActionResult PutIntegrationJob(string id, SimpleTrigger trigger)
48+
// PUT api/SimpleTrigger/5
49+
public IHttpActionResult PutSimpleTrigger(string id, SimpleTrigger trigger)
5050
{
5151
if (id != trigger.Id)
5252
return BadRequest();
@@ -55,18 +55,18 @@ public IHttpActionResult PutIntegrationJob(string id, SimpleTrigger trigger)
5555
return StatusCode(HttpStatusCode.NoContent);
5656
}
5757

58-
// POST api/IntegrationJob
58+
// POST api/SimpleTrigger
5959
[ResponseType(typeof(SimpleTrigger))]
60-
public IHttpActionResult PostIntegrationJob(SimpleTrigger trigger)
60+
public IHttpActionResult PostSimpleTrigger(SimpleTrigger trigger)
6161
{
6262
var triggerWithId = Repository.Insert(trigger);
6363
EngineScheduler.ScheduleJobWithSimpleTrigger(triggerWithId);
6464
return CreatedAtRoute("DefaultApi", new { id = triggerWithId.Id }, triggerWithId);
6565
}
6666

67-
// DELETE api/IntegrationJob/5
67+
// DELETE api/SimpleTrigger/5
6868
[ResponseType(typeof(SimpleTrigger))]
69-
public IHttpActionResult DeleteIntegrationJob(string id)
69+
public IHttpActionResult DeleteSimpleTrigger(string id)
7070
{
7171
var trigger = Repository.SelectById(id);
7272
if (trigger == null)

0 commit comments

Comments
 (0)