cleanup authenticity, add measure system

Author: hleb-albau

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

@@ -0,0 +1,22 @@
+/*
+ * Regula Document Reader Web API
+ * Documents recognition as easy as reading two bytes.  # Clients: * [JavaScript](https://github.com/regulaforensics/DocumentReader-web-js-client) client for the browser and node.js based on axios * [Java](https://github.com/regulaforensics/DocumentReader-web-java-client) client compatible with jvm and android * [Python](https://github.com/regulaforensics/DocumentReader-web-python-client) 3.5+ client * [C#](https://github.com/regulaforensics/DocumentReader-web-csharp-client) client for .NET & .NET Core
+ *
+ * The version of the OpenAPI document: 5.5.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+package com.regula.documentreader.webclient.model;
+
+public class MeasureSystem {
+
+  /** Metric system of measurement, where things are measured in meters and grams */
+  public static final int METRIC = 0;
+
+  /** Imperial System of Measurement, where things are measured in feet, inches and pounds */
+  public static final int IMPERIAL = 1;
+}

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

@@ -20,7 +20,7 @@ public class OriginalSymbol {
   public static final String SERIALIZED_NAME_CODE = "code";
 
   @SerializedName(SERIALIZED_NAME_CODE)
-  private Integer code;
+  private Long code;
 
   public static final String SERIALIZED_NAME_PROBABILITY = "probability";
 
@@ -32,7 +32,7 @@ public class OriginalSymbol {
   @SerializedName(SERIALIZED_NAME_RECT)
   private RectangleCoordinates rect;
 
-  public OriginalSymbol withCode(Integer code) {
+  public OriginalSymbol withCode(Long code) {
     this.code = code;
     return this;
   }
@@ -43,11 +43,11 @@ public OriginalSymbol withCode(Integer code) {
    * @return code
    */
   @javax.annotation.Nullable
-  public Integer getCode() {
+  public Long getCode() {
     return code;
   }
 
-  public void setCode(Integer code) {
+  public void setCode(Long code) {
     this.code = code;
   }
 

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

@@ -46,6 +46,11 @@ public class ProcessParams {
   @SerializedName(SERIALIZED_NAME_DATE_FORMAT)
   private String dateFormat;
 
+  public static final String SERIALIZED_NAME_MEASURE_SYSTEM = "measureSystem";
+
+  @SerializedName(SERIALIZED_NAME_MEASURE_SYSTEM)
+  private Integer measureSystem;
+
   public static final String SERIALIZED_NAME_IMAGE_DPI_OUT_MAX = "imageDpiOutMax";
 
   @SerializedName(SERIALIZED_NAME_IMAGE_DPI_OUT_MAX)
@@ -220,6 +225,25 @@ public void setDateFormat(String dateFormat) {
     this.dateFormat = dateFormat;
   }
 
+  public ProcessParams withMeasureSystem(Integer measureSystem) {
+    this.measureSystem = measureSystem;
+    return this;
+  }
+
+  /**
+   * Get measureSystem
+   *
+   * @return measureSystem
+   */
+  @javax.annotation.Nullable
+  public Integer getMeasureSystem() {
+    return measureSystem;
+  }
+
+  public void setMeasureSystem(Integer measureSystem) {
+    this.measureSystem = measureSystem;
+  }
+
   public ProcessParams withImageDpiOutMax(Integer imageDpiOutMax) {
     this.imageDpiOutMax = imageDpiOutMax;
     return this;
@@ -463,6 +487,7 @@ public boolean equals(java.lang.Object o) {
         && Objects.equals(this.doublePageSpread, processParams.doublePageSpread)
         && Objects.equals(this.fieldTypesFilter, processParams.fieldTypesFilter)
         && Objects.equals(this.dateFormat, processParams.dateFormat)
+        && Objects.equals(this.measureSystem, processParams.measureSystem)
         && Objects.equals(this.imageDpiOutMax, processParams.imageDpiOutMax)
         && Objects.equals(this.alreadyCropped, processParams.alreadyCropped)
         && Objects.equals(this.customParams, processParams.customParams)
@@ -485,6 +510,7 @@ public int hashCode() {
         doublePageSpread,
         fieldTypesFilter,
         dateFormat,
+        measureSystem,
         imageDpiOutMax,
         alreadyCropped,
         customParams,
@@ -507,6 +533,7 @@ public String toString() {
     sb.append("    doublePageSpread: ").append(toIndentedString(doublePageSpread)).append("\n");
     sb.append("    fieldTypesFilter: ").append(toIndentedString(fieldTypesFilter)).append("\n");
     sb.append("    dateFormat: ").append(toIndentedString(dateFormat)).append("\n");
+    sb.append("    measureSystem: ").append(toIndentedString(measureSystem)).append("\n");
     sb.append("    imageDpiOutMax: ").append(toIndentedString(imageDpiOutMax)).append("\n");
     sb.append("    alreadyCropped: ").append(toIndentedString(alreadyCropped)).append("\n");
     sb.append("    customParams: ").append(toIndentedString(customParams)).append("\n");

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

@@ -59,6 +59,7 @@ public ProcessResponse withChipPage(Integer chipPage) {
    *
    * @return chipPage
    */
+  @javax.annotation.Nullable
   public Integer getChipPage() {
     return chipPage;
   }

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

@@ -53,7 +53,12 @@ public Images images() {
 
   @Nullable
   public Authenticity authenticity() {
-    AuthenticityResult result = resultByType(Result.AUTHENTICITY);
+    return authenticity(0);
+  }
+
+  @Nullable
+  public Authenticity authenticity(int page_idx) {
+    AuthenticityResult result = getResult(Result.AUTHENTICITY, page_idx);
     if (result != null) {
       return result.getAuthenticityCheckList();
     }
@@ -69,6 +74,15 @@ public <R> R resultByType(int type) {
     return null;
   }
 
+  public <R> R getResult(int type, int page_idx) {
+    for (ResultItem item : originalResponse.getContainerList().getList()) {
+      if (item.getResultType() == type && item.getPageIdx() == page_idx) {
+        return (R) item;
+      }
+    }
+    return null;
+  }
+
   public <R> List<R> resultsByType(int type) {
     List<R> results = new ArrayList<>();
     for (ResultItem item : originalResponse.getContainerList().getList()) {

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

@@ -1,144 +1,88 @@
 package com.regula.documentreader.webclient.model.ext.authenticity;
 
 import com.regula.documentreader.webclient.model.AuthenticityCheckResult;
+import com.regula.documentreader.webclient.model.AuthenticityResultType;
 import javax.annotation.Nullable;
 
 public class Authenticity extends com.regula.documentreader.webclient.model.AuthenticityCheckList {
 
   @Nullable
-  public SecurityFeature uvLuminescence() {
-    int uvLuminescenceType = 1;
-    return this.securityFeatureOrNull(uvLuminescenceType);
+  public SecurityFeatureChecks uvLuminescenceChecks() {
+    return this.securityFeatureOrNull(AuthenticityResultType.UV_LUMINESCENCE);
   }
 
   @Nullable
-  public SecurityFeature irB900() {
-    int irB900Type = 2;
-    return this.securityFeatureOrNull(irB900Type);
+  public SecurityFeatureChecks irB900Checks() {
+    return this.securityFeatureOrNull(AuthenticityResultType.IR_B900);
   }
 
   @Nullable
-  public Ident imagePattern() {
-    int imagePatternType = 4;
-    return this.identOrNull(imagePatternType);
+  public IdentChecks imagePatternChecks() {
+    return this.identOrNull(AuthenticityResultType.IMAGE_PATTERN);
   }
 
   @Nullable
-  public SecurityFeature axialProtection() {
-    int axialProtectionType = 8;
-    return this.securityFeatureOrNull(axialProtectionType);
+  public SecurityFeatureChecks axialProtectionChecks() {
+    return this.securityFeatureOrNull(AuthenticityResultType.AXIAL_PROTECTION);
   }
 
   @Nullable
-  public Fiber uvFiber() {
-    int uvFiberType = 16;
-    return this.fiberOrNull(uvFiberType);
+  public FiberChecks uvFiberChecks() {
+    return this.fiberOrNull(AuthenticityResultType.UV_FIBERS);
   }
 
   @Nullable
-  public Ident irVisibility() {
-    int irVisibilityType = 32;
-    return this.identOrNull(irVisibilityType);
+  public IdentChecks irVisibilityChecks() {
+    return this.identOrNull(AuthenticityResultType.IR_VISIBILITY);
   }
 
   @Nullable
-  public OCRSecurityText ocrSecurityText() {
-    int ocrSecurityTextType = 64;
-    return this.ocrSecurityTextOrNull(ocrSecurityTextType);
+  public OCRSecurityTextChecks ocrSecurityTextChecks() {
+    return this.ocrSecurityTextOrNull(AuthenticityResultType.OCR_SECURITY_TEXT);
   }
 
   @Nullable
-  public ImageIdent ipi() {
-    int ipiType = 128;
-    return this.imageIdentOrNull(ipiType);
+  public ImageIdentChecks ipiChecks() {
+    return this.imageIdentOrNull(AuthenticityResultType.IPI);
   }
 
   @Nullable
-  public ImageIdent irImage() {
-    int irImageType = 256;
-    return this.imageIdentOrNull(irImageType);
+  public SecurityFeatureChecks embedImageChecks() {
+    return this.securityFeatureOrNull(AuthenticityResultType.PHOTO_EMBED_TYPE);
   }
 
   @Nullable
-  public SecurityFeature embedImage() {
-    int embedImageType = 512;
-    return this.securityFeatureOrNull(embedImageType);
+  public SecurityFeatureChecks hologramsChecks() {
+    return this.securityFeatureOrNull(AuthenticityResultType.HOLOGRAMS);
   }
 
   @Nullable
-  public Ident ovi() {
-    int oviType = 1024;
-    return this.identOrNull(oviType);
+  public SecurityFeatureChecks imageAreaChecks() {
+    return this.securityFeatureOrNull(AuthenticityResultType.PHOTO_AREA);
   }
 
   @Nullable
-  public Ident irLuminescence() {
-    int irLuminescenceType = 2048;
-    return this.identOrNull(irLuminescenceType);
+  public IdentChecks portraitComparisonChecks() {
+    return this.identOrNull(AuthenticityResultType.PORTRAIT_COMPARISON);
   }
 
   @Nullable
-  public SecurityFeature holograms() {
-    int hologramsType = 4096;
-    return this.securityFeatureOrNull(hologramsType);
+  public SecurityFeatureChecks barcodeFormatCheckChecks() {
+    return this.securityFeatureOrNull(AuthenticityResultType.BARCODE_FORMAT_CHECK);
   }
 
   @Nullable
-  public SecurityFeature imageArea() {
-    int imageAreaType = 8192;
-    return this.securityFeatureOrNull(imageAreaType);
+  public IdentChecks kinegramChecks() {
+    return this.identOrNull(AuthenticityResultType.KINEGRAM);
   }
 
   @Nullable
-  public Fiber uvBackground() {
-    int uvBackgroundType = 16384;
-    return this.fiberOrNull(uvBackgroundType);
+  public IdentChecks letterScreenChecks() {
+    return this.identOrNull(AuthenticityResultType.LETTER_SCREEN);
   }
 
   @Nullable
-  public Ident portraitComparison() {
-    int portraitComparisonType = 32768;
-    return this.identOrNull(portraitComparisonType);
-  }
-
-  @Nullable
-  public SecurityFeature barcodeFormatCheck() {
-    int barcodeFormatCheckType = 65536;
-    return this.securityFeatureOrNull(barcodeFormatCheckType);
-  }
-
-  @Nullable
-  public Ident kinegram() {
-    int kinegramType = 131072;
-    return this.identOrNull(kinegramType);
-  }
-
-  @Nullable
-  public Ident letterScreen() {
-    int letterScreenType = 262144;
-    return this.identOrNull(letterScreenType);
-  }
-
-  @Nullable
-  public Ident hologramsDetection() {
-    int hologramsDetectionType = 524288;
-    return this.identOrNull(hologramsDetectionType);
-  }
-
-  @Nullable
-  public Ident fingerprintComparison() {
-    int fingerprintComparisonType = 1048576;
-    return this.identOrNull(fingerprintComparisonType);
-  }
-
-  @Nullable
-  public SecurityFeature cancellingDocumentDetector() {
-    int cancellingDocumentDetectorType = 2097152;
-    return this.securityFeatureOrNull(cancellingDocumentDetectorType);
-  }
-
-  @Nullable
-  public AuthenticityCheckResult resultByType(int type) {
+  private AuthenticityCheckResult resultByType(int type) {
     for (AuthenticityCheckResult checkResult : this.getList()) {
       if (checkResult.getType() == type) {
         return checkResult;
@@ -147,42 +91,42 @@ public AuthenticityCheckResult resultByType(int type) {
     return null;
   }
 
-  private Fiber fiberOrNull(int type) {
+  private FiberChecks fiberOrNull(int type) {
     AuthenticityCheckResult result = this.resultByType(type);
     if (result != null) {
-      return new Fiber(result);
+      return new FiberChecks(result);
     }
     return null;
   }
 
-  private Ident identOrNull(int type) {
+  private IdentChecks identOrNull(int type) {
     AuthenticityCheckResult result = this.resultByType(type);
     if (result != null) {
-      return new Ident(result);
+      return new IdentChecks(result);
     }
     return null;
   }
 
-  private ImageIdent imageIdentOrNull(int type) {
+  private ImageIdentChecks imageIdentOrNull(int type) {
     AuthenticityCheckResult result = this.resultByType(type);
     if (result != null) {
-      return new ImageIdent(result);
+      return new ImageIdentChecks(result);
     }
     return null;
   }
 
-  private OCRSecurityText ocrSecurityTextOrNull(int type) {
+  private OCRSecurityTextChecks ocrSecurityTextOrNull(int type) {
     AuthenticityCheckResult result = this.resultByType(type);
     if (result != null) {
-      return new OCRSecurityText(result);
+      return new OCRSecurityTextChecks(result);
     }
     return null;
   }
 
-  private SecurityFeature securityFeatureOrNull(int type) {
+  private SecurityFeatureChecks securityFeatureOrNull(int type) {
     AuthenticityCheckResult result = this.resultByType(type);
     if (result != null) {
-      return new SecurityFeature(result);
+      return new SecurityFeatureChecks(result);
     }
     return null;
   }

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

@@ -15,6 +15,7 @@ public AuthenticityCheckResult payload() {
   }
 
   public List<T> items() {
+    //noinspection unchecked
     return (List<T>) this.authenticityCheckResult.getList();
   }
 }