diff --git a/pe/docs/AiModel.md b/pe/docs/AiModel.md index a52cf5c3..fab58500 100644 --- a/pe/docs/AiModel.md +++ b/pe/docs/AiModel.md @@ -9,8 +9,8 @@ |------------ | ------------- | ------------- | -------------| | **id** | **AiModelId** | | [optional] | | **createdTime** | **Long** | Entity creation timestamp in milliseconds since Unix epoch | [optional] [readonly] | -| **tenantId** | **TenantId** | JSON object representing the ID of the tenant associated with this AI model | [readonly] | -| **version** | **Long** | Version of the AI model record; increments automatically whenever the record is changed | [readonly] | +| **tenantId** | **TenantId** | JSON object representing the ID of the tenant associated with this AI model | [optional] [readonly] | +| **version** | **Long** | Version of the AI model record; increments automatically whenever the record is changed | [optional] [readonly] | | **name** | **String** | Display name for this AI model configuration; not the technical model identifier | | | **_configuration** | **AiModelConfig** | Configuration of the AI model | [optional] | diff --git a/pe/docs/CfReprocessingJobConfiguration.md b/pe/docs/CfReprocessingJobConfiguration.md index fd000bd7..3d64a25c 100644 --- a/pe/docs/CfReprocessingJobConfiguration.md +++ b/pe/docs/CfReprocessingJobConfiguration.md @@ -34,6 +34,7 @@ | success | Boolean | | [optional] | | discarded | Boolean | | [optional] | | finishTs | Long | | [optional] | +| error | String | | [optional] | | jobType | String | | | #### EntityType (enum) diff --git a/pe/docs/CfReprocessingJobResult.md b/pe/docs/CfReprocessingJobResult.md index 4329f910..8aa3b262 100644 --- a/pe/docs/CfReprocessingJobResult.md +++ b/pe/docs/CfReprocessingJobResult.md @@ -35,6 +35,7 @@ | success | Boolean | | [optional] | | discarded | Boolean | | [optional] | | finishTs | Long | | [optional] | +| error | String | | [optional] | | jobType | String | | | --- diff --git a/pe/docs/CfReprocessingTaskResult.md b/pe/docs/CfReprocessingTaskResult.md index 9883aacc..57583854 100644 --- a/pe/docs/CfReprocessingTaskResult.md +++ b/pe/docs/CfReprocessingTaskResult.md @@ -24,6 +24,7 @@ | success | Boolean | | [optional] | | discarded | Boolean | | [optional] | | finishTs | Long | | [optional] | +| error | String | | [optional] | | jobType | String | | | #### CfReprocessingTaskFailure diff --git a/pe/docs/DummyJobConfiguration.md b/pe/docs/DummyJobConfiguration.md index 998ed5d2..b0ed8861 100644 --- a/pe/docs/DummyJobConfiguration.md +++ b/pe/docs/DummyJobConfiguration.md @@ -39,6 +39,7 @@ Dummy job configuration | success | Boolean | | [optional] | | discarded | Boolean | | [optional] | | finishTs | Long | | [optional] | +| error | String | | [optional] | | jobType | String | | | --- diff --git a/pe/docs/DummyJobResult.md b/pe/docs/DummyJobResult.md index f94a5fc7..61368c91 100644 --- a/pe/docs/DummyJobResult.md +++ b/pe/docs/DummyJobResult.md @@ -35,6 +35,7 @@ | success | Boolean | | [optional] | | discarded | Boolean | | [optional] | | finishTs | Long | | [optional] | +| error | String | | [optional] | | jobType | String | | | --- diff --git a/pe/docs/DummyTaskResult.md b/pe/docs/DummyTaskResult.md index 3e40f35b..000bfe99 100644 --- a/pe/docs/DummyTaskResult.md +++ b/pe/docs/DummyTaskResult.md @@ -22,6 +22,7 @@ | success | Boolean | | [optional] | | discarded | Boolean | | [optional] | | finishTs | Long | | [optional] | +| error | String | | [optional] | | jobType | String | | | #### DummyTaskFailure diff --git a/pe/docs/Job.md b/pe/docs/Job.md index d9a9ec4b..9449e7a8 100644 --- a/pe/docs/Job.md +++ b/pe/docs/Job.md @@ -108,6 +108,7 @@ | success | Boolean | | [optional] | | discarded | Boolean | | [optional] | | finishTs | Long | | [optional] | +| error | String | | [optional] | | jobType | String | | | #### NotificationRequest diff --git a/pe/docs/JobConfiguration.md b/pe/docs/JobConfiguration.md index c9889473..c99209aa 100644 --- a/pe/docs/JobConfiguration.md +++ b/pe/docs/JobConfiguration.md @@ -62,6 +62,7 @@ | success | Boolean | | [optional] | | discarded | Boolean | | [optional] | | finishTs | Long | | [optional] | +| error | String | | [optional] | | jobType | String | | | #### NotificationRequest diff --git a/pe/docs/JobResult.md b/pe/docs/JobResult.md index 0559eceb..06d451fa 100644 --- a/pe/docs/JobResult.md +++ b/pe/docs/JobResult.md @@ -46,6 +46,7 @@ Job execution result | success | Boolean | | [optional] | | discarded | Boolean | | [optional] | | finishTs | Long | | [optional] | +| error | String | | [optional] | | jobType | String | | | #### Report diff --git a/pe/docs/PageDataAiModel.md b/pe/docs/PageDataAiModel.md index 42035345..6cbfb5bb 100644 --- a/pe/docs/PageDataAiModel.md +++ b/pe/docs/PageDataAiModel.md @@ -23,8 +23,8 @@ |------|------|-------------|-------| | id | AiModelId | | [optional] | | createdTime | Long | Entity creation timestamp in milliseconds since Unix epoch | [optional] [readonly] | -| tenantId | TenantId | JSON object representing the ID of the tenant associated with this AI model | [readonly] | -| version | Long | Version of the AI model record; increments automatically whenever the record is changed | [readonly] | +| tenantId | TenantId | JSON object representing the ID of the tenant associated with this AI model | [optional] [readonly] | +| version | Long | Version of the AI model record; increments automatically whenever the record is changed | [optional] [readonly] | | name | String | Display name for this AI model configuration; not the technical model identifier | | | _configuration | AiModelConfig | Configuration of the AI model | [optional] | diff --git a/pe/docs/PageDataJob.md b/pe/docs/PageDataJob.md index f314c1d8..e0177216 100644 --- a/pe/docs/PageDataJob.md +++ b/pe/docs/PageDataJob.md @@ -116,6 +116,7 @@ | success | Boolean | | [optional] | | discarded | Boolean | | [optional] | | finishTs | Long | | [optional] | +| error | String | | [optional] | | jobType | String | | | #### NotificationRequest diff --git a/pe/docs/PageDataRuleChain.md b/pe/docs/PageDataRuleChain.md index abd42de5..56e47e18 100644 --- a/pe/docs/PageDataRuleChain.md +++ b/pe/docs/PageDataRuleChain.md @@ -24,7 +24,7 @@ | id | RuleChainId | JSON object with the Rule Chain Id. Specify this field to update the Rule Chain. Referencing non-existing Rule Chain Id will cause error. Omit this field to create new rule chain. | [optional] | | createdTime | Long | Timestamp of the rule chain creation, in milliseconds | [optional] [readonly] | | additionalInfo | com.fasterxml.jackson.databind.JsonNode | | [optional] | -| tenantId | TenantId | JSON object with Tenant Id. | [readonly] | +| tenantId | TenantId | JSON object with Tenant Id. | [optional] [readonly] | | name | String | Rule Chain name | | | type | RuleChainType | Rule Chain type. 'EDGE' rule chains are processing messages on the edge devices only. | [optional] | | firstRuleNodeId | RuleNodeId | JSON object with Rule Chain Id. Pointer to the first rule node that should receive all messages pushed to this rule chain. | [optional] | diff --git a/pe/docs/ReportJobConfiguration.md b/pe/docs/ReportJobConfiguration.md index f8ebcfc6..b77d6f07 100644 --- a/pe/docs/ReportJobConfiguration.md +++ b/pe/docs/ReportJobConfiguration.md @@ -80,6 +80,7 @@ | success | Boolean | | [optional] | | discarded | Boolean | | [optional] | | finishTs | Long | | [optional] | +| error | String | | [optional] | | jobType | String | | | #### NotificationTemplate diff --git a/pe/docs/ReportJobResult.md b/pe/docs/ReportJobResult.md index 0ad5bd05..e75d8b16 100644 --- a/pe/docs/ReportJobResult.md +++ b/pe/docs/ReportJobResult.md @@ -51,6 +51,7 @@ | success | Boolean | | [optional] | | discarded | Boolean | | [optional] | | finishTs | Long | | [optional] | +| error | String | | [optional] | | jobType | String | | | #### TbReportFormat (enum) diff --git a/pe/docs/ReportTaskResult.md b/pe/docs/ReportTaskResult.md index 58ccb5df..0648628b 100644 --- a/pe/docs/ReportTaskResult.md +++ b/pe/docs/ReportTaskResult.md @@ -24,6 +24,7 @@ | success | Boolean | | [optional] | | discarded | Boolean | | [optional] | | finishTs | Long | | [optional] | +| error | String | | [optional] | | jobType | String | | | #### Report diff --git a/pe/docs/RuleChain.md b/pe/docs/RuleChain.md index b30b23c6..7e0262a5 100644 --- a/pe/docs/RuleChain.md +++ b/pe/docs/RuleChain.md @@ -12,7 +12,7 @@ A JSON value representing the rule chain. | **id** | **RuleChainId** | JSON object with the Rule Chain Id. Specify this field to update the Rule Chain. Referencing non-existing Rule Chain Id will cause error. Omit this field to create new rule chain. | [optional] | | **createdTime** | **Long** | Timestamp of the rule chain creation, in milliseconds | [optional] [readonly] | | **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | | [optional] | -| **tenantId** | **TenantId** | JSON object with Tenant Id. | [readonly] | +| **tenantId** | **TenantId** | JSON object with Tenant Id. | [optional] [readonly] | | **name** | **String** | Rule Chain name | | | **type** | **RuleChainType** | Rule Chain type. 'EDGE' rule chains are processing messages on the edge devices only. | [optional] | | **firstRuleNodeId** | **RuleNodeId** | JSON object with Rule Chain Id. Pointer to the first rule node that should receive all messages pushed to this rule chain. | [optional] | diff --git a/pe/docs/RuleChainData.md b/pe/docs/RuleChainData.md index d88adfeb..06160011 100644 --- a/pe/docs/RuleChainData.md +++ b/pe/docs/RuleChainData.md @@ -24,7 +24,7 @@ A JSON value representing the rule chains. | id | RuleChainId | JSON object with the Rule Chain Id. Specify this field to update the Rule Chain. Referencing non-existing Rule Chain Id will cause error. Omit this field to create new rule chain. | [optional] | | createdTime | Long | Timestamp of the rule chain creation, in milliseconds | [optional] [readonly] | | additionalInfo | com.fasterxml.jackson.databind.JsonNode | | [optional] | -| tenantId | TenantId | JSON object with Tenant Id. | [readonly] | +| tenantId | TenantId | JSON object with Tenant Id. | [optional] [readonly] | | name | String | Rule Chain name | | | type | RuleChainType | Rule Chain type. 'EDGE' rule chains are processing messages on the edge devices only. | [optional] | | firstRuleNodeId | RuleNodeId | JSON object with Rule Chain Id. Pointer to the first rule node that should receive all messages pushed to this rule chain. | [optional] | diff --git a/pe/docs/TaskResult.md b/pe/docs/TaskResult.md index 2b7f85f0..9f87bdbf 100644 --- a/pe/docs/TaskResult.md +++ b/pe/docs/TaskResult.md @@ -11,6 +11,7 @@ | **success** | **Boolean** | | [optional] | | **discarded** | **Boolean** | | [optional] | | **finishTs** | **Long** | | [optional] | +| **error** | **String** | | [optional] | | **jobType** | **String** | | | diff --git a/pe/spec/openapi.json b/pe/spec/openapi.json index 057b84ea..a926e589 100644 --- a/pe/spec/openapi.json +++ b/pe/spec/openapi.json @@ -115921,9 +115921,7 @@ } }, "required": [ - "name", - "tenantId", - "version" + "name" ] }, "AiModelConfig": { @@ -135266,8 +135264,7 @@ } }, "required": [ - "name", - "tenantId" + "name" ] }, "RuleChainConnectionInfo": { @@ -137776,6 +137773,9 @@ "type": "integer", "format": "int64" }, + "error": { + "type": "string" + }, "jobType": { "type": "string" } diff --git a/pe/src/main/java/org/thingsboard/client/model/AiModel.java b/pe/src/main/java/org/thingsboard/client/model/AiModel.java index 43544ab5..59ff5a74 100644 --- a/pe/src/main/java/org/thingsboard/client/model/AiModel.java +++ b/pe/src/main/java/org/thingsboard/client/model/AiModel.java @@ -59,11 +59,11 @@ public class AiModel { private Long createdTime; public static final String JSON_PROPERTY_TENANT_ID = "tenantId"; - @Nonnull + @Nullable private TenantId tenantId; public static final String JSON_PROPERTY_VERSION = "version"; - @Nonnull + @Nullable private Long version = 1l; public static final String JSON_PROPERTY_NAME = "name"; @@ -131,9 +131,9 @@ public Long getCreatedTime() { * JSON object representing the ID of the tenant associated with this AI model * @return tenantId */ - @Nonnull - @JsonProperty(value = JSON_PROPERTY_TENANT_ID, required = true) - @JsonInclude(value = JsonInclude.Include.ALWAYS) + @Nullable + @JsonProperty(value = JSON_PROPERTY_TENANT_ID, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public TenantId getTenantId() { return tenantId; } @@ -145,9 +145,9 @@ public TenantId getTenantId() { * Version of the AI model record; increments automatically whenever the record is changed * @return version */ - @Nonnull - @JsonProperty(value = JSON_PROPERTY_VERSION, required = true) - @JsonInclude(value = JsonInclude.Include.ALWAYS) + @Nullable + @JsonProperty(value = JSON_PROPERTY_VERSION, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public Long getVersion() { return version; } diff --git a/pe/src/main/java/org/thingsboard/client/model/CfReprocessingTaskResult.java b/pe/src/main/java/org/thingsboard/client/model/CfReprocessingTaskResult.java index a8e84490..5a9b00a0 100644 --- a/pe/src/main/java/org/thingsboard/client/model/CfReprocessingTaskResult.java +++ b/pe/src/main/java/org/thingsboard/client/model/CfReprocessingTaskResult.java @@ -102,6 +102,12 @@ public CfReprocessingTaskResult finishTs(@Nullable Long finishTs) { return this; } + @Override + public CfReprocessingTaskResult error(@Nullable String error) { + this.setError(error); + return this; + } + /** * Return true if this CfReprocessingTaskResult object is equal to o. */ @@ -196,6 +202,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sfinishTs%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getFinishTs())))); } + // add `error` to the URL query string + if (getError() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%serror%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getError())))); + } + // add `jobType` to the URL query string if (getJobType() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sjobType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getJobType())))); diff --git a/pe/src/main/java/org/thingsboard/client/model/DummyTaskResult.java b/pe/src/main/java/org/thingsboard/client/model/DummyTaskResult.java index a864a816..d7ee46cc 100644 --- a/pe/src/main/java/org/thingsboard/client/model/DummyTaskResult.java +++ b/pe/src/main/java/org/thingsboard/client/model/DummyTaskResult.java @@ -102,6 +102,12 @@ public DummyTaskResult finishTs(@Nullable Long finishTs) { return this; } + @Override + public DummyTaskResult error(@Nullable String error) { + this.setError(error); + return this; + } + /** * Return true if this DummyTaskResult object is equal to o. */ @@ -196,6 +202,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sfinishTs%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getFinishTs())))); } + // add `error` to the URL query string + if (getError() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%serror%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getError())))); + } + // add `jobType` to the URL query string if (getJobType() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sjobType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getJobType())))); diff --git a/pe/src/main/java/org/thingsboard/client/model/ReportTaskResult.java b/pe/src/main/java/org/thingsboard/client/model/ReportTaskResult.java index 1b082709..71d444f0 100644 --- a/pe/src/main/java/org/thingsboard/client/model/ReportTaskResult.java +++ b/pe/src/main/java/org/thingsboard/client/model/ReportTaskResult.java @@ -102,6 +102,12 @@ public ReportTaskResult finishTs(@Nullable Long finishTs) { return this; } + @Override + public ReportTaskResult error(@Nullable String error) { + this.setError(error); + return this; + } + /** * Return true if this ReportTaskResult object is equal to o. */ @@ -196,6 +202,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sfinishTs%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getFinishTs())))); } + // add `error` to the URL query string + if (getError() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%serror%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getError())))); + } + // add `jobType` to the URL query string if (getJobType() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sjobType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getJobType())))); diff --git a/pe/src/main/java/org/thingsboard/client/model/RuleChain.java b/pe/src/main/java/org/thingsboard/client/model/RuleChain.java index 145d93f8..d553b426 100644 --- a/pe/src/main/java/org/thingsboard/client/model/RuleChain.java +++ b/pe/src/main/java/org/thingsboard/client/model/RuleChain.java @@ -69,7 +69,7 @@ public class RuleChain { private com.fasterxml.jackson.databind.JsonNode additionalInfo = null; public static final String JSON_PROPERTY_TENANT_ID = "tenantId"; - @Nonnull + @Nullable private TenantId tenantId; public static final String JSON_PROPERTY_NAME = "name"; @@ -179,9 +179,9 @@ public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode * JSON object with Tenant Id. * @return tenantId */ - @Nonnull - @JsonProperty(value = JSON_PROPERTY_TENANT_ID, required = true) - @JsonInclude(value = JsonInclude.Include.ALWAYS) + @Nullable + @JsonProperty(value = JSON_PROPERTY_TENANT_ID, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) public TenantId getTenantId() { return tenantId; } diff --git a/pe/src/main/java/org/thingsboard/client/model/TaskResult.java b/pe/src/main/java/org/thingsboard/client/model/TaskResult.java index 86c61b30..89b7bbc2 100644 --- a/pe/src/main/java/org/thingsboard/client/model/TaskResult.java +++ b/pe/src/main/java/org/thingsboard/client/model/TaskResult.java @@ -46,6 +46,7 @@ TaskResult.JSON_PROPERTY_SUCCESS, TaskResult.JSON_PROPERTY_DISCARDED, TaskResult.JSON_PROPERTY_FINISH_TS, + TaskResult.JSON_PROPERTY_ERROR, TaskResult.JSON_PROPERTY_JOB_TYPE }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @@ -77,6 +78,10 @@ public class TaskResult { @Nullable private Long finishTs; + public static final String JSON_PROPERTY_ERROR = "error"; + @Nullable + private String error; + public static final String JSON_PROPERTY_JOB_TYPE = "jobType"; @Nonnull private String jobType; @@ -180,6 +185,30 @@ public void setFinishTs(@Nullable Long finishTs) { } + public TaskResult error(@Nullable String error) { + this.error = error; + return this; + } + + /** + * Get error + * @return error + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ERROR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getError() { + return error; + } + + + @JsonProperty(value = JSON_PROPERTY_ERROR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setError(@Nullable String error) { + this.error = error; + } + + public TaskResult jobType(@Nonnull String jobType) { this.jobType = jobType; return this; @@ -220,12 +249,13 @@ public boolean equals(Object o) { Objects.equals(this.success, taskResult.success) && Objects.equals(this.discarded, taskResult.discarded) && Objects.equals(this.finishTs, taskResult.finishTs) && + Objects.equals(this.error, taskResult.error) && Objects.equals(this.jobType, taskResult.jobType); } @Override public int hashCode() { - return Objects.hash(key, success, discarded, finishTs, jobType); + return Objects.hash(key, success, discarded, finishTs, error, jobType); } @Override @@ -236,6 +266,7 @@ public String toString() { sb.append(" success: ").append(toIndentedString(success)).append("\n"); sb.append(" discarded: ").append(toIndentedString(discarded)).append("\n"); sb.append(" finishTs: ").append(toIndentedString(finishTs)).append("\n"); + sb.append(" error: ").append(toIndentedString(error)).append("\n"); sb.append(" jobType: ").append(toIndentedString(jobType)).append("\n"); sb.append("}"); return sb.toString(); @@ -304,6 +335,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sfinishTs%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getFinishTs())))); } + // add `error` to the URL query string + if (getError() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%serror%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getError())))); + } + // add `jobType` to the URL query string if (getJobType() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sjobType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getJobType()))));