Skip to content

Commit affc48e

Browse files
dangostdangost
authored
Merge pull request #60 from regulaforensics/b3e9cacf
update clients
2 parents d93c473 + 91bc199 commit affc48e

File tree

85 files changed

+129
-1216
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+129
-1216
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ x64/
1616
build/
1717
[Bb]in/
1818
[Oo]bj/
19+
*.DS_Store
1920

2021
# NuGet Packages
2122
*.nupkg

‎.openapi-generator/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.0.0-beta2
1+
5.0.0

‎generator-templates/ApiClient.mustache

Lines changed: 0 additions & 601 deletions
This file was deleted.

‎generator-templates/api.mustache

Lines changed: 0 additions & 484 deletions
This file was deleted.

‎generator-templates/modelEnum.mustache

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/Regula.DocumentReader.WebClient/Api/DefaultApi.cs

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ public interface IDefaultApi : IApiAccessor
3232
///
3333
/// </remarks>
3434
/// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
35+
/// <param name="xRequestID"> (optional)</param>
3536
/// <returns>DeviceInfo</returns>
36-
DeviceInfo Ping (Dictionary<String, String> headers);
37+
DeviceInfo Ping (string xRequestID = default(string));
3738

3839
/// <summary>
3940
/// Server health check
@@ -42,8 +43,9 @@ public interface IDefaultApi : IApiAccessor
4243
///
4344
/// </remarks>
4445
/// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
46+
/// <param name="xRequestID"> (optional)</param>
4547
/// <returns>ApiResponse of DeviceInfo</returns>
46-
ApiResponse<DeviceInfo> PingWithHttpInfo (Dictionary<String, String> headers);
48+
ApiResponse<DeviceInfo> PingWithHttpInfo (string xRequestID = default(string));
4749
#endregion Synchronous Operations
4850
#region Asynchronous Operations
4951
/// <summary>
@@ -53,9 +55,10 @@ public interface IDefaultApi : IApiAccessor
5355
///
5456
/// </remarks>
5557
/// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
58+
/// <param name="xRequestID"> (optional)</param>
5659
/// <param name="cancellationToken">Cancellation Token to cancel request (optional) </param>
5760
/// <returns>Task of DeviceInfo</returns>
58-
System.Threading.Tasks.Task<DeviceInfo> PingAsync (CancellationToken cancellationToken = default(CancellationToken));
61+
System.Threading.Tasks.Task<DeviceInfo> PingAsync (string xRequestID = default(string), CancellationToken cancellationToken = default(CancellationToken));
5962

6063
/// <summary>
6164
/// Server health check
@@ -64,9 +67,10 @@ public interface IDefaultApi : IApiAccessor
6467
///
6568
/// </remarks>
6669
/// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
70+
/// <param name="xRequestID"> (optional)</param>
6771
/// <param name="cancellationToken">Cancellation Token to cancel request (optional) </param>
6872
/// <returns>Task of ApiResponse (DeviceInfo)</returns>
69-
System.Threading.Tasks.Task<ApiResponse<DeviceInfo>> PingWithHttpInfoAsync (CancellationToken cancellationToken = default(CancellationToken));
73+
System.Threading.Tasks.Task<ApiResponse<DeviceInfo>> PingWithHttpInfoAsync (string xRequestID = default(string), CancellationToken cancellationToken = default(CancellationToken));
7074
#endregion Asynchronous Operations
7175
}
7276

@@ -182,25 +186,27 @@ public void AddDefaultHeader(string key, string value)
182186
/// Server health check
183187
/// </summary>
184188
/// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
189+
/// <param name="xRequestID"> (optional)</param>
185190
/// <returns>DeviceInfo</returns>
186-
public DeviceInfo Ping (Dictionary<String, String> headers)
191+
public DeviceInfo Ping (string xRequestID = default(string))
187192
{
188-
ApiResponse<DeviceInfo> localVarResponse = PingWithHttpInfo(headers);
193+
ApiResponse<DeviceInfo> localVarResponse = PingWithHttpInfo(xRequestID);
189194
return localVarResponse.Data;
190195
}
191196

192197
/// <summary>
193198
/// Server health check
194199
/// </summary>
195200
/// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
201+
/// <param name="xRequestID"> (optional)</param>
196202
/// <returns>ApiResponse of DeviceInfo</returns>
197-
public ApiResponse<DeviceInfo> PingWithHttpInfo (Dictionary<String, String> headers)
203+
public ApiResponse<DeviceInfo> PingWithHttpInfo (string xRequestID = default(string))
198204
{
199205

200206
var localVarPath = "/api/ping";
201207
var localVarPathParams = new Dictionary<String, String>();
202208
var localVarQueryParams = new List<KeyValuePair<String, String>>();
203-
var localVarHeaderParams = this.Configuration.DefaultHeader.Union(headers).ToDictionary (k => k.Key, v => v.Value);
209+
var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
204210
var localVarFormParams = new Dictionary<String, String>();
205211
var localVarFileParams = new Dictionary<String, FileParameter>();
206212
Object localVarPostBody = null;
@@ -218,6 +224,7 @@ public ApiResponse<DeviceInfo> PingWithHttpInfo (Dictionary<String, String> head
218224
if (localVarHttpHeaderAccept != null)
219225
localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
220226

227+
if (xRequestID != null) localVarHeaderParams.Add("X-RequestID", this.Configuration.ApiClient.ParameterToString(xRequestID)); // header parameter
221228

222229

223230
// make the HTTP request
@@ -242,11 +249,12 @@ public ApiResponse<DeviceInfo> PingWithHttpInfo (Dictionary<String, String> head
242249
/// Server health check
243250
/// </summary>
244251
/// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
252+
/// <param name="xRequestID"> (optional)</param>
245253
/// <param name="cancellationToken">Cancellation Token to cancel request (optional) </param>
246254
/// <returns>Task of DeviceInfo</returns>
247-
public async System.Threading.Tasks.Task<DeviceInfo> PingAsync (CancellationToken cancellationToken = default(CancellationToken))
255+
public async System.Threading.Tasks.Task<DeviceInfo> PingAsync (string xRequestID = default(string), CancellationToken cancellationToken = default(CancellationToken))
248256
{
249-
ApiResponse<DeviceInfo> localVarResponse = await PingWithHttpInfoAsync(cancellationToken);
257+
ApiResponse<DeviceInfo> localVarResponse = await PingWithHttpInfoAsync(xRequestID, cancellationToken);
250258
return localVarResponse.Data;
251259

252260
}
@@ -255,9 +263,10 @@ public ApiResponse<DeviceInfo> PingWithHttpInfo (Dictionary<String, String> head
255263
/// Server health check
256264
/// </summary>
257265
/// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
266+
/// <param name="xRequestID"> (optional)</param>
258267
/// <param name="cancellationToken">Cancellation Token to cancel request (optional) </param>
259268
/// <returns>Task of ApiResponse (DeviceInfo)</returns>
260-
public async System.Threading.Tasks.Task<ApiResponse<DeviceInfo>> PingWithHttpInfoAsync (CancellationToken cancellationToken = default(CancellationToken))
269+
public async System.Threading.Tasks.Task<ApiResponse<DeviceInfo>> PingWithHttpInfoAsync (string xRequestID = default(string), CancellationToken cancellationToken = default(CancellationToken))
261270
{
262271

263272
var localVarPath = "/api/ping";
@@ -281,6 +290,7 @@ public ApiResponse<DeviceInfo> PingWithHttpInfo (Dictionary<String, String> head
281290
if (localVarHttpHeaderAccept != null)
282291
localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
283292

293+
if (xRequestID != null) localVarHeaderParams.Add("X-RequestID", this.Configuration.ApiClient.ParameterToString(xRequestID)); // header parameter
284294

285295

286296
// make the HTTP request

‎src/Regula.DocumentReader.WebClient/Api/DocumentReaderApi.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,26 @@ public DocumentReaderApi(string basePath)
2020

2121
public RecognitionResponse Process(ProcessRequest processRequest)
2222
{
23-
return Process(processRequest, new Dictionary<String, String>());
23+
return Process(processRequest, default(string));
2424
}
2525

26-
public RecognitionResponse Process(ProcessRequest processRequest, Dictionary<String, String> headers)
26+
public RecognitionResponse Process(ProcessRequest processRequest, String xRequestID)
2727
{
2828
if (processRequest.SystemInfo == null)
2929
processRequest.SystemInfo = new ProcessSystemInfo(License);
3030
else
3131
processRequest.SystemInfo.License = License;
3232

33-
return new RecognitionResponse(this._processApi.ApiProcess(processRequest, headers));
33+
return new RecognitionResponse(this._processApi.ApiProcess(processRequest, xRequestID));
3434
}
35-
public DeviceInfo Ping ()
35+
public DeviceInfo Ping (string xRequestID)
3636
{
37-
return this._defaultApi.Ping(new Dictionary<String, String>());
37+
return this._defaultApi.Ping(xRequestID);
3838
}
3939

40-
public DeviceInfo Ping (Dictionary<String, String> headers)
40+
public DeviceInfo Ping ()
4141
{
42-
return this._defaultApi.Ping(headers);
42+
return this._defaultApi.Ping();
4343
}
4444

4545
public DocumentReaderApi WithLicense(string license)

‎src/Regula.DocumentReader.WebClient/Api/ProcessApi.cs

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ public interface IProcessApi : IApiAccessor
3333
/// </remarks>
3434
/// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
3535
/// <param name="processRequest"></param>
36+
/// <param name="xRequestID"> (optional)</param>
3637
/// <returns>ProcessResponse</returns>
37-
ProcessResponse ApiProcess (ProcessRequest processRequest, Dictionary<String, String> headers);
38+
ProcessResponse ApiProcess (ProcessRequest processRequest, string xRequestID = default(string));
3839

3940
/// <summary>
4041
/// Process list of documents images and return extracted data
@@ -44,8 +45,9 @@ public interface IProcessApi : IApiAccessor
4445
/// </remarks>
4546
/// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
4647
/// <param name="processRequest"></param>
48+
/// <param name="xRequestID"> (optional)</param>
4749
/// <returns>ApiResponse of ProcessResponse</returns>
48-
ApiResponse<ProcessResponse> ApiProcessWithHttpInfo (ProcessRequest processRequest, Dictionary<String, String> headers);
50+
ApiResponse<ProcessResponse> ApiProcessWithHttpInfo (ProcessRequest processRequest, string xRequestID = default(string));
4951
#endregion Synchronous Operations
5052
#region Asynchronous Operations
5153
/// <summary>
@@ -56,9 +58,10 @@ public interface IProcessApi : IApiAccessor
5658
/// </remarks>
5759
/// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
5860
/// <param name="processRequest"></param>
61+
/// <param name="xRequestID"> (optional)</param>
5962
/// <param name="cancellationToken">Cancellation Token to cancel request (optional) </param>
6063
/// <returns>Task of ProcessResponse</returns>
61-
System.Threading.Tasks.Task<ProcessResponse> ApiProcessAsync (ProcessRequest processRequest, CancellationToken cancellationToken = default(CancellationToken));
64+
System.Threading.Tasks.Task<ProcessResponse> ApiProcessAsync (ProcessRequest processRequest, string xRequestID = default(string), CancellationToken cancellationToken = default(CancellationToken));
6265

6366
/// <summary>
6467
/// Process list of documents images and return extracted data
@@ -68,9 +71,10 @@ public interface IProcessApi : IApiAccessor
6871
/// </remarks>
6972
/// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
7073
/// <param name="processRequest"></param>
74+
/// <param name="xRequestID"> (optional)</param>
7175
/// <param name="cancellationToken">Cancellation Token to cancel request (optional) </param>
7276
/// <returns>Task of ApiResponse (ProcessResponse)</returns>
73-
System.Threading.Tasks.Task<ApiResponse<ProcessResponse>> ApiProcessWithHttpInfoAsync (ProcessRequest processRequest, CancellationToken cancellationToken = default(CancellationToken));
77+
System.Threading.Tasks.Task<ApiResponse<ProcessResponse>> ApiProcessWithHttpInfoAsync (ProcessRequest processRequest, string xRequestID = default(string), CancellationToken cancellationToken = default(CancellationToken));
7478
#endregion Asynchronous Operations
7579
}
7680

@@ -187,10 +191,11 @@ public void AddDefaultHeader(string key, string value)
187191
/// </summary>
188192
/// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
189193
/// <param name="processRequest"></param>
194+
/// <param name="xRequestID"> (optional)</param>
190195
/// <returns>ProcessResponse</returns>
191-
public ProcessResponse ApiProcess (ProcessRequest processRequest, Dictionary<String, String> headers)
196+
public ProcessResponse ApiProcess (ProcessRequest processRequest, string xRequestID = default(string))
192197
{
193-
ApiResponse<ProcessResponse> localVarResponse = ApiProcessWithHttpInfo(processRequest, headers);
198+
ApiResponse<ProcessResponse> localVarResponse = ApiProcessWithHttpInfo(processRequest, xRequestID);
194199
return localVarResponse.Data;
195200
}
196201

@@ -199,8 +204,9 @@ public ProcessResponse ApiProcess (ProcessRequest processRequest, Dictionary<Str
199204
/// </summary>
200205
/// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
201206
/// <param name="processRequest"></param>
207+
/// <param name="xRequestID"> (optional)</param>
202208
/// <returns>ApiResponse of ProcessResponse</returns>
203-
public ApiResponse<ProcessResponse> ApiProcessWithHttpInfo (ProcessRequest processRequest, Dictionary<String, String> headers)
209+
public ApiResponse<ProcessResponse> ApiProcessWithHttpInfo (ProcessRequest processRequest, string xRequestID = default(string))
204210
{
205211
// verify the required parameter 'processRequest' is set
206212
if (processRequest == null)
@@ -209,7 +215,7 @@ public ApiResponse<ProcessResponse> ApiProcessWithHttpInfo (ProcessRequest proce
209215
var localVarPath = "/api/process";
210216
var localVarPathParams = new Dictionary<String, String>();
211217
var localVarQueryParams = new List<KeyValuePair<String, String>>();
212-
var localVarHeaderParams = this.Configuration.DefaultHeader.Union(headers).ToDictionary (k => k.Key, v => v.Value);
218+
var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
213219
var localVarFormParams = new Dictionary<String, String>();
214220
var localVarFileParams = new Dictionary<String, FileParameter>();
215221
Object localVarPostBody = null;
@@ -228,6 +234,7 @@ public ApiResponse<ProcessResponse> ApiProcessWithHttpInfo (ProcessRequest proce
228234
if (localVarHttpHeaderAccept != null)
229235
localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
230236

237+
if (xRequestID != null) localVarHeaderParams.Add("X-RequestID", this.Configuration.ApiClient.ParameterToString(xRequestID)); // header parameter
231238
if (processRequest != null && processRequest.GetType() != typeof(byte[]))
232239
{
233240
localVarPostBody = this.Configuration.ApiClient.Serialize(processRequest); // http body (model) parameter
@@ -261,11 +268,12 @@ public ApiResponse<ProcessResponse> ApiProcessWithHttpInfo (ProcessRequest proce
261268
/// </summary>
262269
/// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
263270
/// <param name="processRequest"></param>
271+
/// <param name="xRequestID"> (optional)</param>
264272
/// <param name="cancellationToken">Cancellation Token to cancel request (optional) </param>
265273
/// <returns>Task of ProcessResponse</returns>
266-
public async System.Threading.Tasks.Task<ProcessResponse> ApiProcessAsync (ProcessRequest processRequest, CancellationToken cancellationToken = default(CancellationToken))
274+
public async System.Threading.Tasks.Task<ProcessResponse> ApiProcessAsync (ProcessRequest processRequest, string xRequestID = default(string), CancellationToken cancellationToken = default(CancellationToken))
267275
{
268-
ApiResponse<ProcessResponse> localVarResponse = await ApiProcessWithHttpInfoAsync(processRequest, cancellationToken);
276+
ApiResponse<ProcessResponse> localVarResponse = await ApiProcessWithHttpInfoAsync(processRequest, xRequestID, cancellationToken);
269277
return localVarResponse.Data;
270278

271279
}
@@ -275,9 +283,10 @@ public ApiResponse<ProcessResponse> ApiProcessWithHttpInfo (ProcessRequest proce
275283
/// </summary>
276284
/// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
277285
/// <param name="processRequest"></param>
286+
/// <param name="xRequestID"> (optional)</param>
278287
/// <param name="cancellationToken">Cancellation Token to cancel request (optional) </param>
279288
/// <returns>Task of ApiResponse (ProcessResponse)</returns>
280-
public async System.Threading.Tasks.Task<ApiResponse<ProcessResponse>> ApiProcessWithHttpInfoAsync (ProcessRequest processRequest, CancellationToken cancellationToken = default(CancellationToken))
289+
public async System.Threading.Tasks.Task<ApiResponse<ProcessResponse>> ApiProcessWithHttpInfoAsync (ProcessRequest processRequest, string xRequestID = default(string), CancellationToken cancellationToken = default(CancellationToken))
281290
{
282291
// verify the required parameter 'processRequest' is set
283292
if (processRequest == null)
@@ -305,6 +314,7 @@ public ApiResponse<ProcessResponse> ApiProcessWithHttpInfo (ProcessRequest proce
305314
if (localVarHttpHeaderAccept != null)
306315
localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
307316

317+
if (xRequestID != null) localVarHeaderParams.Add("X-RequestID", this.Configuration.ApiClient.ParameterToString(xRequestID)); // header parameter
308318
if (processRequest != null && processRequest.GetType() != typeof(byte[]))
309319
{
310320
localVarPostBody = this.Configuration.ApiClient.Serialize(processRequest); // http body (model) parameter

‎src/Regula.DocumentReader.WebClient/Client/ApiClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace Regula.DocumentReader.WebClient.Client
2929
/// </summary>
3030
public partial class ApiClient
3131
{
32-
private JsonSerializerSettings serializerSettings = new JsonSerializerSettings
32+
public JsonSerializerSettings serializerSettings = new JsonSerializerSettings
3333
{
3434
ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor
3535
};

‎src/Regula.DocumentReader.WebClient/Model/AreaArray.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public override string ToString()
7373
/// <returns>JSON string presentation of the object</returns>
7474
public virtual string ToJson()
7575
{
76-
return JsonConvert.SerializeObject(this, Formatting.Indented);
76+
return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
7777
}
7878

7979
/// <summary>

0 commit comments

Comments
 (0)