Fix enum generation

Author: hleb-albau

.openapi-generator-ignore

@@ -12,24 +12,7 @@ src/Regula.DocumentReader.WebClient/Regula.DocumentReader.WebClient.csproj
 src/Regula.DocumentReader.WebClient/Regula.DocumentReader.WebClient.nuspec
 src/Regula.DocumentReader.WebClient/packages.config
 src/Regula.DocumentReader.WebClient/Properties/**
-src/Regula.DocumentReader.WebClient/Models/**
 
-
-
-# As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
-#ApiClient.cs
-
-# You can match any string of characters against a directory, file or extension with a single asterisk (*):
-#foo/*/qux
-# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
-
-# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
-#foo/**/qux
-# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
-
-# You can also negate patterns with an exclamation (!).
-# For example, you can ignore all files in a docs folder with the file extension .md:
-#docs/*.md
-# Then explicitly reverse the ignore rule for a single file:
-#!docs/README.md
+# classes, modified after generation
+**/ContainerList.cs
+**/*AllOf.cs

.openapi-generator/FILES

@@ -1,4 +1,3 @@
-README.md
 src/Regula.DocumentReader.WebClient/Api/DefaultApi.cs
 src/Regula.DocumentReader.WebClient/Client/ApiClient.cs
 src/Regula.DocumentReader.WebClient/Client/ApiException.cs
@@ -9,41 +8,27 @@ src/Regula.DocumentReader.WebClient/Client/GlobalConfiguration.cs
 src/Regula.DocumentReader.WebClient/Client/IApiAccessor.cs
 src/Regula.DocumentReader.WebClient/Client/IReadableConfiguration.cs
 src/Regula.DocumentReader.WebClient/Client/OpenAPIDateConverter.cs
-src/Regula.DocumentReader.WebClient/Model/CheckResult.cs
 src/Regula.DocumentReader.WebClient/Model/ChosenDocumentTypeResult.cs
-src/Regula.DocumentReader.WebClient/Model/ChosenDocumentTypeResultAllOf.cs
-src/Regula.DocumentReader.WebClient/Model/ContainerList.cs
 src/Regula.DocumentReader.WebClient/Model/CrossSourceValueComparison.cs
 src/Regula.DocumentReader.WebClient/Model/DetailsOptical.cs
 src/Regula.DocumentReader.WebClient/Model/DetailsRFID.cs
 src/Regula.DocumentReader.WebClient/Model/DeviceInfo.cs
 src/Regula.DocumentReader.WebClient/Model/DocVisualExtendedField.cs
 src/Regula.DocumentReader.WebClient/Model/DocVisualExtendedInfo.cs
-src/Regula.DocumentReader.WebClient/Model/DocumentFormat.cs
 src/Regula.DocumentReader.WebClient/Model/DocumentImageResult.cs
-src/Regula.DocumentReader.WebClient/Model/DocumentImageResultAllOf.cs
-src/Regula.DocumentReader.WebClient/Model/DocumentType.cs
-src/Regula.DocumentReader.WebClient/Model/DocumentTypeRecognitionResult.cs
 src/Regula.DocumentReader.WebClient/Model/DocumentTypesCandidatesList.cs
 src/Regula.DocumentReader.WebClient/Model/DocumentTypesCandidatesResult.cs
-src/Regula.DocumentReader.WebClient/Model/DocumentTypesCandidatesResultAllOf.cs
 src/Regula.DocumentReader.WebClient/Model/FDSIDList.cs
 src/Regula.DocumentReader.WebClient/Model/GraphicField.cs
-src/Regula.DocumentReader.WebClient/Model/GraphicFieldType.cs
 src/Regula.DocumentReader.WebClient/Model/GraphicFieldsList.cs
 src/Regula.DocumentReader.WebClient/Model/GraphicsResult.cs
-src/Regula.DocumentReader.WebClient/Model/GraphicsResultAllOf.cs
 src/Regula.DocumentReader.WebClient/Model/ImageData.cs
 src/Regula.DocumentReader.WebClient/Model/Images.cs
 src/Regula.DocumentReader.WebClient/Model/ImagesAvailableSource.cs
 src/Regula.DocumentReader.WebClient/Model/ImagesField.cs
 src/Regula.DocumentReader.WebClient/Model/ImagesFieldValue.cs
 src/Regula.DocumentReader.WebClient/Model/ImagesResult.cs
-src/Regula.DocumentReader.WebClient/Model/ImagesResultAllOf.cs
-src/Regula.DocumentReader.WebClient/Model/LCID.cs
 src/Regula.DocumentReader.WebClient/Model/LexicalAnalysisResult.cs
-src/Regula.DocumentReader.WebClient/Model/LexicalAnalysisResultAllOf.cs
-src/Regula.DocumentReader.WebClient/Model/Light.cs
 src/Regula.DocumentReader.WebClient/Model/ListVerifiedFields.cs
 src/Regula.DocumentReader.WebClient/Model/OneCandidate.cs
 src/Regula.DocumentReader.WebClient/Model/OriginalSymbol.cs
@@ -52,30 +37,20 @@ src/Regula.DocumentReader.WebClient/Model/ProcessRequest.cs
 src/Regula.DocumentReader.WebClient/Model/ProcessRequestImage.cs
 src/Regula.DocumentReader.WebClient/Model/ProcessResponse.cs
 src/Regula.DocumentReader.WebClient/Model/ProcessSystemInfo.cs
-src/Regula.DocumentReader.WebClient/Model/ProcessingStatus.cs
 src/Regula.DocumentReader.WebClient/Model/RectangleCoordinates.cs
-src/Regula.DocumentReader.WebClient/Model/Result.cs
 src/Regula.DocumentReader.WebClient/Model/ResultItem.cs
-src/Regula.DocumentReader.WebClient/Model/RfidLocation.cs
 src/Regula.DocumentReader.WebClient/Model/RfidOrigin.cs
-src/Regula.DocumentReader.WebClient/Model/Scenario.cs
-src/Regula.DocumentReader.WebClient/Model/Source.cs
 src/Regula.DocumentReader.WebClient/Model/SourceValidity.cs
 src/Regula.DocumentReader.WebClient/Model/Status.cs
 src/Regula.DocumentReader.WebClient/Model/StatusResult.cs
-src/Regula.DocumentReader.WebClient/Model/StatusResultAllOf.cs
 src/Regula.DocumentReader.WebClient/Model/StringRecognitionResult.cs
 src/Regula.DocumentReader.WebClient/Model/SymbolCandidate.cs
 src/Regula.DocumentReader.WebClient/Model/SymbolRecognitionResult.cs
 src/Regula.DocumentReader.WebClient/Model/Text.cs
 src/Regula.DocumentReader.WebClient/Model/TextAvailableSource.cs
 src/Regula.DocumentReader.WebClient/Model/TextDataResult.cs
-src/Regula.DocumentReader.WebClient/Model/TextDataResultAllOf.cs
 src/Regula.DocumentReader.WebClient/Model/TextField.cs
-src/Regula.DocumentReader.WebClient/Model/TextFieldType.cs
 src/Regula.DocumentReader.WebClient/Model/TextFieldValue.cs
 src/Regula.DocumentReader.WebClient/Model/TextResult.cs
-src/Regula.DocumentReader.WebClient/Model/TextResultAllOf.cs
 src/Regula.DocumentReader.WebClient/Model/TransactionInfo.cs
-src/Regula.DocumentReader.WebClient/Model/VerificationResult.cs
 src/Regula.DocumentReader.WebClient/Model/VerifiedFieldMap.cs

.openapi-generator/VERSION

@@ -1 +1 @@
-5.0.0-beta2
+5.0.0-SNAPSHOT

csharp-generator-config.json

@@ -1,4 +1,5 @@
 {
   "packageName": "Regula.DocumentReader.WebClient",
-  "optionalAssemblyInfo": true
+  "optionalAssemblyInfo": true,
+  "isRestSharp_106_10_1_above" :true
 }

generator-templates/modelEnum.mustache

@@ -0,0 +1,18 @@
+{{#description}}
+    /// {{description}}
+{{/description}}
+    public class {{classname}}
+    {
+{{#isString}}
+{{#allowableValues}}{{#enumVars}}
+        {{#enumDescription}}/** {{enumDescription}} */{{/enumDescription}}
+        public const {{{dataType}}} {{{name}}} = "{{{value}}}";
+{{/enumVars}}{{/allowableValues}}
+{{/isString}}
+{{^isString}}
+{{#allowableValues}}{{#enumVars}}
+        {{#enumDescription}}/** {{enumDescription}} */{{/enumDescription}}
+        public const {{{dataType}}} {{{name}}} = {{{value}}};
+{{/enumVars}}{{/allowableValues}}
+{{/isString}}
+    }

src/Regula.DocumentReader.NetCoreExample/Program.cs

@@ -15,7 +15,7 @@ internal static class Program
 
         public static void Main()
         {
-            string apiBaseUrl = Environment.GetEnvironmentVariable(ApiBasePath) ?? "http://localhost:8083";
+            string apiBaseUrl = Environment.GetEnvironmentVariable(ApiBasePath) ?? "http://localhost:8080";
 
             string licenseFromEnv = Environment.GetEnvironmentVariable(TestLicense); // optional, used here only for smoke test purposes
             var licenseFromFile = File.Exists(LicenseFileName) 

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

@@ -135,7 +135,7 @@ private RestRequest PrepareRequest(
             // add file parameter, if any
             foreach(var param in fileParams)
             {
-                request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
+                request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentLength, param.Value.ContentType);
             }
 
             if (postBody != null) // http body (model or byte[]) parameter

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

@@ -8,9 +8,23 @@
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
 
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Regula.DocumentReader.WebClient.Client.OpenAPIDateConverter;
+
 namespace Regula.DocumentReader.WebClient.Model
 {
-    public class CheckResult 
+    public class CheckResult
     {
 
         /** Check was performed and result is NEGATIVE */
@@ -21,5 +35,6 @@ public class CheckResult
 
         /** Check was NOT PERFORMED */
         public const int WAS_NOT_DONE = 2;
+
     }
 }

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

@@ -9,11 +9,18 @@
  */
 
 using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.Collections.ObjectModel;
 using System.Runtime.Serialization;
-using System.Text;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Regula.DocumentReader.WebClient.Client.OpenAPIDateConverter;
 
 namespace Regula.DocumentReader.WebClient.Model
 {
@@ -26,13 +33,13 @@ public partial class ChosenDocumentTypeResult : ResultItem,  IEquatable<ChosenDo
         /// <summary>
         /// Initializes a new instance of the <see cref="ChosenDocumentTypeResult" /> class.
         /// </summary>
-        [JsonConstructor]
+        [JsonConstructorAttribute]
         protected ChosenDocumentTypeResult() { }
         /// <summary>
         /// Initializes a new instance of the <see cref="ChosenDocumentTypeResult" /> class.
         /// </summary>
         /// <param name="oneCandidate">oneCandidate.</param>
-        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)
+        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)
         {
             this.OneCandidate = oneCandidate;
         }