Merge pull request #205 from regulaforensics/fix/41669

41669 - Rollback fieldType type

Author: KirylKovaliov

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

@@ -45,7 +45,7 @@ public class ImagesField {
 
   @SerializedName(SERIALIZED_NAME_FIELD_TYPE)
   @javax.annotation.Nonnull
-  private Integer fieldType;
+  private GraphicFieldType fieldType;
 
   public static final String SERIALIZED_NAME_VALUE_LIST = "valueList";
 
@@ -80,22 +80,22 @@ public void setFieldName(@javax.annotation.Nonnull String fieldName) {
     this.fieldName = fieldName;
   }
 
-  public ImagesField fieldType(@javax.annotation.Nonnull Integer fieldType) {
+  public ImagesField fieldType(@javax.annotation.Nonnull GraphicFieldType fieldType) {
     this.fieldType = fieldType;
     return this;
   }
 
   /**
-   * The value can be from GraphicFieldType or TextFieldType enum.
+   * Get fieldType
    *
    * @return fieldType
    */
   @javax.annotation.Nonnull
-  public Integer getFieldType() {
+  public GraphicFieldType getFieldType() {
     return fieldType;
   }
 
-  public void setFieldType(@javax.annotation.Nonnull Integer fieldType) {
+  public void setFieldType(@javax.annotation.Nonnull GraphicFieldType fieldType) {
     this.fieldType = fieldType;
   }
 
@@ -238,6 +238,8 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
               "Expected the field `fieldName` to be a primitive type in the JSON string but got `%s`",
               jsonObj.get("fieldName").toString()));
     }
+    // validate the required field `fieldType`
+    GraphicFieldType.validateJsonElement(jsonObj.get("fieldType"));
     // ensure the json data is an array
     if (!jsonObj.get("valueList").isJsonArray()) {
       throw new IllegalArgumentException(

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

@@ -47,7 +47,7 @@ public Images withFieldList(List<ImagesField> fieldList) {
   @Nullable
   public ImagesField getField(GraphicFieldType fieldType) {
     for (com.regula.documentreader.webclient.model.ImagesField field : getFieldList()) {
-      if (field.getFieldType().equals(fieldType.getValue())) {
+      if (field.getFieldType() == fieldType) {
         return new ImagesField(field);
       }
     }
@@ -57,7 +57,7 @@ public ImagesField getField(GraphicFieldType fieldType) {
   public List<ImagesField> getFields(int fieldType) {
     List<ImagesField> fields = new ArrayList<>();
     for (com.regula.documentreader.webclient.model.ImagesField field : getFieldList()) {
-      if (field.getFieldType() == fieldType) {
+      if (field.getFieldType().getValue() == fieldType) {
         fields.add(new ImagesField(field));
       }
     }

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

@@ -20,7 +20,7 @@ public ImagesField withFieldName(String fieldName) {
   }
 
   public ImagesField withFieldType(GraphicFieldType fieldType) {
-    this.setFieldType(fieldType.getValue());
+    this.setFieldType(fieldType);
     return this;
   }