Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("StringsCount");
openapiRequiredFields.add("StringsResult");
openapiRequiredFields.add("Buf_Length");
openapiRequiredFields.add("Buf_Text");
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("StringsCount");
openapiRequiredFields.add("StringsResult");
openapiRequiredFields.add("Buf_Length");
openapiRequiredFields.add("Buf_Text");
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public class RfidSessionData {
public static final String SERIALIZED_NAME_SESSION_KEY = "Session_key";

@SerializedName(SERIALIZED_NAME_SESSION_KEY)
@javax.annotation.Nonnull
@javax.annotation.Nullable
private RfidAccessKey sessionKey;

public static final String SERIALIZED_NAME_SESSION_TERMINAL = "Session_terminal";
Expand Down Expand Up @@ -401,7 +401,7 @@ public void setTotalBytesReceived(@javax.annotation.Nonnull BigDecimal totalByte
this.totalBytesReceived = totalBytesReceived;
}

public RfidSessionData sessionKey(@javax.annotation.Nonnull RfidAccessKey sessionKey) {
public RfidSessionData sessionKey(@javax.annotation.Nullable RfidAccessKey sessionKey) {
this.sessionKey = sessionKey;
return this;
}
Expand All @@ -411,12 +411,12 @@ public RfidSessionData sessionKey(@javax.annotation.Nonnull RfidAccessKey sessio
*
* @return sessionKey
*/
@javax.annotation.Nonnull
@javax.annotation.Nullable
public RfidAccessKey getSessionKey() {
return sessionKey;
}

public void setSessionKey(@javax.annotation.Nonnull RfidAccessKey sessionKey) {
public void setSessionKey(@javax.annotation.Nullable RfidAccessKey sessionKey) {
this.sessionKey = sessionKey;
}

Expand Down Expand Up @@ -627,7 +627,6 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("RootFiles");
openapiRequiredFields.add("TotalBytesSent");
openapiRequiredFields.add("TotalBytesReceived");
openapiRequiredFields.add("Session_key");
openapiRequiredFields.add("Session_terminal");
openapiRequiredFields.add("Session_procedure");
openapiRequiredFields.add("SecurityObjects");
Expand Down Expand Up @@ -723,8 +722,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
"Expected the field `RootFiles` to be an array in the JSON string but got `%s`",
jsonObj.get("RootFiles").toString()));
}
// validate the required field `Session_key`
RfidAccessKey.validateJsonElement(jsonObj.get("Session_key"));
// validate the optional field `Session_key`
if (jsonObj.get("Session_key") != null && !jsonObj.get("Session_key").isJsonNull()) {
RfidAccessKey.validateJsonElement(jsonObj.get("Session_key"));
}
// validate the required field `Session_terminal`
RfidTerminal.validateJsonElement(jsonObj.get("Session_terminal"));
// validate the required field `Session_procedure`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,13 @@ public enum Source {
MAGNETIC("MAGNETIC"),

/** External */
EXTERNAL("EXTERNAL");
EXTERNAL("EXTERNAL"),

/** Live */
LIVE("LIVE"),

/** Fingerprint */
FINGERPRINT("FINGERPRINT");

private String value;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public class VisualExtendedFieldItem {
public static final String SERIALIZED_NAME_BUF_TEXT = "Buf_Text";

@SerializedName(SERIALIZED_NAME_BUF_TEXT)
@javax.annotation.Nonnull
@javax.annotation.Nullable
private String bufText;

public static final String SERIALIZED_NAME_FIELD_MASK = "FieldMask";
Expand Down Expand Up @@ -209,7 +209,7 @@ public void setBufLength(@javax.annotation.Nonnull BigDecimal bufLength) {
this.bufLength = bufLength;
}

public VisualExtendedFieldItem bufText(@javax.annotation.Nonnull String bufText) {
public VisualExtendedFieldItem bufText(@javax.annotation.Nullable String bufText) {
this.bufText = bufText;
return this;
}
Expand All @@ -220,12 +220,12 @@ public VisualExtendedFieldItem bufText(@javax.annotation.Nonnull String bufText)
*
* @return bufText
*/
@javax.annotation.Nonnull
@javax.annotation.Nullable
public String getBufText() {
return bufText;
}

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

Expand Down Expand Up @@ -439,7 +439,6 @@ private String toIndentedString(Object o) {
openapiRequiredFields.add("StringsCount");
openapiRequiredFields.add("StringsResult");
openapiRequiredFields.add("Buf_Length");
openapiRequiredFields.add("Buf_Text");
}

/**
Expand Down Expand Up @@ -481,7 +480,8 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
StringRecognitionResult.validateJsonElement(jsonArraystringsResult.get(i));
}
;
if (!jsonObj.get("Buf_Text").isJsonPrimitive()) {
if ((jsonObj.get("Buf_Text") != null && !jsonObj.get("Buf_Text").isJsonNull())
&& !jsonObj.get("Buf_Text").isJsonPrimitive()) {
throw new IllegalArgumentException(
String.format(
"Expected the field `Buf_Text` to be a primitive type in the JSON string but got `%s`",
Expand Down