Skip to content

Commit 31bba53

Browse files
committed
Fix enum generation
1 parent 2cbeca4 commit 31bba53

File tree

78 files changed

+2203
-1712
lines changed

Some content is hidden

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

78 files changed

+2203
-1712
lines changed

.openapi-generator-ignore

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,7 @@ src/Regula.DocumentReader.WebClient/Regula.DocumentReader.WebClient.csproj
1212
src/Regula.DocumentReader.WebClient/Regula.DocumentReader.WebClient.nuspec
1313
src/Regula.DocumentReader.WebClient/packages.config
1414
src/Regula.DocumentReader.WebClient/Properties/**
15-
src/Regula.DocumentReader.WebClient/Models/**
1615

17-
18-
19-
# As an example, the C# client generator defines ApiClient.cs.
20-
# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
21-
#ApiClient.cs
22-
23-
# You can match any string of characters against a directory, file or extension with a single asterisk (*):
24-
#foo/*/qux
25-
# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
26-
27-
# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
28-
#foo/**/qux
29-
# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
30-
31-
# You can also negate patterns with an exclamation (!).
32-
# For example, you can ignore all files in a docs folder with the file extension .md:
33-
#docs/*.md
34-
# Then explicitly reverse the ignore rule for a single file:
35-
#!docs/README.md
16+
# classes, modified after generation
17+
**/ContainerList.cs
18+
**/*AllOf.cs

.openapi-generator/FILES

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
README.md
21
src/Regula.DocumentReader.WebClient/Api/DefaultApi.cs
32
src/Regula.DocumentReader.WebClient/Client/ApiClient.cs
43
src/Regula.DocumentReader.WebClient/Client/ApiException.cs
@@ -9,41 +8,27 @@ src/Regula.DocumentReader.WebClient/Client/GlobalConfiguration.cs
98
src/Regula.DocumentReader.WebClient/Client/IApiAccessor.cs
109
src/Regula.DocumentReader.WebClient/Client/IReadableConfiguration.cs
1110
src/Regula.DocumentReader.WebClient/Client/OpenAPIDateConverter.cs
12-
src/Regula.DocumentReader.WebClient/Model/CheckResult.cs
1311
src/Regula.DocumentReader.WebClient/Model/ChosenDocumentTypeResult.cs
14-
src/Regula.DocumentReader.WebClient/Model/ChosenDocumentTypeResultAllOf.cs
15-
src/Regula.DocumentReader.WebClient/Model/ContainerList.cs
1612
src/Regula.DocumentReader.WebClient/Model/CrossSourceValueComparison.cs
1713
src/Regula.DocumentReader.WebClient/Model/DetailsOptical.cs
1814
src/Regula.DocumentReader.WebClient/Model/DetailsRFID.cs
1915
src/Regula.DocumentReader.WebClient/Model/DeviceInfo.cs
2016
src/Regula.DocumentReader.WebClient/Model/DocVisualExtendedField.cs
2117
src/Regula.DocumentReader.WebClient/Model/DocVisualExtendedInfo.cs
22-
src/Regula.DocumentReader.WebClient/Model/DocumentFormat.cs
2318
src/Regula.DocumentReader.WebClient/Model/DocumentImageResult.cs
24-
src/Regula.DocumentReader.WebClient/Model/DocumentImageResultAllOf.cs
25-
src/Regula.DocumentReader.WebClient/Model/DocumentType.cs
26-
src/Regula.DocumentReader.WebClient/Model/DocumentTypeRecognitionResult.cs
2719
src/Regula.DocumentReader.WebClient/Model/DocumentTypesCandidatesList.cs
2820
src/Regula.DocumentReader.WebClient/Model/DocumentTypesCandidatesResult.cs
29-
src/Regula.DocumentReader.WebClient/Model/DocumentTypesCandidatesResultAllOf.cs
3021
src/Regula.DocumentReader.WebClient/Model/FDSIDList.cs
3122
src/Regula.DocumentReader.WebClient/Model/GraphicField.cs
32-
src/Regula.DocumentReader.WebClient/Model/GraphicFieldType.cs
3323
src/Regula.DocumentReader.WebClient/Model/GraphicFieldsList.cs
3424
src/Regula.DocumentReader.WebClient/Model/GraphicsResult.cs
35-
src/Regula.DocumentReader.WebClient/Model/GraphicsResultAllOf.cs
3625
src/Regula.DocumentReader.WebClient/Model/ImageData.cs
3726
src/Regula.DocumentReader.WebClient/Model/Images.cs
3827
src/Regula.DocumentReader.WebClient/Model/ImagesAvailableSource.cs
3928
src/Regula.DocumentReader.WebClient/Model/ImagesField.cs
4029
src/Regula.DocumentReader.WebClient/Model/ImagesFieldValue.cs
4130
src/Regula.DocumentReader.WebClient/Model/ImagesResult.cs
42-
src/Regula.DocumentReader.WebClient/Model/ImagesResultAllOf.cs
43-
src/Regula.DocumentReader.WebClient/Model/LCID.cs
4431
src/Regula.DocumentReader.WebClient/Model/LexicalAnalysisResult.cs
45-
src/Regula.DocumentReader.WebClient/Model/LexicalAnalysisResultAllOf.cs
46-
src/Regula.DocumentReader.WebClient/Model/Light.cs
4732
src/Regula.DocumentReader.WebClient/Model/ListVerifiedFields.cs
4833
src/Regula.DocumentReader.WebClient/Model/OneCandidate.cs
4934
src/Regula.DocumentReader.WebClient/Model/OriginalSymbol.cs
@@ -52,30 +37,20 @@ src/Regula.DocumentReader.WebClient/Model/ProcessRequest.cs
5237
src/Regula.DocumentReader.WebClient/Model/ProcessRequestImage.cs
5338
src/Regula.DocumentReader.WebClient/Model/ProcessResponse.cs
5439
src/Regula.DocumentReader.WebClient/Model/ProcessSystemInfo.cs
55-
src/Regula.DocumentReader.WebClient/Model/ProcessingStatus.cs
5640
src/Regula.DocumentReader.WebClient/Model/RectangleCoordinates.cs
57-
src/Regula.DocumentReader.WebClient/Model/Result.cs
5841
src/Regula.DocumentReader.WebClient/Model/ResultItem.cs
59-
src/Regula.DocumentReader.WebClient/Model/RfidLocation.cs
6042
src/Regula.DocumentReader.WebClient/Model/RfidOrigin.cs
61-
src/Regula.DocumentReader.WebClient/Model/Scenario.cs
62-
src/Regula.DocumentReader.WebClient/Model/Source.cs
6343
src/Regula.DocumentReader.WebClient/Model/SourceValidity.cs
6444
src/Regula.DocumentReader.WebClient/Model/Status.cs
6545
src/Regula.DocumentReader.WebClient/Model/StatusResult.cs
66-
src/Regula.DocumentReader.WebClient/Model/StatusResultAllOf.cs
6746
src/Regula.DocumentReader.WebClient/Model/StringRecognitionResult.cs
6847
src/Regula.DocumentReader.WebClient/Model/SymbolCandidate.cs
6948
src/Regula.DocumentReader.WebClient/Model/SymbolRecognitionResult.cs
7049
src/Regula.DocumentReader.WebClient/Model/Text.cs
7150
src/Regula.DocumentReader.WebClient/Model/TextAvailableSource.cs
7251
src/Regula.DocumentReader.WebClient/Model/TextDataResult.cs
73-
src/Regula.DocumentReader.WebClient/Model/TextDataResultAllOf.cs
7452
src/Regula.DocumentReader.WebClient/Model/TextField.cs
75-
src/Regula.DocumentReader.WebClient/Model/TextFieldType.cs
7653
src/Regula.DocumentReader.WebClient/Model/TextFieldValue.cs
7754
src/Regula.DocumentReader.WebClient/Model/TextResult.cs
78-
src/Regula.DocumentReader.WebClient/Model/TextResultAllOf.cs
7955
src/Regula.DocumentReader.WebClient/Model/TransactionInfo.cs
80-
src/Regula.DocumentReader.WebClient/Model/VerificationResult.cs
8156
src/Regula.DocumentReader.WebClient/Model/VerifiedFieldMap.cs

.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-SNAPSHOT

csharp-generator-config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"packageName": "Regula.DocumentReader.WebClient",
3-
"optionalAssemblyInfo": true
3+
"optionalAssemblyInfo": true,
4+
"isRestSharp_106_10_1_above" :true
45
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{{#description}}
2+
/// {{description}}
3+
{{/description}}
4+
public class {{classname}}
5+
{
6+
{{#isString}}
7+
{{#allowableValues}}{{#enumVars}}
8+
{{#enumDescription}}/** {{enumDescription}} */{{/enumDescription}}
9+
public const {{{dataType}}} {{{name}}} = "{{{value}}}";
10+
{{/enumVars}}{{/allowableValues}}
11+
{{/isString}}
12+
{{^isString}}
13+
{{#allowableValues}}{{#enumVars}}
14+
{{#enumDescription}}/** {{enumDescription}} */{{/enumDescription}}
15+
public const {{{dataType}}} {{{name}}} = {{{value}}};
16+
{{/enumVars}}{{/allowableValues}}
17+
{{/isString}}
18+
}

src/Regula.DocumentReader.NetCoreExample/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ internal static class Program
1515

1616
public static void Main()
1717
{
18-
string apiBaseUrl = Environment.GetEnvironmentVariable(ApiBasePath) ?? "http://localhost:8083";
18+
string apiBaseUrl = Environment.GetEnvironmentVariable(ApiBasePath) ?? "http://localhost:8080";
1919

2020
string licenseFromEnv = Environment.GetEnvironmentVariable(TestLicense); // optional, used here only for smoke test purposes
2121
var licenseFromFile = File.Exists(LicenseFileName)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ private RestRequest PrepareRequest(
135135
// add file parameter, if any
136136
foreach(var param in fileParams)
137137
{
138-
request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
138+
request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentLength, param.Value.ContentType);
139139
}
140140

141141
if (postBody != null) // http body (model or byte[]) parameter

src/Regula.DocumentReader.WebClient/Model/CheckResult.cs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,23 @@
88
* Generated by: https://github.com/openapitools/openapi-generator.git
99
*/
1010

11+
using System;
12+
using System.Linq;
13+
using System.IO;
14+
using System.Text;
15+
using System.Text.RegularExpressions;
16+
using System.Collections;
17+
using System.Collections.Generic;
18+
using System.Collections.ObjectModel;
19+
using System.Runtime.Serialization;
20+
using Newtonsoft.Json;
21+
using Newtonsoft.Json.Converters;
22+
using System.ComponentModel.DataAnnotations;
23+
using OpenAPIDateConverter = Regula.DocumentReader.WebClient.Client.OpenAPIDateConverter;
24+
1125
namespace Regula.DocumentReader.WebClient.Model
1226
{
13-
public class CheckResult
27+
public class CheckResult
1428
{
1529

1630
/** Check was performed and result is NEGATIVE */
@@ -21,5 +35,6 @@ public class CheckResult
2135

2236
/** Check was NOT PERFORMED */
2337
public const int WAS_NOT_DONE = 2;
38+
2439
}
2540
}

src/Regula.DocumentReader.WebClient/Model/ChosenDocumentTypeResult.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,18 @@
99
*/
1010

1111
using System;
12+
using System.Linq;
13+
using System.IO;
14+
using System.Text;
15+
using System.Text.RegularExpressions;
16+
using System.Collections;
1217
using System.Collections.Generic;
13-
using System.ComponentModel.DataAnnotations;
18+
using System.Collections.ObjectModel;
1419
using System.Runtime.Serialization;
15-
using System.Text;
1620
using Newtonsoft.Json;
21+
using Newtonsoft.Json.Converters;
22+
using System.ComponentModel.DataAnnotations;
23+
using OpenAPIDateConverter = Regula.DocumentReader.WebClient.Client.OpenAPIDateConverter;
1724

1825
namespace Regula.DocumentReader.WebClient.Model
1926
{
@@ -26,13 +33,13 @@ public partial class ChosenDocumentTypeResult : ResultItem, IEquatable<ChosenDo
2633
/// <summary>
2734
/// Initializes a new instance of the <see cref="ChosenDocumentTypeResult" /> class.
2835
/// </summary>
29-
[JsonConstructor]
36+
[JsonConstructorAttribute]
3037
protected ChosenDocumentTypeResult() { }
3138
/// <summary>
3239
/// Initializes a new instance of the <see cref="ChosenDocumentTypeResult" /> class.
3340
/// </summary>
3441
/// <param name="oneCandidate">oneCandidate.</param>
35-
public ChosenDocumentTypeResult(OneCandidate oneCandidate = default(OneCandidate), int bufLength = default(int), int light = default(int), int listIdx = default(int), int pageIdx = default(int), int resultType = default) : base(bufLength, light, listIdx, pageIdx, resultType)
42+
public ChosenDocumentTypeResult(OneCandidate oneCandidate = default(OneCandidate), int bufLength = default(int), int light = default(int), int listIdx = default(int), int pageIdx = default(int), int resultType = 0) : base(bufLength, light, listIdx, pageIdx, resultType)
3643
{
3744
this.OneCandidate = oneCandidate;
3845
}

src/Regula.DocumentReader.WebClient/Model/ChosenDocumentTypeResultAllOf.cs

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

0 commit comments

Comments
 (0)