Skip to content

Commit 0a3fd82

Browse files
KirylKovaliovKirylKovaliov
authored
Merge pull request #184 from regulaforensics/fix/sp-18211
SP-18211 - update models
2 parents f84bbc1 + 26ac3d5 commit 0a3fd82

31 files changed

+757
-807
lines changed

‎client/src/main/generated/com/regula/documentreader/webclient/model/CertificateData.java‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class CertificateData {
4141

4242
@SerializedName(SERIALIZED_NAME_LENGTH)
4343
@javax.annotation.Nonnull
44-
private String length;
44+
private Integer length;
4545

4646
public CertificateData() {}
4747

@@ -64,7 +64,7 @@ public void setData(@javax.annotation.Nonnull String data) {
6464
this.data = data;
6565
}
6666

67-
public CertificateData length(@javax.annotation.Nonnull String length) {
67+
public CertificateData length(@javax.annotation.Nonnull Integer length) {
6868
this.length = length;
6969
return this;
7070
}
@@ -75,11 +75,11 @@ public CertificateData length(@javax.annotation.Nonnull String length) {
7575
* @return length
7676
*/
7777
@javax.annotation.Nonnull
78-
public String getLength() {
78+
public Integer getLength() {
7979
return length;
8080
}
8181

82-
public void setLength(@javax.annotation.Nonnull String length) {
82+
public void setLength(@javax.annotation.Nonnull Integer length) {
8383
this.length = length;
8484
}
8585

@@ -169,12 +169,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
169169
"Expected the field `Data` to be a primitive type in the JSON string but got `%s`",
170170
jsonObj.get("Data").toString()));
171171
}
172-
if (!jsonObj.get("Length").isJsonPrimitive()) {
173-
throw new IllegalArgumentException(
174-
String.format(
175-
"Expected the field `Length` to be a primitive type in the JSON string but got `%s`",
176-
jsonObj.get("Length").toString()));
177-
}
178172
}
179173

180174
public static class CustomTypeAdapterFactory implements TypeAdapterFactory {

‎client/src/main/generated/com/regula/documentreader/webclient/model/DocVisualExtendedField.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ private String toIndentedString(Object o) {
102102
static {
103103
// a set of all properties/fields (JSON key names)
104104
openapiFields = new HashSet<String>();
105-
openapiFields.add("FieldType");
106105
openapiFields.add("wFieldType");
107106
openapiFields.add("FieldName");
108107
openapiFields.add("StringsCount");
@@ -120,7 +119,6 @@ private String toIndentedString(Object o) {
120119
// a set of required properties/fields (JSON key names)
121120
openapiRequiredFields = new HashSet<String>();
122121
openapiRequiredFields.add("FieldRect");
123-
openapiRequiredFields.add("FieldType");
124122
openapiRequiredFields.add("wFieldType");
125123
openapiRequiredFields.add("FieldName");
126124
openapiRequiredFields.add("StringsCount");

‎client/src/main/generated/com/regula/documentreader/webclient/model/FiberItem.java‎

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,6 @@ public class FiberItem {
8888
@javax.annotation.Nonnull
8989
private List<Integer> colorValues;
9090

91-
public static final String SERIALIZED_NAME_ERROR_CODE = "ErrorCode";
92-
93-
@SerializedName(SERIALIZED_NAME_ERROR_CODE)
94-
@javax.annotation.Nullable
95-
private Integer errorCode;
96-
9791
public FiberItem() {}
9892

9993
public FiberItem rectCount(@javax.annotation.Nonnull Integer rectCount) {
@@ -307,25 +301,6 @@ public void setColorValues(@javax.annotation.Nonnull List<Integer> colorValues)
307301
this.colorValues = colorValues;
308302
}
309303

310-
public FiberItem errorCode(@javax.annotation.Nullable Integer errorCode) {
311-
this.errorCode = errorCode;
312-
return this;
313-
}
314-
315-
/**
316-
* Get errorCode
317-
*
318-
* @return errorCode
319-
*/
320-
@javax.annotation.Nullable
321-
public Integer getErrorCode() {
322-
return errorCode;
323-
}
324-
325-
public void setErrorCode(@javax.annotation.Nullable Integer errorCode) {
326-
this.errorCode = errorCode;
327-
}
328-
329304
@Override
330305
public boolean equals(Object o) {
331306
if (this == o) {
@@ -343,8 +318,7 @@ public boolean equals(Object o) {
343318
&& Objects.equals(this.width, fiberItem.width)
344319
&& Objects.equals(this.length, fiberItem.length)
345320
&& Objects.equals(this.area, fiberItem.area)
346-
&& Objects.equals(this.colorValues, fiberItem.colorValues)
347-
&& Objects.equals(this.errorCode, fiberItem.errorCode);
321+
&& Objects.equals(this.colorValues, fiberItem.colorValues);
348322
}
349323

350324
@Override
@@ -358,8 +332,7 @@ public int hashCode() {
358332
width,
359333
length,
360334
area,
361-
colorValues,
362-
errorCode);
335+
colorValues);
363336
}
364337

365338
@Override
@@ -375,7 +348,6 @@ public String toString() {
375348
sb.append(" length: ").append(toIndentedString(length)).append("\n");
376349
sb.append(" area: ").append(toIndentedString(area)).append("\n");
377350
sb.append(" colorValues: ").append(toIndentedString(colorValues)).append("\n");
378-
sb.append(" errorCode: ").append(toIndentedString(errorCode)).append("\n");
379351
sb.append("}");
380352
return sb.toString();
381353
}
@@ -405,7 +377,6 @@ private String toIndentedString(Object o) {
405377
openapiFields.add("Length");
406378
openapiFields.add("Area");
407379
openapiFields.add("ColorValues");
408-
openapiFields.add("ErrorCode");
409380

410381
// a set of required properties/fields (JSON key names)
411382
openapiRequiredFields = new HashSet<String>();

‎client/src/main/generated/com/regula/documentreader/webclient/model/FiberResult.java‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,6 @@ public class FiberResult extends AuthenticityCheckResultItem {
8787
@javax.annotation.Nonnull
8888
private List<Integer> colorValues;
8989

90-
public static final String SERIALIZED_NAME_ERROR_CODE = "ErrorCode";
91-
92-
@SerializedName(SERIALIZED_NAME_ERROR_CODE)
93-
@javax.annotation.Nullable
94-
private Integer errorCode;
95-
9690
public FiberResult() {}
9791

9892
public FiberResult rectCount(@javax.annotation.Nonnull Integer rectCount) {
@@ -306,25 +300,6 @@ public void setColorValues(@javax.annotation.Nonnull List<Integer> colorValues)
306300
this.colorValues = colorValues;
307301
}
308302

309-
public FiberResult errorCode(@javax.annotation.Nullable Integer errorCode) {
310-
this.errorCode = errorCode;
311-
return this;
312-
}
313-
314-
/**
315-
* Get errorCode
316-
*
317-
* @return errorCode
318-
*/
319-
@javax.annotation.Nullable
320-
public Integer getErrorCode() {
321-
return errorCode;
322-
}
323-
324-
public void setErrorCode(@javax.annotation.Nullable Integer errorCode) {
325-
this.errorCode = errorCode;
326-
}
327-
328303
@Override
329304
public boolean equals(Object o) {
330305
if (this == o) {
@@ -343,7 +318,6 @@ public boolean equals(Object o) {
343318
&& Objects.equals(this.length, fiberResult.length)
344319
&& Objects.equals(this.area, fiberResult.area)
345320
&& Objects.equals(this.colorValues, fiberResult.colorValues)
346-
&& Objects.equals(this.errorCode, fiberResult.errorCode)
347321
&& super.equals(o);
348322
}
349323

@@ -359,7 +333,6 @@ public int hashCode() {
359333
length,
360334
area,
361335
colorValues,
362-
errorCode,
363336
super.hashCode());
364337
}
365338

@@ -377,7 +350,6 @@ public String toString() {
377350
sb.append(" length: ").append(toIndentedString(length)).append("\n");
378351
sb.append(" area: ").append(toIndentedString(area)).append("\n");
379352
sb.append(" colorValues: ").append(toIndentedString(colorValues)).append("\n");
380-
sb.append(" errorCode: ").append(toIndentedString(errorCode)).append("\n");
381353
sb.append("}");
382354
return sb.toString();
383355
}
@@ -411,7 +383,6 @@ private String toIndentedString(Object o) {
411383
openapiFields.add("Length");
412384
openapiFields.add("Area");
413385
openapiFields.add("ColorValues");
414-
openapiFields.add("ErrorCode");
415386

416387
// a set of required properties/fields (JSON key names)
417388
openapiRequiredFields = new HashSet<String>();

‎client/src/main/generated/com/regula/documentreader/webclient/model/IdentItem.java‎

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,6 @@ public class IdentItem {
7373
@javax.annotation.Nullable
7474
private Integer elementID;
7575

76-
public static final String SERIALIZED_NAME_RESULT = "Result";
77-
78-
@SerializedName(SERIALIZED_NAME_RESULT)
79-
@javax.annotation.Nullable
80-
private Integer result;
81-
8276
public IdentItem() {}
8377

8478
public IdentItem elementType(@javax.annotation.Nonnull SecurityFeatureType elementType) {
@@ -214,25 +208,6 @@ public void setElementID(@javax.annotation.Nullable Integer elementID) {
214208
this.elementID = elementID;
215209
}
216210

217-
public IdentItem result(@javax.annotation.Nullable Integer result) {
218-
this.result = result;
219-
return this;
220-
}
221-
222-
/**
223-
* Get result
224-
*
225-
* @return result
226-
*/
227-
@javax.annotation.Nullable
228-
public Integer getResult() {
229-
return result;
230-
}
231-
232-
public void setResult(@javax.annotation.Nullable Integer result) {
233-
this.result = result;
234-
}
235-
236211
@Override
237212
public boolean equals(Object o) {
238213
if (this == o) {
@@ -248,14 +223,12 @@ public boolean equals(Object o) {
248223
&& Objects.equals(this.image, identItem.image)
249224
&& Objects.equals(this.etalonImage, identItem.etalonImage)
250225
&& Objects.equals(this.areaList, identItem.areaList)
251-
&& Objects.equals(this.elementID, identItem.elementID)
252-
&& Objects.equals(this.result, identItem.result);
226+
&& Objects.equals(this.elementID, identItem.elementID);
253227
}
254228

255229
@Override
256230
public int hashCode() {
257-
return Objects.hash(
258-
elementType, lightIndex, area, image, etalonImage, areaList, elementID, result);
231+
return Objects.hash(elementType, lightIndex, area, image, etalonImage, areaList, elementID);
259232
}
260233

261234
@Override
@@ -269,7 +242,6 @@ public String toString() {
269242
sb.append(" etalonImage: ").append(toIndentedString(etalonImage)).append("\n");
270243
sb.append(" areaList: ").append(toIndentedString(areaList)).append("\n");
271244
sb.append(" elementID: ").append(toIndentedString(elementID)).append("\n");
272-
sb.append(" result: ").append(toIndentedString(result)).append("\n");
273245
sb.append("}");
274246
return sb.toString();
275247
}
@@ -297,7 +269,6 @@ private String toIndentedString(Object o) {
297269
openapiFields.add("EtalonImage");
298270
openapiFields.add("AreaList");
299271
openapiFields.add("ElementID");
300-
openapiFields.add("Result");
301272

302273
// a set of required properties/fields (JSON key names)
303274
openapiRequiredFields = new HashSet<String>();

‎client/src/main/generated/com/regula/documentreader/webclient/model/IdentResult.java‎

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,6 @@ public class IdentResult extends AuthenticityCheckResultItem {
7373
@javax.annotation.Nullable
7474
private Integer elementID;
7575

76-
public static final String SERIALIZED_NAME_RESULT = "Result";
77-
78-
@SerializedName(SERIALIZED_NAME_RESULT)
79-
@javax.annotation.Nullable
80-
private Integer result;
81-
8276
public IdentResult() {}
8377

8478
public IdentResult elementType(@javax.annotation.Nonnull SecurityFeatureType elementType) {
@@ -214,25 +208,6 @@ public void setElementID(@javax.annotation.Nullable Integer elementID) {
214208
this.elementID = elementID;
215209
}
216210

217-
public IdentResult result(@javax.annotation.Nullable Integer result) {
218-
this.result = result;
219-
return this;
220-
}
221-
222-
/**
223-
* Get result
224-
*
225-
* @return result
226-
*/
227-
@javax.annotation.Nullable
228-
public Integer getResult() {
229-
return result;
230-
}
231-
232-
public void setResult(@javax.annotation.Nullable Integer result) {
233-
this.result = result;
234-
}
235-
236211
@Override
237212
public boolean equals(Object o) {
238213
if (this == o) {
@@ -249,22 +224,13 @@ public boolean equals(Object o) {
249224
&& Objects.equals(this.etalonImage, identResult.etalonImage)
250225
&& Objects.equals(this.areaList, identResult.areaList)
251226
&& Objects.equals(this.elementID, identResult.elementID)
252-
&& Objects.equals(this.result, identResult.result)
253227
&& super.equals(o);
254228
}
255229

256230
@Override
257231
public int hashCode() {
258232
return Objects.hash(
259-
elementType,
260-
lightIndex,
261-
area,
262-
image,
263-
etalonImage,
264-
areaList,
265-
elementID,
266-
result,
267-
super.hashCode());
233+
elementType, lightIndex, area, image, etalonImage, areaList, elementID, super.hashCode());
268234
}
269235

270236
@Override
@@ -279,7 +245,6 @@ public String toString() {
279245
sb.append(" etalonImage: ").append(toIndentedString(etalonImage)).append("\n");
280246
sb.append(" areaList: ").append(toIndentedString(areaList)).append("\n");
281247
sb.append(" elementID: ").append(toIndentedString(elementID)).append("\n");
282-
sb.append(" result: ").append(toIndentedString(result)).append("\n");
283248
sb.append("}");
284249
return sb.toString();
285250
}
@@ -311,7 +276,6 @@ private String toIndentedString(Object o) {
311276
openapiFields.add("EtalonImage");
312277
openapiFields.add("AreaList");
313278
openapiFields.add("ElementID");
314-
openapiFields.add("Result");
315279

316280
// a set of required properties/fields (JSON key names)
317281
openapiRequiredFields = new HashSet<String>();

‎client/src/main/generated/com/regula/documentreader/webclient/model/Light.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ public enum Light {
2626
/** No Light */
2727
OFF(0),
2828

29+
/** Upper/lower lighters of white light scheme */
30+
WHITE_TOP(2),
31+
32+
/** Side lighters of white light scheme */
33+
WHITE_SIDE(4),
34+
2935
/** White */
3036
WHITE(6),
3137

@@ -35,8 +41,8 @@ public enum Light {
3541
/** Ultraviolet */
3642
UV(128),
3743

38-
/** Right and left lighters of white coaxial light scheme */
39-
AXIAL_WHITE_FULL(3072);
44+
/** White coaxial */
45+
AXIAL_WHITE(3072);
4046

4147
private Integer value;
4248

0 commit comments

Comments
 (0)