From 4a0fe2919d7026a02036876ab9608fe687cce6fe Mon Sep 17 00:00:00 2001 From: Andres Vallecilla Date: Wed, 23 Oct 2024 02:04:38 -0500 Subject: [PATCH] fix: new typing --- .../client/model/message/mrtd/EMrtdData.java | 52 +++++++++++++++---- 1 file changed, 43 insertions(+), 9 deletions(-) diff --git a/src/main/java/io/twentysixty/sa/client/model/message/mrtd/EMrtdData.java b/src/main/java/io/twentysixty/sa/client/model/message/mrtd/EMrtdData.java index c92202b..fe3f172 100644 --- a/src/main/java/io/twentysixty/sa/client/model/message/mrtd/EMrtdData.java +++ b/src/main/java/io/twentysixty/sa/client/model/message/mrtd/EMrtdData.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import java.io.Serializable; +import java.util.List; import java.util.Map; import lombok.Getter; import lombok.Setter; @@ -27,7 +28,9 @@ public class EMrtdData implements Serializable { @JsonInclude(Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public static class EMrtdProcessedData { - private ProcessedData fields; + private EF_DG1 ef_dg1; + private EF_DG2 ef_dg2; + private EF_DG11 ef_dg11; } @Getter @@ -35,14 +38,45 @@ public static class EMrtdProcessedData { @ToString @JsonInclude(Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) - public static class ProcessedData { - private String mrzData; - private String firstName; + public static class EF_DG1 { + private String documentType; + private String documentNumber; + private String issuingState; + private String dateOfBirth; + private String dateOfExpiry; + private String sex; + private String nationality; private String lastName; - private String faceDataUrl; - private String fingerprintDataUrl; - private long birthDate; - private String placeOfBirth; - private long issuanceDate; + private String firstName; + private String nameOfHolder; + private String mrzOptionalData; + } + + @Getter + @Setter + @ToString + @JsonInclude(Include.NON_NULL) + @JsonIgnoreProperties(ignoreUnknown = true) + public static class EF_DG2 { + private List faceImages; + } + + @Getter + @Setter + @ToString + @JsonInclude(Include.NON_NULL) + @JsonIgnoreProperties(ignoreUnknown = true) + public static class EF_DG11 { + private String nameOfHolder; + private Long dateOfBirth; + private List otherNames; + private String personalNumber; + private List placeOfBirth; + private List permanentAddress; + private String telephone; + private String profession; + private String title; + private String personalSummary; + private String custodyInformation; } }