Skip to content

Commit 424ef72

Browse files
KirylKovaliovKirylKovaliov
authored
Merge pull request #189 from regulaforensics/stable
Stable -> Develop
2 parents f67ead2 + 30350ba commit 424ef72

File tree

10 files changed

+115
-703
lines changed

10 files changed

+115
-703
lines changed

‎client/.openapi-generator/FILES

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ src/main/generated/com/regula/documentreader/webclient/model/MRZTestQualityItem.
134134
src/main/generated/com/regula/documentreader/webclient/model/MRZTestQualityResult.java
135135
src/main/generated/com/regula/documentreader/webclient/model/MeasureSystem.java
136136
src/main/generated/com/regula/documentreader/webclient/model/MrzDetectModeEnum.java
137-
src/main/generated/com/regula/documentreader/webclient/model/MrzPosition.java
138137
src/main/generated/com/regula/documentreader/webclient/model/MrzPositionItem.java
139138
src/main/generated/com/regula/documentreader/webclient/model/OCRSecurityTextItem.java
140139
src/main/generated/com/regula/documentreader/webclient/model/OCRSecurityTextResult.java

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,8 +1189,6 @@ private static Class getClassByDiscriminator(
11891189
gsonBuilder.registerTypeAdapterFactory(
11901190
new com.regula.documentreader.webclient.model.MRZTestQualityResult
11911191
.CustomTypeAdapterFactory());
1192-
gsonBuilder.registerTypeAdapterFactory(
1193-
new com.regula.documentreader.webclient.model.MrzPosition.CustomTypeAdapterFactory());
11941192
gsonBuilder.registerTypeAdapterFactory(
11951193
new com.regula.documentreader.webclient.model.MrzPositionItem.CustomTypeAdapterFactory());
11961194
gsonBuilder.registerTypeAdapterFactory(

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

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

29-
/** Upper/lower lighters of white light scheme */
29+
/** Upper/lower white */
3030
WHITE_TOP(2),
3131

32-
/** Side lighters of white light scheme */
32+
/** Side white */
3333
WHITE_SIDE(4),
3434

3535
/** White */
@@ -41,7 +41,7 @@ public enum Light {
4141
/** Ultraviolet */
4242
UV(128),
4343

44-
/** White coaxial */
44+
/** Axial white */
4545
AXIAL_WHITE(3072);
4646

4747
private Integer value;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ public class MRZPositionResult extends ResultItem {
3535

3636
@SerializedName(SERIALIZED_NAME_MRZ_POSITION)
3737
@javax.annotation.Nonnull
38-
private MrzPosition mrzPosition;
38+
private DocumentPosition mrzPosition;
3939

4040
public MRZPositionResult() {}
4141

42-
public MRZPositionResult mrzPosition(@javax.annotation.Nonnull MrzPosition mrzPosition) {
42+
public MRZPositionResult mrzPosition(@javax.annotation.Nonnull DocumentPosition mrzPosition) {
4343
this.mrzPosition = mrzPosition;
4444
return this;
4545
}
@@ -50,11 +50,11 @@ public MRZPositionResult mrzPosition(@javax.annotation.Nonnull MrzPosition mrzPo
5050
* @return mrzPosition
5151
*/
5252
@javax.annotation.Nonnull
53-
public MrzPosition getMrzPosition() {
53+
public DocumentPosition getMrzPosition() {
5454
return mrzPosition;
5555
}
5656

57-
public void setMrzPosition(@javax.annotation.Nonnull MrzPosition mrzPosition) {
57+
public void setMrzPosition(@javax.annotation.Nonnull DocumentPosition mrzPosition) {
5858
this.mrzPosition = mrzPosition;
5959
}
6060

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

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ public class MRZTestQuality {
3838

3939
@SerializedName(SERIALIZED_NAME_C_H_E_C_K_S_U_M_S)
4040
@javax.annotation.Nonnull
41-
private Integer CHECK_SUMS;
41+
private CheckResult CHECK_SUMS;
4242

4343
public static final String SERIALIZED_NAME_C_O_N_T_R_A_S_T_P_R_I_N_T = "CONTRAST_PRINT";
4444

4545
@SerializedName(SERIALIZED_NAME_C_O_N_T_R_A_S_T_P_R_I_N_T)
4646
@javax.annotation.Nonnull
47-
private Integer CONTRAST_PRINT;
47+
private CheckResult CONTRAST_PRINT;
4848

4949
public static final String SERIALIZED_NAME_D_O_C_F_O_R_M_A_T = "DOC_FORMAT";
5050

@@ -62,19 +62,19 @@ public class MRZTestQuality {
6262

6363
@SerializedName(SERIALIZED_NAME_P_R_I_N_T_P_O_S_I_T_I_O_N)
6464
@javax.annotation.Nonnull
65-
private Integer PRINT_POSITION;
65+
private CheckResult PRINT_POSITION;
6666

6767
public static final String SERIALIZED_NAME_S_T_A_I_N_M_R_Z = "STAIN_MRZ";
6868

6969
@SerializedName(SERIALIZED_NAME_S_T_A_I_N_M_R_Z)
7070
@javax.annotation.Nonnull
71-
private Integer STAIN_MRZ;
71+
private CheckResult STAIN_MRZ;
7272

7373
public static final String SERIALIZED_NAME_S_Y_M_B_O_L_S_P_A_R_A_M = "SYMBOLS_PARAM";
7474

7575
@SerializedName(SERIALIZED_NAME_S_Y_M_B_O_L_S_P_A_R_A_M)
7676
@javax.annotation.Nonnull
77-
private Integer SYMBOLS_PARAM;
77+
private CheckResult SYMBOLS_PARAM;
7878

7979
public static final String SERIALIZED_NAME_STR_COUNT = "StrCount";
8080

@@ -92,11 +92,11 @@ public class MRZTestQuality {
9292

9393
@SerializedName(SERIALIZED_NAME_T_E_X_T_U_A_L_F_I_L_L_I_N_G)
9494
@javax.annotation.Nonnull
95-
private Integer TEXTUAL_FILLING;
95+
private CheckResult TEXTUAL_FILLING;
9696

9797
public MRZTestQuality() {}
9898

99-
public MRZTestQuality CHECK_SUMS(@javax.annotation.Nonnull Integer CHECK_SUMS) {
99+
public MRZTestQuality CHECK_SUMS(@javax.annotation.Nonnull CheckResult CHECK_SUMS) {
100100
this.CHECK_SUMS = CHECK_SUMS;
101101
return this;
102102
}
@@ -107,15 +107,15 @@ public MRZTestQuality CHECK_SUMS(@javax.annotation.Nonnull Integer CHECK_SUMS) {
107107
* @return CHECK_SUMS
108108
*/
109109
@javax.annotation.Nonnull
110-
public Integer getCHECKSUMS() {
110+
public CheckResult getCHECKSUMS() {
111111
return CHECK_SUMS;
112112
}
113113

114-
public void setCHECKSUMS(@javax.annotation.Nonnull Integer CHECK_SUMS) {
114+
public void setCHECKSUMS(@javax.annotation.Nonnull CheckResult CHECK_SUMS) {
115115
this.CHECK_SUMS = CHECK_SUMS;
116116
}
117117

118-
public MRZTestQuality CONTRAST_PRINT(@javax.annotation.Nonnull Integer CONTRAST_PRINT) {
118+
public MRZTestQuality CONTRAST_PRINT(@javax.annotation.Nonnull CheckResult CONTRAST_PRINT) {
119119
this.CONTRAST_PRINT = CONTRAST_PRINT;
120120
return this;
121121
}
@@ -126,11 +126,11 @@ public MRZTestQuality CONTRAST_PRINT(@javax.annotation.Nonnull Integer CONTRAST_
126126
* @return CONTRAST_PRINT
127127
*/
128128
@javax.annotation.Nonnull
129-
public Integer getCONTRASTPRINT() {
129+
public CheckResult getCONTRASTPRINT() {
130130
return CONTRAST_PRINT;
131131
}
132132

133-
public void setCONTRASTPRINT(@javax.annotation.Nonnull Integer CONTRAST_PRINT) {
133+
public void setCONTRASTPRINT(@javax.annotation.Nonnull CheckResult CONTRAST_PRINT) {
134134
this.CONTRAST_PRINT = CONTRAST_PRINT;
135135
}
136136

@@ -172,7 +172,7 @@ public void setMRZFORMAT(@javax.annotation.Nonnull Integer MRZ_FORMAT) {
172172
this.MRZ_FORMAT = MRZ_FORMAT;
173173
}
174174

175-
public MRZTestQuality PRINT_POSITION(@javax.annotation.Nonnull Integer PRINT_POSITION) {
175+
public MRZTestQuality PRINT_POSITION(@javax.annotation.Nonnull CheckResult PRINT_POSITION) {
176176
this.PRINT_POSITION = PRINT_POSITION;
177177
return this;
178178
}
@@ -183,15 +183,15 @@ public MRZTestQuality PRINT_POSITION(@javax.annotation.Nonnull Integer PRINT_POS
183183
* @return PRINT_POSITION
184184
*/
185185
@javax.annotation.Nonnull
186-
public Integer getPRINTPOSITION() {
186+
public CheckResult getPRINTPOSITION() {
187187
return PRINT_POSITION;
188188
}
189189

190-
public void setPRINTPOSITION(@javax.annotation.Nonnull Integer PRINT_POSITION) {
190+
public void setPRINTPOSITION(@javax.annotation.Nonnull CheckResult PRINT_POSITION) {
191191
this.PRINT_POSITION = PRINT_POSITION;
192192
}
193193

194-
public MRZTestQuality STAIN_MRZ(@javax.annotation.Nonnull Integer STAIN_MRZ) {
194+
public MRZTestQuality STAIN_MRZ(@javax.annotation.Nonnull CheckResult STAIN_MRZ) {
195195
this.STAIN_MRZ = STAIN_MRZ;
196196
return this;
197197
}
@@ -202,15 +202,15 @@ public MRZTestQuality STAIN_MRZ(@javax.annotation.Nonnull Integer STAIN_MRZ) {
202202
* @return STAIN_MRZ
203203
*/
204204
@javax.annotation.Nonnull
205-
public Integer getSTAINMRZ() {
205+
public CheckResult getSTAINMRZ() {
206206
return STAIN_MRZ;
207207
}
208208

209-
public void setSTAINMRZ(@javax.annotation.Nonnull Integer STAIN_MRZ) {
209+
public void setSTAINMRZ(@javax.annotation.Nonnull CheckResult STAIN_MRZ) {
210210
this.STAIN_MRZ = STAIN_MRZ;
211211
}
212212

213-
public MRZTestQuality SYMBOLS_PARAM(@javax.annotation.Nonnull Integer SYMBOLS_PARAM) {
213+
public MRZTestQuality SYMBOLS_PARAM(@javax.annotation.Nonnull CheckResult SYMBOLS_PARAM) {
214214
this.SYMBOLS_PARAM = SYMBOLS_PARAM;
215215
return this;
216216
}
@@ -221,11 +221,11 @@ public MRZTestQuality SYMBOLS_PARAM(@javax.annotation.Nonnull Integer SYMBOLS_PA
221221
* @return SYMBOLS_PARAM
222222
*/
223223
@javax.annotation.Nonnull
224-
public Integer getSYMBOLSPARAM() {
224+
public CheckResult getSYMBOLSPARAM() {
225225
return SYMBOLS_PARAM;
226226
}
227227

228-
public void setSYMBOLSPARAM(@javax.annotation.Nonnull Integer SYMBOLS_PARAM) {
228+
public void setSYMBOLSPARAM(@javax.annotation.Nonnull CheckResult SYMBOLS_PARAM) {
229229
this.SYMBOLS_PARAM = SYMBOLS_PARAM;
230230
}
231231

@@ -275,7 +275,7 @@ public void setStrings(@javax.annotation.Nonnull List<StringItem> strings) {
275275
this.strings = strings;
276276
}
277277

278-
public MRZTestQuality TEXTUAL_FILLING(@javax.annotation.Nonnull Integer TEXTUAL_FILLING) {
278+
public MRZTestQuality TEXTUAL_FILLING(@javax.annotation.Nonnull CheckResult TEXTUAL_FILLING) {
279279
this.TEXTUAL_FILLING = TEXTUAL_FILLING;
280280
return this;
281281
}
@@ -286,11 +286,11 @@ public MRZTestQuality TEXTUAL_FILLING(@javax.annotation.Nonnull Integer TEXTUAL_
286286
* @return TEXTUAL_FILLING
287287
*/
288288
@javax.annotation.Nonnull
289-
public Integer getTEXTUALFILLING() {
289+
public CheckResult getTEXTUALFILLING() {
290290
return TEXTUAL_FILLING;
291291
}
292292

293-
public void setTEXTUALFILLING(@javax.annotation.Nonnull Integer TEXTUAL_FILLING) {
293+
public void setTEXTUALFILLING(@javax.annotation.Nonnull CheckResult TEXTUAL_FILLING) {
294294
this.TEXTUAL_FILLING = TEXTUAL_FILLING;
295295
}
296296

@@ -416,6 +416,16 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
416416
}
417417
}
418418
JsonObject jsonObj = jsonElement.getAsJsonObject();
419+
// validate the required field `CHECK_SUMS`
420+
CheckResult.validateJsonElement(jsonObj.get("CHECK_SUMS"));
421+
// validate the required field `CONTRAST_PRINT`
422+
CheckResult.validateJsonElement(jsonObj.get("CONTRAST_PRINT"));
423+
// validate the required field `PRINT_POSITION`
424+
CheckResult.validateJsonElement(jsonObj.get("PRINT_POSITION"));
425+
// validate the required field `STAIN_MRZ`
426+
CheckResult.validateJsonElement(jsonObj.get("STAIN_MRZ"));
427+
// validate the required field `SYMBOLS_PARAM`
428+
CheckResult.validateJsonElement(jsonObj.get("SYMBOLS_PARAM"));
419429
// ensure the json data is an array
420430
if (!jsonObj.get("Strings").isJsonArray()) {
421431
throw new IllegalArgumentException(
@@ -430,6 +440,8 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
430440
StringItem.validateJsonElement(jsonArraystrings.get(i));
431441
}
432442
;
443+
// validate the required field `TEXTUAL_FILLING`
444+
CheckResult.validateJsonElement(jsonObj.get("TEXTUAL_FILLING"));
433445
}
434446

435447
public static class CustomTypeAdapterFactory implements TypeAdapterFactory {

0 commit comments

Comments
 (0)