Skip to content

SP-21986 - update DeviceInfo #182

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 3, 2025
Merged

SP-21986 - update DeviceInfo #182

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
1 change: 1 addition & 0 deletions client/.openapi-generator/FILES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ src/main/generated/com/regula/documentreader/webclient/model/DataModule.java
src/main/generated/com/regula/documentreader/webclient/model/DetailsOptical.java
src/main/generated/com/regula/documentreader/webclient/model/DetailsRFID.java
src/main/generated/com/regula/documentreader/webclient/model/DeviceInfo.java
src/main/generated/com/regula/documentreader/webclient/model/DeviceInfoDocumentsDatabase.java
src/main/generated/com/regula/documentreader/webclient/model/DocBarCodeInfo.java
src/main/generated/com/regula/documentreader/webclient/model/DocBarCodeInfoFieldsList.java
src/main/generated/com/regula/documentreader/webclient/model/DocBarCodeInfoItem.java
Expand Down
3 changes: 3 additions & 0 deletions client/src/main/generated/com/regula/documentreader/webclient/JSON.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,6 +1016,9 @@ private static Class getClassByDiscriminator(
new com.regula.documentreader.webclient.model.DetailsRFID.CustomTypeAdapterFactory());
gsonBuilder.registerTypeAdapterFactory(
new com.regula.documentreader.webclient.model.DeviceInfo.CustomTypeAdapterFactory());
gsonBuilder.registerTypeAdapterFactory(
new com.regula.documentreader.webclient.model.DeviceInfoDocumentsDatabase
.CustomTypeAdapterFactory());
gsonBuilder.registerTypeAdapterFactory(
new com.regula.documentreader.webclient.model.DocBarCodeInfo.CustomTypeAdapterFactory());
gsonBuilder.registerTypeAdapterFactory(
Expand Down
194 changes: 183 additions & 11 deletions client/src/main/generated/com/regula/documentreader/webclient/model/DeviceInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@
import com.regula.documentreader.webclient.JSON;
import java.io.IOException;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;

/** DeviceInfo */
Expand Down Expand Up @@ -56,6 +60,12 @@ public class DeviceInfo {
@javax.annotation.Nullable
private String licenseSerial;

public static final String SERIALIZED_NAME_LICENSE_TYPE = "license-type";

@SerializedName(SERIALIZED_NAME_LICENSE_TYPE)
@javax.annotation.Nullable
private String licenseType;

public static final String SERIALIZED_NAME_VALID_UNTIL = "valid-until";

@SerializedName(SERIALIZED_NAME_VALID_UNTIL)
Expand All @@ -66,7 +76,25 @@ public class DeviceInfo {

@SerializedName(SERIALIZED_NAME_SERVER_TIME)
@javax.annotation.Nullable
private OffsetDateTime serverTime;
private String serverTime;

public static final String SERIALIZED_NAME_SUPPORTED_SCENARIOS = "supported-scenarios";

@SerializedName(SERIALIZED_NAME_SUPPORTED_SCENARIOS)
@javax.annotation.Nullable
private List<String> supportedScenarios;

public static final String SERIALIZED_NAME_METADATA = "metadata";

@SerializedName(SERIALIZED_NAME_METADATA)
@javax.annotation.Nullable
private Map<String, Object> metadata;

public static final String SERIALIZED_NAME_DOCUMENTS_DATABASE = "documents-database";

@SerializedName(SERIALIZED_NAME_DOCUMENTS_DATABASE)
@javax.annotation.Nullable
private DeviceInfoDocumentsDatabase documentsDatabase;

public DeviceInfo() {}

Expand All @@ -76,7 +104,7 @@ public DeviceInfo appName(@javax.annotation.Nullable String appName) {
}

/**
* Get appName
* Application name.
*
* @return appName
*/
Expand All @@ -95,7 +123,7 @@ public DeviceInfo version(@javax.annotation.Nullable String version) {
}

/**
* Get version
* Product version.
*
* @return version
*/
Expand All @@ -114,7 +142,7 @@ public DeviceInfo licenseId(@javax.annotation.Nullable String licenseId) {
}

/**
* Get licenseId
* Unique license identifier.
*
* @return licenseId
*/
Expand All @@ -133,7 +161,7 @@ public DeviceInfo licenseSerial(@javax.annotation.Nullable String licenseSerial)
}

/**
* Get licenseSerial
* License serial number.
*
* @return licenseSerial
*/
Expand All @@ -146,13 +174,32 @@ public void setLicenseSerial(@javax.annotation.Nullable String licenseSerial) {
this.licenseSerial = licenseSerial;
}

public DeviceInfo licenseType(@javax.annotation.Nullable String licenseType) {
this.licenseType = licenseType;
return this;
}

/**
* Get licenseType
*
* @return licenseType
*/
@javax.annotation.Nullable
public String getLicenseType() {
return licenseType;
}

public void setLicenseType(@javax.annotation.Nullable String licenseType) {
this.licenseType = licenseType;
}

public DeviceInfo validUntil(@javax.annotation.Nullable OffsetDateTime validUntil) {
this.validUntil = validUntil;
return this;
}

/**
* Get validUntil
* License validity date.
*
* @return validUntil
*/
Expand All @@ -165,7 +212,7 @@ public void setValidUntil(@javax.annotation.Nullable OffsetDateTime validUntil)
this.validUntil = validUntil;
}

public DeviceInfo serverTime(@javax.annotation.Nullable OffsetDateTime serverTime) {
public DeviceInfo serverTime(@javax.annotation.Nullable String serverTime) {
this.serverTime = serverTime;
return this;
}
Expand All @@ -176,14 +223,89 @@ public DeviceInfo serverTime(@javax.annotation.Nullable OffsetDateTime serverTim
* @return serverTime
*/
@javax.annotation.Nullable
public OffsetDateTime getServerTime() {
public String getServerTime() {
return serverTime;
}

public void setServerTime(@javax.annotation.Nullable OffsetDateTime serverTime) {
public void setServerTime(@javax.annotation.Nullable String serverTime) {
this.serverTime = serverTime;
}

public DeviceInfo supportedScenarios(@javax.annotation.Nullable List<String> supportedScenarios) {
this.supportedScenarios = supportedScenarios;
return this;
}

public DeviceInfo addSupportedScenariosItem(String supportedScenariosItem) {
if (this.supportedScenarios == null) {
this.supportedScenarios = new ArrayList<>();
}
this.supportedScenarios.add(supportedScenariosItem);
return this;
}

/**
* List of supported scenarios.
*
* @return supportedScenarios
*/
@javax.annotation.Nullable
public List<String> getSupportedScenarios() {
return supportedScenarios;
}

public void setSupportedScenarios(@javax.annotation.Nullable List<String> supportedScenarios) {
this.supportedScenarios = supportedScenarios;
}

public DeviceInfo metadata(@javax.annotation.Nullable Map<String, Object> metadata) {
this.metadata = metadata;
return this;
}

public DeviceInfo putMetadataItem(String key, Object metadataItem) {
if (this.metadata == null) {
this.metadata = new HashMap<>();
}
this.metadata.put(key, metadataItem);
return this;
}

/**
* Get metadata
*
* @return metadata
*/
@javax.annotation.Nullable
public Map<String, Object> getMetadata() {
return metadata;
}

public void setMetadata(@javax.annotation.Nullable Map<String, Object> metadata) {
this.metadata = metadata;
}

public DeviceInfo documentsDatabase(
@javax.annotation.Nullable DeviceInfoDocumentsDatabase documentsDatabase) {
this.documentsDatabase = documentsDatabase;
return this;
}

/**
* Get documentsDatabase
*
* @return documentsDatabase
*/
@javax.annotation.Nullable
public DeviceInfoDocumentsDatabase getDocumentsDatabase() {
return documentsDatabase;
}

public void setDocumentsDatabase(
@javax.annotation.Nullable DeviceInfoDocumentsDatabase documentsDatabase) {
this.documentsDatabase = documentsDatabase;
}

@Override
public boolean equals(Object o) {
if (this == o) {
Expand All @@ -197,13 +319,27 @@ public boolean equals(Object o) {
&& Objects.equals(this.version, deviceInfo.version)
&& Objects.equals(this.licenseId, deviceInfo.licenseId)
&& Objects.equals(this.licenseSerial, deviceInfo.licenseSerial)
&& Objects.equals(this.licenseType, deviceInfo.licenseType)
&& Objects.equals(this.validUntil, deviceInfo.validUntil)
&& Objects.equals(this.serverTime, deviceInfo.serverTime);
&& Objects.equals(this.serverTime, deviceInfo.serverTime)
&& Objects.equals(this.supportedScenarios, deviceInfo.supportedScenarios)
&& Objects.equals(this.metadata, deviceInfo.metadata)
&& Objects.equals(this.documentsDatabase, deviceInfo.documentsDatabase);
}

@Override
public int hashCode() {
return Objects.hash(appName, version, licenseId, licenseSerial, validUntil, serverTime);
return Objects.hash(
appName,
version,
licenseId,
licenseSerial,
licenseType,
validUntil,
serverTime,
supportedScenarios,
metadata,
documentsDatabase);
}

@Override
Expand All @@ -214,8 +350,12 @@ public String toString() {
sb.append(" version: ").append(toIndentedString(version)).append("\n");
sb.append(" licenseId: ").append(toIndentedString(licenseId)).append("\n");
sb.append(" licenseSerial: ").append(toIndentedString(licenseSerial)).append("\n");
sb.append(" licenseType: ").append(toIndentedString(licenseType)).append("\n");
sb.append(" validUntil: ").append(toIndentedString(validUntil)).append("\n");
sb.append(" serverTime: ").append(toIndentedString(serverTime)).append("\n");
sb.append(" supportedScenarios: ").append(toIndentedString(supportedScenarios)).append("\n");
sb.append(" metadata: ").append(toIndentedString(metadata)).append("\n");
sb.append(" documentsDatabase: ").append(toIndentedString(documentsDatabase)).append("\n");
sb.append("}");
return sb.toString();
}
Expand All @@ -240,8 +380,12 @@ private String toIndentedString(Object o) {
openapiFields.add("version");
openapiFields.add("license-id");
openapiFields.add("license-serial");
openapiFields.add("license-type");
openapiFields.add("valid-until");
openapiFields.add("server-time");
openapiFields.add("supported-scenarios");
openapiFields.add("metadata");
openapiFields.add("documents-database");

// a set of required properties/fields (JSON key names)
openapiRequiredFields = new HashSet<String>();
Expand Down Expand Up @@ -293,6 +437,34 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
"Expected the field `license-serial` to be a primitive type in the JSON string but got `%s`",
jsonObj.get("license-serial").toString()));
}
if ((jsonObj.get("license-type") != null && !jsonObj.get("license-type").isJsonNull())
&& !jsonObj.get("license-type").isJsonPrimitive()) {
throw new IllegalArgumentException(
String.format(
"Expected the field `license-type` to be a primitive type in the JSON string but got `%s`",
jsonObj.get("license-type").toString()));
}
if ((jsonObj.get("server-time") != null && !jsonObj.get("server-time").isJsonNull())
&& !jsonObj.get("server-time").isJsonPrimitive()) {
throw new IllegalArgumentException(
String.format(
"Expected the field `server-time` to be a primitive type in the JSON string but got `%s`",
jsonObj.get("server-time").toString()));
}
// ensure the optional json data is an array if present
if (jsonObj.get("supported-scenarios") != null
&& !jsonObj.get("supported-scenarios").isJsonNull()
&& !jsonObj.get("supported-scenarios").isJsonArray()) {
throw new IllegalArgumentException(
String.format(
"Expected the field `supported-scenarios` to be an array in the JSON string but got `%s`",
jsonObj.get("supported-scenarios").toString()));
}
// validate the optional field `documents-database`
if (jsonObj.get("documents-database") != null
&& !jsonObj.get("documents-database").isJsonNull()) {
DeviceInfoDocumentsDatabase.validateJsonElement(jsonObj.get("documents-database"));
}
}

public static class CustomTypeAdapterFactory implements TypeAdapterFactory {
Expand Down
Loading