Skip to content

SP-24472 - fix example, update models #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KirylKovaliov merged 1 commit into from
Jun 24, 2025
Merged

SP-24472 - fix example, update models #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 18 additions & 21 deletions client/src/main/generated/com/regula/documentreader/webclient/model/FDSIDList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ public class FDSIDList {
public static final String SERIALIZED_NAME_COUNT = "Count";

@SerializedName(SERIALIZED_NAME_COUNT)
@javax.annotation.Nonnull
@javax.annotation.Nullable
private BigDecimal count;

public static final String SERIALIZED_NAME_LIST = "List";

@SerializedName(SERIALIZED_NAME_LIST)
@javax.annotation.Nonnull
@javax.annotation.Nullable
private List<Integer> list;

public static final String SERIALIZED_NAME_D_TYPE = "dType";
Expand Down Expand Up @@ -79,7 +79,7 @@ public class FDSIDList {
public static final String SERIALIZED_NAME_D_YEAR = "dYear";

@SerializedName(SERIALIZED_NAME_D_YEAR)
@javax.annotation.Nonnull
@javax.annotation.Nullable
private String dYear;

public static final String SERIALIZED_NAME_D_COUNTRY_NAME = "dCountryName";
Expand Down Expand Up @@ -127,7 +127,7 @@ public void setIcAOCode(@javax.annotation.Nonnull String icAOCode) {
this.icAOCode = icAOCode;
}

public FDSIDList count(@javax.annotation.Nonnull BigDecimal count) {
public FDSIDList count(@javax.annotation.Nullable BigDecimal count) {
this.count = count;
return this;
}
Expand All @@ -137,16 +137,16 @@ public FDSIDList count(@javax.annotation.Nonnull BigDecimal count) {
*
* @return count
*/
@javax.annotation.Nonnull
@javax.annotation.Nullable
public BigDecimal getCount() {
return count;
}

public void setCount(@javax.annotation.Nonnull BigDecimal count) {
public void setCount(@javax.annotation.Nullable BigDecimal count) {
this.count = count;
}

public FDSIDList list(@javax.annotation.Nonnull List<Integer> list) {
public FDSIDList list(@javax.annotation.Nullable List<Integer> list) {
this.list = list;
return this;
}
Expand All @@ -164,12 +164,12 @@ public FDSIDList addListItem(Integer listItem) {
*
* @return list
*/
@javax.annotation.Nonnull
@javax.annotation.Nullable
public List<Integer> getList() {
return list;
}

public void setList(@javax.annotation.Nonnull List<Integer> list) {
public void setList(@javax.annotation.Nullable List<Integer> list) {
this.list = list;
}

Expand Down Expand Up @@ -249,7 +249,7 @@ public void setdDescription(@javax.annotation.Nullable String dDescription) {
this.dDescription = dDescription;
}

public FDSIDList dYear(@javax.annotation.Nonnull String dYear) {
public FDSIDList dYear(@javax.annotation.Nullable String dYear) {
this.dYear = dYear;
return this;
}
Expand All @@ -259,12 +259,12 @@ public FDSIDList dYear(@javax.annotation.Nonnull String dYear) {
*
* @return dYear
*/
@javax.annotation.Nonnull
@javax.annotation.Nullable
public String getdYear() {
return dYear;
}

public void setdYear(@javax.annotation.Nonnull String dYear) {
public void setdYear(@javax.annotation.Nullable String dYear) {
this.dYear = dYear;
}

Expand Down Expand Up @@ -436,12 +436,9 @@ private String toIndentedString(Object o) {
// a set of required properties/fields (JSON key names)
openapiRequiredFields = new HashSet<String>();
openapiRequiredFields.add("ICAOCode");
openapiRequiredFields.add("Count");
openapiRequiredFields.add("List");
openapiRequiredFields.add("dType");
openapiRequiredFields.add("dFormat");
openapiRequiredFields.add("dMRZ");
openapiRequiredFields.add("dYear");
openapiRequiredFields.add("dCountryName");
openapiRequiredFields.add("isDeprecated");
}
Expand Down Expand Up @@ -479,11 +476,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
"Expected the field `ICAOCode` to be a primitive type in the JSON string but got `%s`",
jsonObj.get("ICAOCode").toString()));
}
// ensure the required json array is present
if (jsonObj.get("List") == null) {
throw new IllegalArgumentException(
"Expected the field `linkedContent` to be an array in the JSON string but got `null`");
} else if (!jsonObj.get("List").isJsonArray()) {
// ensure the optional json data is an array if present
if (jsonObj.get("List") != null
&& !jsonObj.get("List").isJsonNull()
&& !jsonObj.get("List").isJsonArray()) {
throw new IllegalArgumentException(
String.format(
"Expected the field `List` to be an array in the JSON string but got `%s`",
Expand All @@ -500,7 +496,8 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
"Expected the field `dDescription` to be a primitive type in the JSON string but got `%s`",
jsonObj.get("dDescription").toString()));
}
if (!jsonObj.get("dYear").isJsonPrimitive()) {
if ((jsonObj.get("dYear") != null && !jsonObj.get("dYear").isJsonNull())
&& !jsonObj.get("dYear").isJsonPrimitive()) {
throw new IllegalArgumentException(
String.format(
"Expected the field `dYear` to be a primitive type in the JSON string but got `%s`",
Expand Down
22 changes: 13 additions & 9 deletions example/src/main/java/com/regula/documentreader/webclient/example/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,21 @@ public static void main(String[] args) throws IOException, ApiException {

var documentImage = response.images().getField(GraphicFieldType.DOCUMENT_FRONT).getValue();
var portraitField = response.images().getField(GraphicFieldType.PORTRAIT);
var portraitFromVisual = portraitField.getValue(Source.VISUAL);
var portraitFromVisual = portraitField != null ? portraitField.getValue(Source.VISUAL) : null;

try {
saveFile("document-image.jpg", documentImage);
} catch (IOException e) {
throw new RuntimeException(e);
if (documentImage != null) {
try {
saveFile("document-image.jpg", documentImage);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
try {
saveFile("portrait.jpg", portraitFromVisual);
} catch (IOException e) {
throw new RuntimeException(e);
if (portraitFromVisual != null) {
try {
saveFile("portrait.jpg", portraitFromVisual);
} catch (IOException e) {
throw new RuntimeException(e);
}
}

// how to get low lvl individual results
Expand Down