From ad2df83033bcd546fe3f8b777df97b03619bcc8d Mon Sep 17 00:00:00 2001 From: Aleksey Shundrik Date: Thu, 5 Nov 2020 20:32:37 +0300 Subject: [PATCH 1/2] rl-476/field-name FieldName: - add text getters for field property: by type and by name --- .../webclient/model/ext/Text.java | 27 ++++++++++++++++++- .../webclient/example/Main.java | 6 +++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/client/src/main/java/com/regula/documentreader/webclient/model/ext/Text.java b/client/src/main/java/com/regula/documentreader/webclient/model/ext/Text.java index 664f6b02..35675133 100755 --- a/client/src/main/java/com/regula/documentreader/webclient/model/ext/Text.java +++ b/client/src/main/java/com/regula/documentreader/webclient/model/ext/Text.java @@ -30,10 +30,35 @@ public String getFieldValue(int fieldType, int lcid) { @Nullable public String getFieldValue(int fieldType) { - TextField field = getField(fieldType); + return getFieldValue(fieldType, 0); + } + + @Nullable + public TextField getFieldByName(String fieldName, int lcid) { + for (TextField field : getFieldList()) { + if (field.getFieldName().equals(fieldName) && field.getLcid() == lcid) { + return field; + } + } + return null; + } + + @Nullable + public TextField getFieldByName(String fieldName) { + return getFieldByName(fieldName, 0); + } + + @Nullable + public String getFieldValueByName(String fieldName, int lcid) { + TextField field = getFieldByName(fieldName, lcid); if (field != null) { return field.getValue(); } return null; } + + @Nullable + public String getFieldValueByName(String fieldName) { + return getFieldValueByName(fieldName, 0); + } } 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 79ace0ef..79c89a96 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 @@ -55,6 +55,12 @@ public static void main(String[] args) throws IOException, ApiException { var docOpticalTextStatus = status.getDetailsOptical().getText(); var docNumberField = response.text().getField(DOCUMENT_NUMBER); + var docNumberFieldByName = response.text().getFieldByName("Document Number"); + + if (docNumberField != docNumberFieldByName) { + throw new RuntimeException("getField() and getFieldByName() must return the same result"); + } + var docNumberVisual = docNumberField.getValue(Source.VISUAL); var docNumberMrz = docNumberField.getValue(Source.MRZ); var docNumberVisualValidity = docNumberField.sourceValidity(Source.VISUAL); From 925899d6dd3c87b32e29c2f21d6c421541e1599f Mon Sep 17 00:00:00 2001 From: Hleb Albau Date: Fri, 6 Nov 2020 15:44:38 +0300 Subject: [PATCH 2/2] Update Main.java --- .../com/regula/documentreader/webclient/example/Main.java | 4 ---- 1 file changed, 4 deletions(-) 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 79c89a96..1f5847dc 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 @@ -57,10 +57,6 @@ public static void main(String[] args) throws IOException, ApiException { var docNumberField = response.text().getField(DOCUMENT_NUMBER); var docNumberFieldByName = response.text().getFieldByName("Document Number"); - if (docNumberField != docNumberFieldByName) { - throw new RuntimeException("getField() and getFieldByName() must return the same result"); - } - var docNumberVisual = docNumberField.getValue(Source.VISUAL); var docNumberMrz = docNumberField.getValue(Source.MRZ); var docNumberVisualValidity = docNumberField.sourceValidity(Source.VISUAL);