Skip to content

Commit 7edc3e5

Browse files
KirylKovaliovKirylKovaliov
authored
Merge pull request #192 from regulaforensics/fix/sp-18211
SP-18211 - update models
2 parents d7c2a07 + 872c731 commit 7edc3e5

34 files changed

+1003
-469
lines changed

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,14 @@ protected CertificateData() { }
4242
/// </summary>
4343
/// <param name="data">data (required).</param>
4444
/// <param name="length">length (required).</param>
45-
public CertificateData(string data = default(string), string length = default(string))
45+
public CertificateData(string data = default(string), int length = default(int))
4646
{
4747
// to ensure "data" is required (not null)
4848
if (data == null)
4949
{
5050
throw new ArgumentNullException("data is a required property for CertificateData and cannot be null");
5151
}
5252
this.Data = data;
53-
// to ensure "length" is required (not null)
54-
if (length == null)
55-
{
56-
throw new ArgumentNullException("length is a required property for CertificateData and cannot be null");
57-
}
5853
this.Length = length;
5954
}
6055

@@ -68,7 +63,7 @@ protected CertificateData() { }
6863
/// Gets or Sets Length
6964
/// </summary>
7065
[DataMember(Name = "Length", IsRequired = true, EmitDefaultValue = true)]
71-
public string Length { get; set; }
66+
public int Length { get; set; }
7267

7368
/// <summary>
7469
/// Returns the string presentation of the object

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ protected DocVisualExtendedField() { }
4141
/// Initializes a new instance of the <see cref="DocVisualExtendedField" /> class.
4242
/// </summary>
4343
/// <param name="fieldRect">fieldRect (required).</param>
44-
/// <param name="fieldType">fieldType (required).</param>
4544
/// <param name="wFieldType">wFieldType (required).</param>
4645
/// <param name="fieldName">Field symbolic name (null-terminated string) (required).</param>
4746
/// <param name="stringsCount">Number of StringsResult array elements (required).</param>
@@ -54,7 +53,7 @@ protected DocVisualExtendedField() { }
5453
/// <param name="wLCID">wLCID.</param>
5554
/// <param name="reserved2">reserved2.</param>
5655
/// <param name="reserved3">reserved3.</param>
57-
public DocVisualExtendedField(RectangleCoordinates fieldRect = default(RectangleCoordinates), int fieldType = default(int), TextFieldType wFieldType = default(TextFieldType), string fieldName = default(string), decimal stringsCount = default(decimal), List<StringRecognitionResult> stringsResult = default(List<StringRecognitionResult>), decimal bufLength = default(decimal), string bufText = default(string), string fieldMask = default(string), int validity = default(int), int inComparison = default(int), int wLCID = default(int), int reserved2 = default(int), int reserved3 = default(int)) : base(fieldType, wFieldType, fieldName, stringsCount, stringsResult, bufLength, bufText, fieldMask, validity, inComparison, wLCID, reserved2, reserved3)
56+
public DocVisualExtendedField(RectangleCoordinates fieldRect = default(RectangleCoordinates), TextFieldType wFieldType = default(TextFieldType), string fieldName = default(string), decimal stringsCount = default(decimal), List<StringRecognitionResult> stringsResult = default(List<StringRecognitionResult>), decimal bufLength = default(decimal), string bufText = default(string), string fieldMask = default(string), int validity = default(int), int inComparison = default(int), int wLCID = default(int), int reserved2 = default(int), int reserved3 = default(int)) : base(wFieldType, fieldName, stringsCount, stringsResult, bufLength, bufText, fieldMask, validity, inComparison, wLCID, reserved2, reserved3)
5857
{
5958
// to ensure "fieldRect" is required (not null)
6059
if (fieldRect == null)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ protected EncryptedRCLItem() { }
5656
/// </summary>
5757
/// <value>Base64 encoded data</value>
5858
/*
59-
<example>[B@48386ddd</example>
59+
<example>[B@5022ed18</example>
6060
*/
6161
[DataMember(Name = "EncryptedRCL", IsRequired = true, EmitDefaultValue = true)]
6262
public byte[] EncryptedRCL { get; set; }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ protected EncryptedRCLResult() { }
6262
/// </summary>
6363
/// <value>Base64 encoded data</value>
6464
/*
65-
<example>[B@48386ddd</example>
65+
<example>[B@5022ed18</example>
6666
*/
6767
[DataMember(Name = "EncryptedRCL", IsRequired = true, EmitDefaultValue = true)]
6868
public byte[] EncryptedRCL { get; set; }

‎src/Regula.DocumentReader.WebClient/Model/Ext/RecognitionParams.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public RecognitionParams WithLog(bool log)
3636
return this;
3737
}
3838

39-
public RecognitionParams WithProcessAuth(AuthenticityResultType processAuth)
39+
public RecognitionParams WithProcessAuth(long processAuth)
4040
{
4141
ProcessAuth = processAuth;
4242
return this;

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ protected FiberItem() { }
5555
/// <param name="length">Fibers length value for located areas (in pixels) (required).</param>
5656
/// <param name="area">Fibers value for areas (in pixels) (required).</param>
5757
/// <param name="colorValues">Fibers color value (required).</param>
58-
/// <param name="errorCode">errorCode.</param>
59-
public FiberItem(int rectCount = default(int), int expectedCount = default(int), Light? lightValue = default(Light?), int lightDisp = default(int), List<RectangleCoordinates> rectArray = default(List<RectangleCoordinates>), List<int> width = default(List<int>), List<int> length = default(List<int>), List<int> area = default(List<int>), List<int> colorValues = default(List<int>), int errorCode = default(int))
58+
public FiberItem(int rectCount = default(int), int expectedCount = default(int), Light? lightValue = default(Light?), int lightDisp = default(int), List<RectangleCoordinates> rectArray = default(List<RectangleCoordinates>), List<int> width = default(List<int>), List<int> length = default(List<int>), List<int> area = default(List<int>), List<int> colorValues = default(List<int>))
6059
{
6160
this.RectCount = rectCount;
6261
this.ExpectedCount = expectedCount;
@@ -92,7 +91,6 @@ protected FiberItem() { }
9291
this.ColorValues = colorValues;
9392
this.LightValue = lightValue;
9493
this.LightDisp = lightDisp;
95-
this.ErrorCode = errorCode;
9694
}
9795

9896
/// <summary>
@@ -154,12 +152,6 @@ protected FiberItem() { }
154152
[DataMember(Name = "ColorValues", IsRequired = true, EmitDefaultValue = true)]
155153
public List<int> ColorValues { get; set; }
156154

157-
/// <summary>
158-
/// Gets or Sets ErrorCode
159-
/// </summary>
160-
[DataMember(Name = "ErrorCode", EmitDefaultValue = false)]
161-
public int? ErrorCode { get; set; }
162-
163155
/// <summary>
164156
/// Returns the string presentation of the object
165157
/// </summary>
@@ -177,7 +169,6 @@ public override string ToString()
177169
sb.Append(" Length: ").Append(Length).Append("\n");
178170
sb.Append(" Area: ").Append(Area).Append("\n");
179171
sb.Append(" ColorValues: ").Append(ColorValues).Append("\n");
180-
sb.Append(" ErrorCode: ").Append(ErrorCode).Append("\n");
181172
sb.Append("}\n");
182173
return sb.ToString();
183174
}

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,11 @@ protected FiberResult() { }
5656
/// <param name="length">Fibers length value for located areas (in pixels) (required).</param>
5757
/// <param name="area">Fibers value for areas (in pixels) (required).</param>
5858
/// <param name="colorValues">Fibers color value (required).</param>
59-
/// <param name="errorCode">errorCode.</param>
6059
/// <param name="type">type (required) (default to AuthenticityResultType.UV_FIBERS).</param>
6160
/// <param name="elementResult">elementResult.</param>
6261
/// <param name="elementDiagnose">elementDiagnose.</param>
6362
/// <param name="percentValue">percentValue.</param>
64-
public FiberResult(int rectCount = default(int), int expectedCount = default(int), Light? lightValue = default(Light?), int lightDisp = default(int), List<RectangleCoordinates> rectArray = default(List<RectangleCoordinates>), List<int> width = default(List<int>), List<int> length = default(List<int>), List<int> area = default(List<int>), List<int> colorValues = default(List<int>), int errorCode = default(int), AuthenticityResultType type = AuthenticityResultType.UV_FIBERS, CheckResult? elementResult = default(CheckResult?), CheckDiagnose? elementDiagnose = default(CheckDiagnose?), int percentValue = default(int)) : base(type, elementResult, elementDiagnose, percentValue)
63+
public FiberResult(int rectCount = default(int), int expectedCount = default(int), Light? lightValue = default(Light?), int lightDisp = default(int), List<RectangleCoordinates> rectArray = default(List<RectangleCoordinates>), List<int> width = default(List<int>), List<int> length = default(List<int>), List<int> area = default(List<int>), List<int> colorValues = default(List<int>), AuthenticityResultType type = AuthenticityResultType.UV_FIBERS, CheckResult? elementResult = default(CheckResult?), CheckDiagnose? elementDiagnose = default(CheckDiagnose?), int percentValue = default(int)) : base(type, elementResult, elementDiagnose, percentValue)
6564
{
6665
this.RectCount = rectCount;
6766
this.ExpectedCount = expectedCount;
@@ -97,7 +96,6 @@ protected FiberResult() { }
9796
this.ColorValues = colorValues;
9897
this.LightValue = lightValue;
9998
this.LightDisp = lightDisp;
100-
this.ErrorCode = errorCode;
10199
}
102100

103101
/// <summary>
@@ -159,12 +157,6 @@ protected FiberResult() { }
159157
[DataMember(Name = "ColorValues", IsRequired = true, EmitDefaultValue = true)]
160158
public List<int> ColorValues { get; set; }
161159

162-
/// <summary>
163-
/// Gets or Sets ErrorCode
164-
/// </summary>
165-
[DataMember(Name = "ErrorCode", EmitDefaultValue = false)]
166-
public int? ErrorCode { get; set; }
167-
168160
/// <summary>
169161
/// Returns the string presentation of the object
170162
/// </summary>
@@ -183,7 +175,6 @@ public override string ToString()
183175
sb.Append(" Length: ").Append(Length).Append("\n");
184176
sb.Append(" Area: ").Append(Area).Append("\n");
185177
sb.Append(" ColorValues: ").Append(ColorValues).Append("\n");
186-
sb.Append(" ErrorCode: ").Append(ErrorCode).Append("\n");
187178
sb.Append("}\n");
188179
return sb.ToString();
189180
}

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ protected IdentItem() { }
5959
/// <param name="etalonImage">etalonImage (required).</param>
6060
/// <param name="areaList">areaList.</param>
6161
/// <param name="elementID">elementID.</param>
62-
/// <param name="result">result.</param>
63-
public IdentItem(SecurityFeatureType elementType = default(SecurityFeatureType), Light lightIndex = default(Light), RectangleCoordinates area = default(RectangleCoordinates), ImageData image = default(ImageData), ImageData etalonImage = default(ImageData), AreaContainer areaList = default(AreaContainer), int elementID = default(int), int result = default(int))
62+
public IdentItem(SecurityFeatureType elementType = default(SecurityFeatureType), Light lightIndex = default(Light), RectangleCoordinates area = default(RectangleCoordinates), ImageData image = default(ImageData), ImageData etalonImage = default(ImageData), AreaContainer areaList = default(AreaContainer), int elementID = default(int))
6463
{
6564
this.ElementType = elementType;
6665
this.LightIndex = lightIndex;
@@ -79,7 +78,6 @@ protected IdentItem() { }
7978
this.Area = area;
8079
this.AreaList = areaList;
8180
this.ElementID = elementID;
82-
this.Result = result;
8381
}
8482

8583
/// <summary>
@@ -112,12 +110,6 @@ protected IdentItem() { }
112110
[DataMember(Name = "ElementID", EmitDefaultValue = false)]
113111
public int? ElementID { get; set; }
114112

115-
/// <summary>
116-
/// Gets or Sets Result
117-
/// </summary>
118-
[DataMember(Name = "Result", EmitDefaultValue = false)]
119-
public int? Result { get; set; }
120-
121113
/// <summary>
122114
/// Returns the string presentation of the object
123115
/// </summary>
@@ -133,7 +125,6 @@ public override string ToString()
133125
sb.Append(" EtalonImage: ").Append(EtalonImage).Append("\n");
134126
sb.Append(" AreaList: ").Append(AreaList).Append("\n");
135127
sb.Append(" ElementID: ").Append(ElementID).Append("\n");
136-
sb.Append(" Result: ").Append(Result).Append("\n");
137128
sb.Append("}\n");
138129
return sb.ToString();
139130
}

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,11 @@ protected IdentResult() { }
6060
/// <param name="etalonImage">etalonImage (required).</param>
6161
/// <param name="areaList">areaList.</param>
6262
/// <param name="elementID">elementID.</param>
63-
/// <param name="result">result.</param>
6463
/// <param name="type">type (required) (default to AuthenticityResultType.IMAGE_PATTERN).</param>
6564
/// <param name="elementResult">elementResult.</param>
6665
/// <param name="elementDiagnose">elementDiagnose.</param>
6766
/// <param name="percentValue">percentValue.</param>
68-
public IdentResult(SecurityFeatureType elementType = default(SecurityFeatureType), Light lightIndex = default(Light), RectangleCoordinates area = default(RectangleCoordinates), ImageData image = default(ImageData), ImageData etalonImage = default(ImageData), AreaContainer areaList = default(AreaContainer), int elementID = default(int), int result = default(int), AuthenticityResultType type = AuthenticityResultType.IMAGE_PATTERN, CheckResult? elementResult = default(CheckResult?), CheckDiagnose? elementDiagnose = default(CheckDiagnose?), int percentValue = default(int)) : base(type, elementResult, elementDiagnose, percentValue)
67+
public IdentResult(SecurityFeatureType elementType = default(SecurityFeatureType), Light lightIndex = default(Light), RectangleCoordinates area = default(RectangleCoordinates), ImageData image = default(ImageData), ImageData etalonImage = default(ImageData), AreaContainer areaList = default(AreaContainer), int elementID = default(int), AuthenticityResultType type = AuthenticityResultType.IMAGE_PATTERN, CheckResult? elementResult = default(CheckResult?), CheckDiagnose? elementDiagnose = default(CheckDiagnose?), int percentValue = default(int)) : base(type, elementResult, elementDiagnose, percentValue)
6968
{
7069
this.ElementType = elementType;
7170
this.LightIndex = lightIndex;
@@ -84,7 +83,6 @@ protected IdentResult() { }
8483
this.Area = area;
8584
this.AreaList = areaList;
8685
this.ElementID = elementID;
87-
this.Result = result;
8886
}
8987

9088
/// <summary>
@@ -117,12 +115,6 @@ protected IdentResult() { }
117115
[DataMember(Name = "ElementID", EmitDefaultValue = false)]
118116
public int? ElementID { get; set; }
119117

120-
/// <summary>
121-
/// Gets or Sets Result
122-
/// </summary>
123-
[DataMember(Name = "Result", EmitDefaultValue = false)]
124-
public int? Result { get; set; }
125-
126118
/// <summary>
127119
/// Returns the string presentation of the object
128120
/// </summary>
@@ -139,7 +131,6 @@ public override string ToString()
139131
sb.Append(" EtalonImage: ").Append(EtalonImage).Append("\n");
140132
sb.Append(" AreaList: ").Append(AreaList).Append("\n");
141133
sb.Append(" ElementID: ").Append(ElementID).Append("\n");
142-
sb.Append(" Result: ").Append(Result).Append("\n");
143134
sb.Append("}\n");
144135
return sb.ToString();
145136
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ protected LicenseItem() { }
5656
/// </summary>
5757
/// <value>Base64 encoded data</value>
5858
/*
59-
<example>[B@2bc6826a</example>
59+
<example>[B@77df6449</example>
6060
*/
6161
[DataMember(Name = "License", IsRequired = true, EmitDefaultValue = true)]
6262
public byte[] License { get; set; }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ protected LicenseResult() { }
6262
/// </summary>
6363
/// <value>Base64 encoded data</value>
6464
/*
65-
<example>[B@2bc6826a</example>
65+
<example>[B@77df6449</example>
6666
*/
6767
[DataMember(Name = "License", IsRequired = true, EmitDefaultValue = true)]
6868
public byte[] License { get; set; }

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,16 @@ public enum Light
3737
/// </summary>
3838
OFF = 0,
3939

40+
/// <summary>
41+
/// Enum WHITE_TOP for value: 2
42+
/// </summary>
43+
WHITE_TOP = 2,
44+
45+
/// <summary>
46+
/// Enum WHITE_SIDE for value: 4
47+
/// </summary>
48+
WHITE_SIDE = 4,
49+
4050
/// <summary>
4151
/// Enum WHITE for value: 6
4252
/// </summary>
@@ -53,9 +63,9 @@ public enum Light
5363
UV = 128,
5464

5565
/// <summary>
56-
/// Enum AXIAL_WHITE_FULL for value: 3072
66+
/// Enum AXIAL_WHITE for value: 3072
5767
/// </summary>
58-
AXIAL_WHITE_FULL = 3072
68+
AXIAL_WHITE = 3072
5969
}
6070

6171
}

0 commit comments

Comments
 (0)