advanced text field extraction

Author: hleb-albau

client/src/main/java/com/regula/documentreader/webclient/model/ext/Text.java

@@ -1,64 +1,85 @@
 package com.regula.documentreader.webclient.model.ext;
 
+import com.regula.documentreader.webclient.model.LCID;
+
+import java.util.Objects;
 import javax.annotation.Nullable;
 
 public class Text extends com.regula.documentreader.webclient.model.Text {
 
   @Nullable
-  public TextField getField(int fieldType, int lcid) {
+  public TextField getField(int fieldType) {
+    TextField result = null;
     for (TextField field : getFieldList()) {
-      if (field.getFieldType() == fieldType && field.getLcid() == lcid) {
+      if (field.getFieldType() == fieldType && field.getLcid() == LCID.LATIN) {
         return field;
       }
+      if (result == null && field.getFieldType() == fieldType) {
+        result = field;
+      }
     }
-    return null;
+    return result;
   }
 
   @Nullable
-  public TextField getField(int fieldType) {
-    return getField(fieldType, 0);
-  }
-
-  @Nullable
-  public String getFieldValue(int fieldType, int lcid) {
-    TextField field = getField(fieldType, lcid);
-    if (field != null) {
-      return field.getValue();
+  public TextField getField(int fieldType, int lcid) {
+    for (TextField field : getFieldList()) {
+      if (field.getFieldType() == fieldType && field.getLcid() == lcid) {
+        return field;
+      }
     }
     return null;
   }
 
   @Nullable
-  public String getFieldValue(int fieldType) {
-    return getFieldValue(fieldType, 0);
+  public TextField getField(String fieldName) {
+    TextField result = null;
+    for (TextField field : getFieldList()) {
+      if (Objects.equals(field.getFieldName(), fieldName) && field.getLcid() == LCID.LATIN) {
+        return field;
+      }
+      if (result == null && Objects.equals(field.getFieldName(), fieldName)) {
+        result = field;
+      }
+    }
+    return result;
   }
 
   @Nullable
-  public TextField getFieldByName(String fieldName, int lcid) {
+  public TextField getField(String fieldName, int lcid) {
     for (TextField field : getFieldList()) {
-      if (field.getFieldName().equals(fieldName) && field.getLcid() == lcid) {
+      if (Objects.equals(field.getFieldName(), fieldName) && field.getLcid() == lcid) {
         return field;
       }
     }
     return null;
   }
 
   @Nullable
-  public TextField getFieldByName(String fieldName) {
-    return getFieldByName(fieldName, 0);
+  public String getFieldValue(int fieldType) {
+    TextField field = getField(fieldType);
+    if (field != null) return field.getValue();
+    return null;
+  }
+
+  @Nullable
+  public String getFieldValue(int fieldType, int lcid) {
+    TextField field = getField(fieldType, lcid);
+    if (field != null) return field.getValue();
+    return null;
   }
 
   @Nullable
-  public String getFieldValueByName(String fieldName, int lcid) {
-    TextField field = getFieldByName(fieldName, lcid);
-    if (field != null) {
-      return field.getValue();
-    }
+  public String getFieldValue(String fieldName) {
+    TextField field = getField(fieldName);
+    if (field != null) return field.getValue();
     return null;
   }
 
   @Nullable
-  public String getFieldValueByName(String fieldName) {
-    return getFieldValueByName(fieldName, 0);
+  public String getFieldValue(String fieldName, int lcid) {
+    TextField field = getField(fieldName, lcid);
+    if (field != null) return field.getValue();
+    return null;
   }
 }

example/src/main/java/com/regula/documentreader/webclient/example/Main.java

@@ -55,7 +55,7 @@ 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");
+        var docNumberFieldByName = response.text().getField("Document Number");
 
         var docNumberVisual = docNumberField.getValue(Source.VISUAL);
         var docNumberMrz = docNumberField.getValue(Source.MRZ);