|
3 | 3 | using System.Linq; |
4 | 4 | using IntegrationEngine.Model; |
5 | 5 | using RestSharp; |
| 6 | +using Newtonsoft.Json; |
6 | 7 |
|
7 | 8 | namespace IntegrationEngine.Client |
8 | 9 | { |
9 | | - public class Client |
| 10 | + public class InEngineClient |
10 | 11 | { |
11 | 12 | public RestClient RestClient { get; set; } |
12 | 13 |
|
13 | | - public Client() |
| 14 | + public InEngineClient() |
14 | 15 | : this("http://localhost:9001/api/") |
15 | 16 | { |
16 | 17 | } |
17 | 18 |
|
18 | | - public Client(string apiUrl) |
| 19 | + public InEngineClient(string apiUrl) |
19 | 20 | { |
20 | 21 | RestClient = new RestClient(apiUrl); |
21 | 22 | } |
22 | 23 |
|
23 | 24 | #region CronTrigger |
24 | | - public List<ICronTrigger> GetCronTriggers() |
| 25 | + public IList<CronTrigger> GetCronTriggers() |
25 | 26 | { |
26 | 27 | var request = new RestRequest(EndpointName.CronTrigger, Method.GET); |
27 | | - return RestClient.Execute<List<ICronTrigger>>(request).Data; |
| 28 | + request.RequestFormat = DataFormat.Json; |
| 29 | + var result = RestClient.Execute(request); |
| 30 | + return JsonConvert.DeserializeObject<IList<CronTrigger>>(result.Content); |
28 | 31 | } |
29 | 32 |
|
30 | 33 | public CronTrigger GetCronTriggerById(string id) |
31 | 34 | { |
32 | 35 | var request = new RestRequest(EndpointName.CronTrigger + "/{id}", Method.GET); |
33 | 36 | request.AddUrlSegment("id", id); |
34 | | - return RestClient.Execute<CronTrigger>(request).Data; |
| 37 | + var result = RestClient.Execute(request); |
| 38 | + return JsonConvert.DeserializeObject<CronTrigger>(result.Content); |
35 | 39 | } |
36 | 40 |
|
37 | 41 | public CronTrigger CreateCronTrigger(CronTrigger cronTrigger) |
38 | 42 | { |
39 | 43 | var request = new RestRequest(EndpointName.CronTrigger, Method.POST); |
40 | 44 | request.AddObject(cronTrigger); |
41 | | - return RestClient.Execute<CronTrigger>(request).Data; |
| 45 | + var result = RestClient.Execute(request); |
| 46 | + return JsonConvert.DeserializeObject<CronTrigger>(result.Content); |
42 | 47 | } |
43 | 48 |
|
44 | 49 | public CronTrigger UpdateCronTrigger(CronTrigger cronTrigger) |
45 | 50 | { |
46 | 51 | var request = new RestRequest(EndpointName.CronTrigger + "/{id}", Method.PUT); |
47 | 52 | request.AddUrlSegment("id", cronTrigger.Id); |
48 | 53 | request.AddObject(cronTrigger); |
49 | | - return RestClient.Execute<CronTrigger>(request).Data; |
| 54 | + var result = RestClient.Execute(request); |
| 55 | + return JsonConvert.DeserializeObject<CronTrigger>(result.Content); |
50 | 56 | } |
51 | 57 |
|
52 | 58 | public CronTrigger DeleteCronTrigger(string id) |
53 | 59 | { |
54 | 60 | var request = new RestRequest(EndpointName.CronTrigger + "/{id}", Method.DELETE); |
55 | 61 | request.AddUrlSegment("id", id); |
56 | | - return RestClient.Execute<CronTrigger>(request).Data; |
| 62 | + var result = RestClient.Execute(request); |
| 63 | + return JsonConvert.DeserializeObject<CronTrigger>(result.Content); |
57 | 64 | } |
58 | 65 | #endregion |
59 | 66 |
|
60 | 67 | #region SimpleTrigger |
61 | | - public List<SimpleTrigger> GetSimpleTriggers() |
| 68 | + public IList<SimpleTrigger> GetSimpleTriggers() |
62 | 69 | { |
63 | 70 | var request = new RestRequest(EndpointName.SimpleTrigger, Method.GET); |
64 | | - return RestClient.Execute<List<SimpleTrigger>>(request).Data; |
| 71 | + var result = RestClient.Execute(request); |
| 72 | + return JsonConvert.DeserializeObject<IList<SimpleTrigger>>(result.Content); |
65 | 73 | } |
66 | 74 |
|
67 | 75 | public SimpleTrigger GetSimpleTriggerById(string id) |
68 | 76 | { |
69 | 77 | var request = new RestRequest(EndpointName.SimpleTrigger + "/{id}", Method.GET); |
70 | 78 | request.AddUrlSegment("id", id); |
71 | | - return RestClient.Execute<SimpleTrigger>(request).Data; |
| 79 | + var result = RestClient.Execute(request); |
| 80 | + return JsonConvert.DeserializeObject<SimpleTrigger>(result.Content); |
72 | 81 | } |
73 | 82 |
|
74 | 83 | public SimpleTrigger CreateSimpleTrigger(SimpleTrigger simpleTrigger) |
75 | 84 | { |
76 | 85 | var request = new RestRequest(EndpointName.SimpleTrigger, Method.POST); |
77 | 86 | request.AddObject(simpleTrigger); |
78 | | - return RestClient.Execute<SimpleTrigger>(request).Data; |
| 87 | + var result = RestClient.Execute(request); |
| 88 | + return JsonConvert.DeserializeObject<SimpleTrigger>(result.Content); |
79 | 89 | } |
80 | 90 |
|
81 | 91 | public SimpleTrigger UpdateSimpleTrigger(SimpleTrigger simpleTrigger) |
82 | 92 | { |
83 | 93 | var request = new RestRequest(EndpointName.SimpleTrigger + "/{id}", Method.PUT); |
84 | 94 | request.AddUrlSegment("id", simpleTrigger.Id); |
85 | 95 | request.AddObject(simpleTrigger); |
86 | | - return RestClient.Execute<SimpleTrigger>(request).Data; |
| 96 | + var result = RestClient.Execute(request); |
| 97 | + return JsonConvert.DeserializeObject<SimpleTrigger>(result.Content); |
87 | 98 | } |
88 | 99 |
|
89 | 100 | public SimpleTrigger DeleteSimpleTrigger(string id) |
90 | 101 | { |
91 | 102 | var request = new RestRequest(EndpointName.SimpleTrigger + "/{id}", Method.DELETE); |
92 | 103 | request.AddUrlSegment("id", id); |
93 | | - return RestClient.Execute<SimpleTrigger>(request).Data; |
| 104 | + var result = RestClient.Execute(request); |
| 105 | + return JsonConvert.DeserializeObject<SimpleTrigger>(result.Content); |
94 | 106 | } |
95 | 107 | #endregion |
96 | 108 |
|
97 | 109 | #region TimeZone |
98 | | - public List<TimeZone> GetTimeZones() |
| 110 | + public IList<TimeZone> GetTimeZones() |
99 | 111 | { |
100 | 112 | var request = new RestRequest(EndpointName.TimeZone, Method.GET); |
101 | | - return RestClient.Execute<List<TimeZone>>(request).Data; |
| 113 | + var result = RestClient.Execute(request); |
| 114 | + return JsonConvert.DeserializeObject<IList<TimeZone>>(result.Content); |
102 | 115 | } |
103 | 116 | #endregion |
104 | 117 |
|
105 | 118 | #region JobType |
106 | | - public List<string> GetJobTypes() |
| 119 | + public IList<string> GetJobTypes() |
107 | 120 | { |
108 | 121 | var request = new RestRequest(EndpointName.JobType, Method.GET); |
109 | | - return RestClient.Execute<List<string>>(request).Data; |
| 122 | + var result = RestClient.Execute(request); |
| 123 | + return JsonConvert.DeserializeObject<IList<string>>(result.Content); |
110 | 124 | } |
111 | 125 | #endregion |
112 | 126 | } |
|
0 commit comments