Skip to content

Commit 4cae04e

Browse files
GubinAlexanderGubinAlexander
authored
Merge pull request #101 from regulaforensics/2f129802
update
2 parents ad8f864 + 302ee42 commit 4cae04e

File tree

6 files changed

+238
-67
lines changed

6 files changed

+238
-67
lines changed

‎client/.openapi-generator/FILES‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ src/main/generated/com/regula/documentreader/webclient/model/ImagesField.java
6464
src/main/generated/com/regula/documentreader/webclient/model/ImagesFieldValue.java
6565
src/main/generated/com/regula/documentreader/webclient/model/ImagesResult.java
6666
src/main/generated/com/regula/documentreader/webclient/model/InData.java
67-
src/main/generated/com/regula/documentreader/webclient/model/InDataRfidSession.java
6867
src/main/generated/com/regula/documentreader/webclient/model/InDataVideo.java
6968
src/main/generated/com/regula/documentreader/webclient/model/InlineResponse200.java
7069
src/main/generated/com/regula/documentreader/webclient/model/InlineResponse2001.java
@@ -107,6 +106,7 @@ src/main/generated/com/regula/documentreader/webclient/model/TextField.java
107106
src/main/generated/com/regula/documentreader/webclient/model/TextFieldValue.java
108107
src/main/generated/com/regula/documentreader/webclient/model/TextResult.java
109108
src/main/generated/com/regula/documentreader/webclient/model/TransactionImage.java
109+
src/main/generated/com/regula/documentreader/webclient/model/TransactionImagesFieldValue.java
110110
src/main/generated/com/regula/documentreader/webclient/model/TransactionInfo.java
111111
src/main/generated/com/regula/documentreader/webclient/model/TransactionProcessGetResponse.java
112112
src/main/generated/com/regula/documentreader/webclient/model/TransactionProcessRequest.java

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

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,6 @@ public okhttp3.Call apiV2TransactionTransactionIdGetAsync(
326326
* Build call for apiV2TransactionTransactionIdProcessPost
327327
*
328328
* @param transactionId Transaction id (required)
329-
* @param X_CLIENT_KEY (required)
330329
* @param transactionProcessRequest (required)
331330
* @param _callback Callback for upload/download progress
332331
* @return Call to execute
@@ -341,7 +340,6 @@ public okhttp3.Call apiV2TransactionTransactionIdGetAsync(
341340
*/
342341
public okhttp3.Call apiV2TransactionTransactionIdProcessPostCall(
343342
Integer transactionId,
344-
String X_CLIENT_KEY,
345343
TransactionProcessRequest transactionProcessRequest,
346344
final ApiCallback _callback)
347345
throws ApiException {
@@ -357,10 +355,6 @@ public okhttp3.Call apiV2TransactionTransactionIdProcessPostCall(
357355
List<Pair> localVarQueryParams = new ArrayList<Pair>();
358356
List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
359357
Map<String, String> localVarHeaderParams = new HashMap<String, String>();
360-
if (X_CLIENT_KEY != null) {
361-
localVarHeaderParams.put("X-CLIENT-KEY", localVarApiClient.parameterToString(X_CLIENT_KEY));
362-
}
363-
364358
Map<String, String> localVarCookieParams = new HashMap<String, String>();
365359
Map<String, Object> localVarFormParams = new HashMap<String, Object>();
366360
final String[] localVarAccepts = {"application/json"};
@@ -391,7 +385,6 @@ public okhttp3.Call apiV2TransactionTransactionIdProcessPostCall(
391385
@SuppressWarnings("rawtypes")
392386
private okhttp3.Call apiV2TransactionTransactionIdProcessPostValidateBeforeCall(
393387
Integer transactionId,
394-
String X_CLIENT_KEY,
395388
TransactionProcessRequest transactionProcessRequest,
396389
final ApiCallback _callback)
397390
throws ApiException {
@@ -402,12 +395,6 @@ private okhttp3.Call apiV2TransactionTransactionIdProcessPostValidateBeforeCall(
402395
"Missing the required parameter 'transactionId' when calling apiV2TransactionTransactionIdProcessPost(Async)");
403396
}
404397

405-
// verify the required parameter 'X_CLIENT_KEY' is set
406-
if (X_CLIENT_KEY == null) {
407-
throw new ApiException(
408-
"Missing the required parameter 'X_CLIENT_KEY' when calling apiV2TransactionTransactionIdProcessPost(Async)");
409-
}
410-
411398
// verify the required parameter 'transactionProcessRequest' is set
412399
if (transactionProcessRequest == null) {
413400
throw new ApiException(
@@ -416,15 +403,14 @@ private okhttp3.Call apiV2TransactionTransactionIdProcessPostValidateBeforeCall(
416403

417404
okhttp3.Call localVarCall =
418405
apiV2TransactionTransactionIdProcessPostCall(
419-
transactionId, X_CLIENT_KEY, transactionProcessRequest, _callback);
406+
transactionId, transactionProcessRequest, _callback);
420407
return localVarCall;
421408
}
422409

423410
/**
424411
* Preprocess
425412
*
426413
* @param transactionId Transaction id (required)
427-
* @param X_CLIENT_KEY (required)
428414
* @param transactionProcessRequest (required)
429415
* @return InlineResponse200
430416
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the
@@ -438,21 +424,18 @@ private okhttp3.Call apiV2TransactionTransactionIdProcessPostValidateBeforeCall(
438424
* </table>
439425
*/
440426
public InlineResponse200 apiV2TransactionTransactionIdProcessPost(
441-
Integer transactionId,
442-
String X_CLIENT_KEY,
443-
TransactionProcessRequest transactionProcessRequest)
427+
Integer transactionId, TransactionProcessRequest transactionProcessRequest)
444428
throws ApiException {
445429
ApiResponse<InlineResponse200> localVarResp =
446430
apiV2TransactionTransactionIdProcessPostWithHttpInfo(
447-
transactionId, X_CLIENT_KEY, transactionProcessRequest);
431+
transactionId, transactionProcessRequest);
448432
return localVarResp.getData();
449433
}
450434

451435
/**
452436
* Preprocess
453437
*
454438
* @param transactionId Transaction id (required)
455-
* @param X_CLIENT_KEY (required)
456439
* @param transactionProcessRequest (required)
457440
* @return ApiResponse&lt;InlineResponse200&gt;
458441
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the
@@ -466,13 +449,11 @@ public InlineResponse200 apiV2TransactionTransactionIdProcessPost(
466449
* </table>
467450
*/
468451
public ApiResponse<InlineResponse200> apiV2TransactionTransactionIdProcessPostWithHttpInfo(
469-
Integer transactionId,
470-
String X_CLIENT_KEY,
471-
TransactionProcessRequest transactionProcessRequest)
452+
Integer transactionId, TransactionProcessRequest transactionProcessRequest)
472453
throws ApiException {
473454
okhttp3.Call localVarCall =
474455
apiV2TransactionTransactionIdProcessPostValidateBeforeCall(
475-
transactionId, X_CLIENT_KEY, transactionProcessRequest, null);
456+
transactionId, transactionProcessRequest, null);
476457
Type localVarReturnType = new TypeToken<InlineResponse200>() {}.getType();
477458
return localVarApiClient.execute(localVarCall, localVarReturnType);
478459
}
@@ -481,7 +462,6 @@ public ApiResponse<InlineResponse200> apiV2TransactionTransactionIdProcessPostWi
481462
* Preprocess (asynchronously)
482463
*
483464
* @param transactionId Transaction id (required)
484-
* @param X_CLIENT_KEY (required)
485465
* @param transactionProcessRequest (required)
486466
* @param _callback The callback to be executed when the API call finishes
487467
* @return The request call
@@ -496,14 +476,13 @@ public ApiResponse<InlineResponse200> apiV2TransactionTransactionIdProcessPostWi
496476
*/
497477
public okhttp3.Call apiV2TransactionTransactionIdProcessPostAsync(
498478
Integer transactionId,
499-
String X_CLIENT_KEY,
500479
TransactionProcessRequest transactionProcessRequest,
501480
final ApiCallback<InlineResponse200> _callback)
502481
throws ApiException {
503482

504483
okhttp3.Call localVarCall =
505484
apiV2TransactionTransactionIdProcessPostValidateBeforeCall(
506-
transactionId, X_CLIENT_KEY, transactionProcessRequest, _callback);
485+
transactionId, transactionProcessRequest, _callback);
507486
Type localVarReturnType = new TypeToken<InlineResponse200>() {}.getType();
508487
localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback);
509488
return localVarCall;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,6 @@ public class ImageQualityCheckType {
3838
/** Signals if the portrait is present */
3939
public static final int Portrait = 7;
4040

41-
public static final int Brightness = 8;
41+
/** Signals if the document image is bright enough */
42+
public static final int Brightness = 9;
4243
}

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

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919

2020
/** InData */
2121
public class InData {
22-
public static final String SERIALIZED_NAME_RFID_SESSION = "rfidSession";
23-
24-
@SerializedName(SERIALIZED_NAME_RFID_SESSION)
25-
private InDataRfidSession rfidSession;
26-
2722
public static final String SERIALIZED_NAME_VIDEO = "video";
2823

2924
@SerializedName(SERIALIZED_NAME_VIDEO)
@@ -32,26 +27,7 @@ public class InData {
3227
public static final String SERIALIZED_NAME_IMAGES = "images";
3328

3429
@SerializedName(SERIALIZED_NAME_IMAGES)
35-
private List<ImageTransactionData> images = null;
36-
37-
public InData withRfidSession(InDataRfidSession rfidSession) {
38-
this.rfidSession = rfidSession;
39-
return this;
40-
}
41-
42-
/**
43-
* Get rfidSession
44-
*
45-
* @return rfidSession
46-
*/
47-
@javax.annotation.Nullable
48-
public InDataRfidSession getRfidSession() {
49-
return rfidSession;
50-
}
51-
52-
public void setRfidSession(InDataRfidSession rfidSession) {
53-
this.rfidSession = rfidSession;
54-
}
30+
private List<TransactionImagesFieldValue> images = null;
5531

5632
public InData withVideo(InDataVideo video) {
5733
this.video = video;
@@ -72,14 +48,14 @@ public void setVideo(InDataVideo video) {
7248
this.video = video;
7349
}
7450

75-
public InData withImages(List<ImageTransactionData> images) {
51+
public InData withImages(List<TransactionImagesFieldValue> images) {
7652
this.images = images;
7753
return this;
7854
}
7955

80-
public InData addImagesItem(ImageTransactionData imagesItem) {
56+
public InData addImagesItem(TransactionImagesFieldValue imagesItem) {
8157
if (this.images == null) {
82-
this.images = new ArrayList<ImageTransactionData>();
58+
this.images = new ArrayList<TransactionImagesFieldValue>();
8359
}
8460
this.images.add(imagesItem);
8561
return this;
@@ -91,11 +67,11 @@ public InData addImagesItem(ImageTransactionData imagesItem) {
9167
* @return images
9268
*/
9369
@javax.annotation.Nullable
94-
public List<ImageTransactionData> getImages() {
70+
public List<TransactionImagesFieldValue> getImages() {
9571
return images;
9672
}
9773

98-
public void setImages(List<ImageTransactionData> images) {
74+
public void setImages(List<TransactionImagesFieldValue> images) {
9975
this.images = images;
10076
}
10177

@@ -108,21 +84,18 @@ public boolean equals(java.lang.Object o) {
10884
return false;
10985
}
11086
InData inData = (InData) o;
111-
return Objects.equals(this.rfidSession, inData.rfidSession)
112-
&& Objects.equals(this.video, inData.video)
113-
&& Objects.equals(this.images, inData.images);
87+
return Objects.equals(this.video, inData.video) && Objects.equals(this.images, inData.images);
11488
}
11589

11690
@Override
11791
public int hashCode() {
118-
return Objects.hash(rfidSession, video, images);
92+
return Objects.hash(video, images);
11993
}
12094

12195
@Override
12296
public String toString() {
12397
StringBuilder sb = new StringBuilder();
12498
sb.append("class InData {\n");
125-
sb.append(" rfidSession: ").append(toIndentedString(rfidSession)).append("\n");
12699
sb.append(" video: ").append(toIndentedString(video)).append("\n");
127100
sb.append(" images: ").append(toIndentedString(images)).append("\n");
128101
sb.append("}");

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

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
package com.regula.documentreader.webclient.model;
1414

1515
import com.google.gson.annotations.SerializedName;
16+
import java.util.ArrayList;
17+
import java.util.List;
1618
import java.util.Objects;
1719

1820
/** OutData */
@@ -22,13 +24,18 @@ public class OutData {
2224
@SerializedName(SERIALIZED_NAME_URL)
2325
private String url;
2426

27+
public static final String SERIALIZED_NAME_IMAGES = "images";
28+
29+
@SerializedName(SERIALIZED_NAME_IMAGES)
30+
private List<TransactionImagesFieldValue> images = null;
31+
2532
public OutData withUrl(String url) {
2633
this.url = url;
2734
return this;
2835
}
2936

3037
/**
31-
* Image url
38+
* Response url
3239
*
3340
* @return url
3441
*/
@@ -41,6 +48,33 @@ public void setUrl(String url) {
4148
this.url = url;
4249
}
4350

51+
public OutData withImages(List<TransactionImagesFieldValue> images) {
52+
this.images = images;
53+
return this;
54+
}
55+
56+
public OutData addImagesItem(TransactionImagesFieldValue imagesItem) {
57+
if (this.images == null) {
58+
this.images = new ArrayList<TransactionImagesFieldValue>();
59+
}
60+
this.images.add(imagesItem);
61+
return this;
62+
}
63+
64+
/**
65+
* Get images
66+
*
67+
* @return images
68+
*/
69+
@javax.annotation.Nullable
70+
public List<TransactionImagesFieldValue> getImages() {
71+
return images;
72+
}
73+
74+
public void setImages(List<TransactionImagesFieldValue> images) {
75+
this.images = images;
76+
}
77+
4478
@Override
4579
public boolean equals(java.lang.Object o) {
4680
if (this == o) {
@@ -50,19 +84,20 @@ public boolean equals(java.lang.Object o) {
5084
return false;
5185
}
5286
OutData outData = (OutData) o;
53-
return Objects.equals(this.url, outData.url);
87+
return Objects.equals(this.url, outData.url) && Objects.equals(this.images, outData.images);
5488
}
5589

5690
@Override
5791
public int hashCode() {
58-
return Objects.hash(url);
92+
return Objects.hash(url, images);
5993
}
6094

6195
@Override
6296
public String toString() {
6397
StringBuilder sb = new StringBuilder();
6498
sb.append("class OutData {\n");
6599
sb.append(" url: ").append(toIndentedString(url)).append("\n");
100+
sb.append(" images: ").append(toIndentedString(images)).append("\n");
66101
sb.append("}");
67102
return sb.toString();
68103
}

0 commit comments

Comments
 (0)