From 17e600c82ff2daa3bf91af0d6c8aef5a1724f2dd Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 20 Jun 2023 09:31:37 +0000 Subject: [PATCH 1/2] update-clients_GetRawRequestResponse --- .../webclient/model/DocumentImage.java | 13 +++++----- .../webclient/model/ImageData.java | 13 +++++----- .../webclient/model/ImagesFieldValue.java | 25 +++++++++---------- .../webclient/model/Scenario.java | 2 ++ 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/client/src/main/generated/com/regula/documentreader/webclient/model/DocumentImage.java b/client/src/main/generated/com/regula/documentreader/webclient/model/DocumentImage.java index c658e6e6..6418c441 100644 --- a/client/src/main/generated/com/regula/documentreader/webclient/model/DocumentImage.java +++ b/client/src/main/generated/com/regula/documentreader/webclient/model/DocumentImage.java @@ -13,7 +13,6 @@ package com.regula.documentreader.webclient.model; import com.google.gson.annotations.SerializedName; -import java.util.Arrays; import java.util.Objects; /** DocumentImage */ @@ -21,9 +20,9 @@ public class DocumentImage { public static final String SERIALIZED_NAME_IMAGE = "image"; @SerializedName(SERIALIZED_NAME_IMAGE) - private byte[] image; + private String image; - public DocumentImage withImage(byte[] image) { + public DocumentImage withImage(String image) { this.image = image; return this; } @@ -33,11 +32,11 @@ public DocumentImage withImage(byte[] image) { * * @return image */ - public byte[] getImage() { + public String getImage() { return image; } - public void setImage(byte[] image) { + public void setImage(String image) { this.image = image; } @@ -50,12 +49,12 @@ public boolean equals(java.lang.Object o) { return false; } DocumentImage documentImage = (DocumentImage) o; - return Arrays.equals(this.image, documentImage.image); + return Objects.equals(this.image, documentImage.image); } @Override public int hashCode() { - return Objects.hash(Arrays.hashCode(image)); + return Objects.hash(image); } @Override diff --git a/client/src/main/generated/com/regula/documentreader/webclient/model/ImageData.java b/client/src/main/generated/com/regula/documentreader/webclient/model/ImageData.java index 5cb1d175..fba1ee8f 100755 --- a/client/src/main/generated/com/regula/documentreader/webclient/model/ImageData.java +++ b/client/src/main/generated/com/regula/documentreader/webclient/model/ImageData.java @@ -13,7 +13,6 @@ package com.regula.documentreader.webclient.model; import com.google.gson.annotations.SerializedName; -import java.util.Arrays; import java.util.Objects; /** ImageData */ @@ -21,9 +20,9 @@ public class ImageData { public static final String SERIALIZED_NAME_IMAGE = "image"; @SerializedName(SERIALIZED_NAME_IMAGE) - private byte[] image; + private String image; - public ImageData withImage(byte[] image) { + public ImageData withImage(String image) { this.image = image; return this; } @@ -33,11 +32,11 @@ public ImageData withImage(byte[] image) { * * @return image */ - public byte[] getImage() { + public String getImage() { return image; } - public void setImage(byte[] image) { + public void setImage(String image) { this.image = image; } @@ -50,12 +49,12 @@ public boolean equals(java.lang.Object o) { return false; } ImageData imageData = (ImageData) o; - return Arrays.equals(this.image, imageData.image); + return Objects.equals(this.image, imageData.image); } @Override public int hashCode() { - return Objects.hash(Arrays.hashCode(image)); + return Objects.hash(image); } @Override diff --git a/client/src/main/generated/com/regula/documentreader/webclient/model/ImagesFieldValue.java b/client/src/main/generated/com/regula/documentreader/webclient/model/ImagesFieldValue.java index 9eed7325..33958086 100755 --- a/client/src/main/generated/com/regula/documentreader/webclient/model/ImagesFieldValue.java +++ b/client/src/main/generated/com/regula/documentreader/webclient/model/ImagesFieldValue.java @@ -13,7 +13,6 @@ package com.regula.documentreader.webclient.model; import com.google.gson.annotations.SerializedName; -import java.util.Arrays; import java.util.Objects; /** ImagesFieldValue */ @@ -26,12 +25,12 @@ public class ImagesFieldValue { public static final String SERIALIZED_NAME_VALUE = "value"; @SerializedName(SERIALIZED_NAME_VALUE) - private byte[] value; + private String value; public static final String SERIALIZED_NAME_ORIGINAL_VALUE = "originalValue"; @SerializedName(SERIALIZED_NAME_ORIGINAL_VALUE) - private byte[] originalValue; + private String originalValue; public static final String SERIALIZED_NAME_ORIGINAL_PAGE_INDEX = "originalPageIndex"; @@ -81,7 +80,7 @@ public void setSource(String source) { this.source = source; } - public ImagesFieldValue withValue(byte[] value) { + public ImagesFieldValue withValue(String value) { this.value = value; return this; } @@ -91,15 +90,15 @@ public ImagesFieldValue withValue(byte[] value) { * * @return value */ - public byte[] getValue() { + public String getValue() { return value; } - public void setValue(byte[] value) { + public void setValue(String value) { this.value = value; } - public ImagesFieldValue withOriginalValue(byte[] originalValue) { + public ImagesFieldValue withOriginalValue(String originalValue) { this.originalValue = originalValue; return this; } @@ -110,11 +109,11 @@ public ImagesFieldValue withOriginalValue(byte[] originalValue) { * @return originalValue */ @javax.annotation.Nullable - public byte[] getOriginalValue() { + public String getOriginalValue() { return originalValue; } - public void setOriginalValue(byte[] originalValue) { + public void setOriginalValue(String originalValue) { this.originalValue = originalValue; } @@ -239,8 +238,8 @@ public boolean equals(java.lang.Object o) { } ImagesFieldValue imagesFieldValue = (ImagesFieldValue) o; return Objects.equals(this.source, imagesFieldValue.source) - && Arrays.equals(this.value, imagesFieldValue.value) - && Arrays.equals(this.originalValue, imagesFieldValue.originalValue) + && Objects.equals(this.value, imagesFieldValue.value) + && Objects.equals(this.originalValue, imagesFieldValue.originalValue) && Objects.equals(this.originalPageIndex, imagesFieldValue.originalPageIndex) && Objects.equals(this.pageIndex, imagesFieldValue.pageIndex) && Objects.equals(this.lightIndex, imagesFieldValue.lightIndex) @@ -253,8 +252,8 @@ public boolean equals(java.lang.Object o) { public int hashCode() { return Objects.hash( source, - Arrays.hashCode(value), - Arrays.hashCode(originalValue), + value, + originalValue, originalPageIndex, pageIndex, lightIndex, diff --git a/client/src/main/generated/com/regula/documentreader/webclient/model/Scenario.java b/client/src/main/generated/com/regula/documentreader/webclient/model/Scenario.java index 365a4b49..cce53552 100755 --- a/client/src/main/generated/com/regula/documentreader/webclient/model/Scenario.java +++ b/client/src/main/generated/com/regula/documentreader/webclient/model/Scenario.java @@ -30,6 +30,8 @@ public class Scenario { public static final String MRZ_AND_LOCATE = "MrzAndLocate"; + public static final String BARCODE_AND_LOCATE = "BarcodeAndLocate"; + public static final String MRZ_OR_OCR = "MrzOrOcr"; public static final String MRZ_OR_BARCODE_OR_OCR = "MrzOrBarcodeOrOcr"; From 1b59035656f67ef4dd53cffcbe3b3ed73a78028b Mon Sep 17 00:00:00 2001 From: Danila Kislitsyn Date: Tue, 20 Jun 2023 17:14:19 +0300 Subject: [PATCH 2/2] add request and resposne raw json --- .DS_Store | Bin 6148 -> 6148 bytes .../webclient/model/ext/ImagesField.java | 13 +++++++++---- .../model/ext/ProcessRequestImage.java | 6 +++++- .../model/ext/RecognitionRequest.java | 6 ++++++ .../model/ext/RecognitionResponse.java | 10 ++++++++++ .../webclient/example/Main.java | 7 +++++-- 6 files changed, 35 insertions(+), 7 deletions(-) diff --git a/.DS_Store b/.DS_Store index 869476ff865bfe5919d1477273fb4a903ef6d715..268763ba3d4316dbed1ef91dfdf04ba5bd5bb0bc 100644 GIT binary patch delta 413 zcmZoMXffEJ$`V)U@RWgpfrUYjA)O(Up(Hoo#U&{xKM5$t5m9#HJmbG3j;Qh}c;yQ+ z41<&Na|?ia7#M0MOm1e`z{#y43FNRd=uJ*wmzZ3|Dm6Ke)ujFdNChj<-b{uRhE#^c zoOC3e43f^MvdHf0lPh2$x}3f#Nn-h6a!W*cg%-a)3@qWyoVFL2&|) zybroOvLkM9`H|^zc5)h<92=C`#U{@rs4#gon*y^!h}GnCY;rpLk5&K`fnCZDw4#C` dks+6%0BB(Y|VaB008N9YC-@2 delta 413 zcmZoMXffEJ$`Th~YsA37z`~%%kj{|FP?DSP;*yk;p9B=+=z4c0{NuzUj;Qh}c;yQ+ z41<&Na|?ia7#IRCOm1e`z{z#n4ai|<(3_mVE-|@^Rcdk`t4aL=kP23yy_pOt45 zIq66`8KnQC$|Ad~+2P_*{{>)oA?eS}N4N~T3KX}wGJxI4#*oaA19U^PEK-8vIist*@0G6 eFeEbM0`1LVNJVxnMAc*oc10#vh0WINCj|i5oobK( diff --git a/client/src/main/java/com/regula/documentreader/webclient/model/ext/ImagesField.java b/client/src/main/java/com/regula/documentreader/webclient/model/ext/ImagesField.java index 50cdf9b6..4676d9d3 100755 --- a/client/src/main/java/com/regula/documentreader/webclient/model/ext/ImagesField.java +++ b/client/src/main/java/com/regula/documentreader/webclient/model/ext/ImagesField.java @@ -2,6 +2,7 @@ import com.regula.documentreader.webclient.model.ImagesFieldValue; import com.regula.documentreader.webclient.model.Source; +import com.sun.org.apache.xerces.internal.impl.dv.util.Base64; import java.util.List; import javax.annotation.Nullable; @@ -9,13 +10,17 @@ public class ImagesField extends com.regula.documentreader.webclient.model.Image @Nullable public byte[] getValue(String source, boolean original) { + String result; for (ImagesFieldValue value : getValueList()) { if (value.getSource().equals(source)) { if (original) { - return value.getOriginalValue(); - } else { - return value.getValue(); + result = value.getOriginalValue(); } + else { + result = value.getValue(); + } + return Base64.decode(result); + } } return null; @@ -41,6 +46,6 @@ public byte[] getValue() { if (bestValue.getSource() == Source.VISUAL && value.getSource() == Source.RFID) bestValue = value; } - return bestValue.getValue(); + return Base64.decode(bestValue.getValue()); } } diff --git a/client/src/main/java/com/regula/documentreader/webclient/model/ext/ProcessRequestImage.java b/client/src/main/java/com/regula/documentreader/webclient/model/ext/ProcessRequestImage.java index 7aa524db..82be57d5 100755 --- a/client/src/main/java/com/regula/documentreader/webclient/model/ext/ProcessRequestImage.java +++ b/client/src/main/java/com/regula/documentreader/webclient/model/ext/ProcessRequestImage.java @@ -3,6 +3,8 @@ import com.regula.documentreader.webclient.ApiException; import com.regula.documentreader.webclient.model.ImageData; +import com.sun.org.apache.xerces.internal.impl.dv.util.Base64; + public class ProcessRequestImage extends com.regula.documentreader.webclient.model.ProcessRequestImage { @@ -12,7 +14,9 @@ public ProcessRequestImage(byte[] image) { if (image == null) { throw new ApiException("No image provided"); } - this.setImageData(new ImageData().withImage(image)); + + String base64Image = Base64.encode(image); + this.setImageData(new ImageData().withImage(base64Image)); } public ProcessRequestImage(byte[] image, Integer light) { diff --git a/client/src/main/java/com/regula/documentreader/webclient/model/ext/RecognitionRequest.java b/client/src/main/java/com/regula/documentreader/webclient/model/ext/RecognitionRequest.java index cd3d408b..275f02b7 100755 --- a/client/src/main/java/com/regula/documentreader/webclient/model/ext/RecognitionRequest.java +++ b/client/src/main/java/com/regula/documentreader/webclient/model/ext/RecognitionRequest.java @@ -1,5 +1,6 @@ package com.regula.documentreader.webclient.model.ext; +import com.google.gson.Gson; import com.regula.documentreader.webclient.model.ContainerList; import com.regula.documentreader.webclient.model.ProcessParams; import com.regula.documentreader.webclient.model.ProcessRequest; @@ -34,4 +35,9 @@ public RecognitionRequest(ProcessParams params, ContainerList containerList) { withContainerList(containerList); withSystemInfo(new ProcessSystemInfo()); } + + public String json() { + Gson gson = new Gson(); + return gson.toJson(this); + } } diff --git a/client/src/main/java/com/regula/documentreader/webclient/model/ext/RecognitionResponse.java b/client/src/main/java/com/regula/documentreader/webclient/model/ext/RecognitionResponse.java index ee948ccf..66762762 100755 --- a/client/src/main/java/com/regula/documentreader/webclient/model/ext/RecognitionResponse.java +++ b/client/src/main/java/com/regula/documentreader/webclient/model/ext/RecognitionResponse.java @@ -1,15 +1,21 @@ package com.regula.documentreader.webclient.model.ext; +import com.google.gson.Gson; import com.regula.documentreader.webclient.model.*; import com.regula.documentreader.webclient.model.ext.authenticity.Authenticity; + +import java.io.FileWriter; +import java.io.IOException; import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; public class RecognitionResponse { private final ProcessResponse originalResponse; + private final Gson gson; public RecognitionResponse(ProcessResponse originalResponse) { + this.gson = new Gson(); this.originalResponse = originalResponse; } @@ -17,6 +23,10 @@ public ProcessResponse getOriginalResponse() { return originalResponse; } + public String json() { + return this.gson.toJson(this.originalResponse); + } + @Nullable public Status status() { StatusResult result = resultByType(Result.STATUS); diff --git a/example/src/main/java/com/regula/documentreader/webclient/example/Main.java b/example/src/main/java/com/regula/documentreader/webclient/example/Main.java index 0e4191ff..42b03b72 100755 --- a/example/src/main/java/com/regula/documentreader/webclient/example/Main.java +++ b/example/src/main/java/com/regula/documentreader/webclient/example/Main.java @@ -28,8 +28,6 @@ public class Main { public static final String API_BASE_PATH = "API_BASE_PATH"; public static final String TEST_LICENSE = "TEST_LICENSE"; - - public static void main(String[] args) throws IOException, ApiException { var apiBaseUrl = System.getenv(API_BASE_PATH); @@ -65,6 +63,7 @@ public static void main(String[] args) throws IOException, ApiException { ); var api = new DocumentReaderApi(apiBaseUrl); + if (licenseFromEnv != null) api.setLicense(licenseFromEnv); if (licenseFromFile != null) api.setLicense(licenseFromFile); @@ -73,6 +72,10 @@ public static void main(String[] args) throws IOException, ApiException { System.out.format("Web API version %s%n", info.getVersion()); RecognitionResponse response = api.process(request); + + var requestJson = request.json(); + var responseJson = response.json(); + // to send raw request(ex encrypted one) with overriding processing params here use next api // RecognitionResponse response = api.process(request, requestParams);