diff --git a/ce/docs/Asset.md b/ce/docs/Asset.md index 397b4387..672a250f 100644 --- a/ce/docs/Asset.md +++ b/ce/docs/Asset.md @@ -16,7 +16,7 @@ | **label** | **String** | Label that may be used in widgets | [optional] | | **assetProfileId** | **AssetProfileId** | JSON object with Asset Profile Id. | [optional] | | **version** | **Long** | | [optional] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the asset | [optional] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the asset. May include: 'description' (string). | [optional] | diff --git a/ce/docs/AssetInfo.md b/ce/docs/AssetInfo.md index 1a6a634c..839cdaee 100644 --- a/ce/docs/AssetInfo.md +++ b/ce/docs/AssetInfo.md @@ -19,7 +19,7 @@ | **customerTitle** | **String** | Title of the Customer that owns the asset. | [optional] [readonly] | | **customerIsPublic** | **Boolean** | Indicates special 'Public' Customer that is auto-generated to use the assets on public dashboards. | [optional] [readonly] | | **assetProfileName** | **String** | Name of the corresponding Asset Profile. | [optional] [readonly] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the asset | [optional] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the asset. May include: 'description' (string). | [optional] | diff --git a/ce/docs/AssetTypeFilter.md b/ce/docs/AssetTypeFilter.md index 2d50069e..dcdfdbf3 100644 --- a/ce/docs/AssetTypeFilter.md +++ b/ce/docs/AssetTypeFilter.md @@ -9,9 +9,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **assetType** | **String** | | [optional] | | **assetTypes** | **List\** | | [optional] | | **assetNameFilter** | **String** | | [optional] | +| **assetType** | **String** | | [optional] | diff --git a/ce/docs/CalculatedFieldDebugEventFilter.md b/ce/docs/CalculatedFieldDebugEventFilter.md index e4b96fe6..e31ffb23 100644 --- a/ce/docs/CalculatedFieldDebugEventFilter.md +++ b/ce/docs/CalculatedFieldDebugEventFilter.md @@ -10,7 +10,6 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| | **server** | **String** | String value representing the server name, identifier or ip address where the platform is running | [optional] | -| **isError** | **Boolean** | | [optional] | | **errorStr** | **String** | The case insensitive 'contains' filter based on error message | [optional] | | **entityId** | **String** | String value representing the entity id in the event body | [optional] | | **entityType** | **EntityTypeEnum** | String value representing the entity type | [optional] | @@ -18,6 +17,7 @@ | **msgType** | **String** | String value representing the message type | [optional] | | **arguments** | **String** | String value representing the arguments that were used in the calculation performed | [optional] | | **result** | **String** | String value representing the result of a calculation | [optional] | +| **isError** | **Boolean** | | [optional] | | **error** | **Boolean** | | [optional] | diff --git a/ce/docs/CustomMobilePage.md b/ce/docs/CustomMobilePage.md index 233caf4f..b90633e7 100644 --- a/ce/docs/CustomMobilePage.md +++ b/ce/docs/CustomMobilePage.md @@ -9,10 +9,10 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **path** | **String** | Path to custom page | [optional] | | **label** | **String** | Page label | [optional] | | **visible** | **Boolean** | Indicates if page is visible | | | **icon** | **String** | URL of the page icon | [optional] | +| **path** | **String** | Path to custom page | [optional] | diff --git a/ce/docs/Customer.md b/ce/docs/Customer.md index 2a9ee785..45cfee4a 100644 --- a/ce/docs/Customer.md +++ b/ce/docs/Customer.md @@ -21,7 +21,7 @@ | **tenantId** | **TenantId** | JSON object with Tenant Id | [optional] | | **version** | **Long** | | [optional] | | **name** | **String** | Name of the customer. Read-only, duplicated from title for backward compatibility | [optional] [readonly] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the device | [optional] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the customer. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar), 'isPublic' (boolean, whether this is a public customer). | [optional] | diff --git a/ce/docs/Dashboard.md b/ce/docs/Dashboard.md index bbf7d9ab..3fc34a8c 100644 --- a/ce/docs/Dashboard.md +++ b/ce/docs/Dashboard.md @@ -7,18 +7,18 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| +| **id** | **DashboardId** | JSON object with the dashboard Id. Specify existing dashboard Id to update the dashboard. Referencing non-existing dashboard id will cause error. Omit this field to create new dashboard. | [optional] | +| **createdTime** | **Long** | Timestamp of the dashboard creation, in milliseconds | [optional] [readonly] | +| **tenantId** | **TenantId** | JSON object with Tenant Id. Tenant Id of the dashboard can't be changed. | [optional] [readonly] | | **title** | **String** | Title of the dashboard. | | | **image** | **String** | Thumbnail picture for rendering of the dashboards in a grid view on mobile devices. | [optional] [readonly] | +| **assignedCustomers** | **Set\** | List of assigned customers with their info. | [optional] | | **mobileHide** | **Boolean** | Hide dashboard from mobile devices. Useful if the dashboard is not designed for small screens. | [optional] [readonly] | | **mobileOrder** | **Integer** | Order on mobile devices. Useful to adjust sorting of the dashboards for mobile applications | [optional] [readonly] | +| **version** | **Long** | | [optional] | +| **resources** | **List\** | | [optional] | | **_configuration** | **com.fasterxml.jackson.databind.JsonNode** | JSON object with main configuration of the dashboard: layouts, widgets, aliases, etc. The JSON structure of the dashboard configuration is quite complex. The easiest way to learn it is to export existing dashboard to JSON. | [optional] | | **name** | **String** | Same as title of the dashboard. Read-only field. Update the 'title' to change the 'name' of the dashboard. | [optional] [readonly] | -| **resources** | **List\** | | [optional] | -| **id** | **DashboardId** | JSON object with the dashboard Id. Specify existing dashboard Id to update the dashboard. Referencing non-existing dashboard id will cause error. Omit this field to create new dashboard. | [optional] | -| **createdTime** | **Long** | Timestamp of the dashboard creation, in milliseconds | [optional] [readonly] | -| **tenantId** | **TenantId** | JSON object with Tenant Id. Tenant Id of the dashboard can't be changed. | [optional] [readonly] | -| **assignedCustomers** | **Set\** | List of assigned customers with their info. | [optional] | -| **version** | **Long** | | [optional] | diff --git a/ce/docs/DashboardPage.md b/ce/docs/DashboardPage.md index e21e190f..446481be 100644 --- a/ce/docs/DashboardPage.md +++ b/ce/docs/DashboardPage.md @@ -9,10 +9,10 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **dashboardId** | **String** | Dashboard id | [optional] | | **label** | **String** | Page label | [optional] | | **visible** | **Boolean** | Indicates if page is visible | | | **icon** | **String** | URL of the page icon | [optional] | +| **dashboardId** | **String** | Dashboard id | [optional] | diff --git a/ce/docs/DefaultMobilePage.md b/ce/docs/DefaultMobilePage.md index 8c88c92f..561f744e 100644 --- a/ce/docs/DefaultMobilePage.md +++ b/ce/docs/DefaultMobilePage.md @@ -9,10 +9,10 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **id** | **DefaultPageId** | Identifier for default page | [optional] | | **label** | **String** | Page label | [optional] | | **visible** | **Boolean** | Indicates if page is visible | | | **icon** | **String** | URL of the page icon | [optional] | +| **id** | **DefaultPageId** | Identifier for default page | [optional] | diff --git a/ce/docs/Device.md b/ce/docs/Device.md index a5618de1..e4dc7441 100644 --- a/ce/docs/Device.md +++ b/ce/docs/Device.md @@ -18,7 +18,7 @@ | **firmwareId** | **OtaPackageId** | JSON object with Ota Package Id. | [optional] | | **softwareId** | **OtaPackageId** | JSON object with Ota Package Id. | [optional] | | **version** | **Long** | | [optional] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the device | [optional] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device). | [optional] | | **deviceData** | **DeviceData** | JSON object with content specific to type of transport in the device profile. | [optional] | diff --git a/ce/docs/DeviceInfo.md b/ce/docs/DeviceInfo.md index 4d40268f..4d18b744 100644 --- a/ce/docs/DeviceInfo.md +++ b/ce/docs/DeviceInfo.md @@ -22,7 +22,7 @@ | **customerIsPublic** | **Boolean** | Indicates special 'Public' Customer that is auto-generated to use the devices on public dashboards. | [optional] [readonly] | | **deviceProfileName** | **String** | Name of the corresponding Device Profile. | [optional] [readonly] | | **active** | **Boolean** | Device active flag. | [optional] [readonly] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the device | [optional] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device). | [optional] | | **deviceData** | **DeviceData** | JSON object with content specific to type of transport in the device profile. | [optional] | diff --git a/ce/docs/DeviceTypeFilter.md b/ce/docs/DeviceTypeFilter.md index 97ad4c51..2bd83e86 100644 --- a/ce/docs/DeviceTypeFilter.md +++ b/ce/docs/DeviceTypeFilter.md @@ -9,9 +9,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **deviceType** | **String** | | [optional] | | **deviceTypes** | **List\** | | [optional] | | **deviceNameFilter** | **String** | | [optional] | +| **deviceType** | **String** | | [optional] | diff --git a/ce/docs/Edge.md b/ce/docs/Edge.md index 6f1c21a1..8b553551 100644 --- a/ce/docs/Edge.md +++ b/ce/docs/Edge.md @@ -20,7 +20,7 @@ A JSON value representing the edge. | **routingKey** | **String** | Edge routing key ('username') to authorize on cloud | | | **secret** | **String** | Edge secret ('password') to authorize on cloud | | | **version** | **Long** | | [optional] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | | [optional] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the edge. May include: 'description' (string). | [optional] | diff --git a/ce/docs/EdgeInfo.md b/ce/docs/EdgeInfo.md index 6bca0120..c4d333da 100644 --- a/ce/docs/EdgeInfo.md +++ b/ce/docs/EdgeInfo.md @@ -20,7 +20,7 @@ | **version** | **Long** | | [optional] | | **customerTitle** | **String** | | [optional] | | **customerIsPublic** | **Boolean** | | [optional] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | | [optional] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the edge. May include: 'description' (string). | [optional] | diff --git a/ce/docs/EdgeTypeFilter.md b/ce/docs/EdgeTypeFilter.md index 1bb04113..10bfd8e7 100644 --- a/ce/docs/EdgeTypeFilter.md +++ b/ce/docs/EdgeTypeFilter.md @@ -9,9 +9,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **edgeType** | **String** | | [optional] | | **edgeTypes** | **List\** | | [optional] | | **edgeNameFilter** | **String** | | [optional] | +| **edgeType** | **String** | | [optional] | diff --git a/ce/docs/EntityRelation.md b/ce/docs/EntityRelation.md index 4a8cfea4..cae4f2b6 100644 --- a/ce/docs/EntityRelation.md +++ b/ce/docs/EntityRelation.md @@ -14,7 +14,7 @@ A JSON value representing the relation. | **type** | **String** | String value of relation type. | | | **typeGroup** | **RelationTypeGroup** | Represents the type group of the relation. | | | **version** | **Long** | | [optional] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the relation | [optional] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the relation. | [optional] | diff --git a/ce/docs/EntityRelationInfo.md b/ce/docs/EntityRelationInfo.md index a08463c1..1362679d 100644 --- a/ce/docs/EntityRelationInfo.md +++ b/ce/docs/EntityRelationInfo.md @@ -14,7 +14,7 @@ | **version** | **Long** | | [optional] | | **fromName** | **String** | Name of the entity for [from] direction. | [optional] [readonly] | | **toName** | **String** | Name of the entity for [to] direction. | [optional] [readonly] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the relation | [optional] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the relation. | [optional] | diff --git a/ce/docs/EntityView.md b/ce/docs/EntityView.md index d6ef8cb9..9d9e69a7 100644 --- a/ce/docs/EntityView.md +++ b/ce/docs/EntityView.md @@ -20,7 +20,7 @@ A JSON object representing the entity view. | **version** | **Long** | | [optional] | | **id** | **EntityViewId** | JSON object with the Entity View Id. Specify this field to update the Entity View. Referencing non-existing Entity View Id will cause error. Omit this field to create new Entity View. | [optional] | | **createdTime** | **Long** | Timestamp of the Entity View creation, in milliseconds | [optional] [readonly] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the device | [optional] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the entity view. May include: 'description' (string). | [optional] | diff --git a/ce/docs/EntityViewInfo.md b/ce/docs/EntityViewInfo.md index 2be330b7..56915b3a 100644 --- a/ce/docs/EntityViewInfo.md +++ b/ce/docs/EntityViewInfo.md @@ -20,7 +20,7 @@ | **version** | **Long** | | [optional] | | **customerTitle** | **String** | Title of the Customer that owns the entity view. | [optional] [readonly] | | **customerIsPublic** | **Boolean** | Indicates special 'Public' Customer that is auto-generated to use the entity view on public dashboards. | [optional] [readonly] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the device | [optional] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the entity view. May include: 'description' (string). | [optional] | diff --git a/ce/docs/EntityViewTypeFilter.md b/ce/docs/EntityViewTypeFilter.md index 28c4618b..28b3c19c 100644 --- a/ce/docs/EntityViewTypeFilter.md +++ b/ce/docs/EntityViewTypeFilter.md @@ -9,9 +9,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **entityViewType** | **String** | | [optional] | | **entityViewTypes** | **List\** | | [optional] | | **entityViewNameFilter** | **String** | | [optional] | +| **entityViewType** | **String** | | [optional] | diff --git a/ce/docs/FeaturesInfo.md b/ce/docs/FeaturesInfo.md index 6ad1b21c..ebf4ca82 100644 --- a/ce/docs/FeaturesInfo.md +++ b/ce/docs/FeaturesInfo.md @@ -7,11 +7,11 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **twoFaEnabled** | **Boolean** | | [optional] | -| **emailEnabled** | **Boolean** | | [optional] | | **smsEnabled** | **Boolean** | | [optional] | | **oauthEnabled** | **Boolean** | | [optional] | | **notificationEnabled** | **Boolean** | | [optional] | +| **twoFaEnabled** | **Boolean** | | [optional] | +| **emailEnabled** | **Boolean** | | [optional] | diff --git a/ce/docs/NotificationTargetExportData.md b/ce/docs/NotificationTargetExportData.md index bec4f95a..d3c84c5d 100644 --- a/ce/docs/NotificationTargetExportData.md +++ b/ce/docs/NotificationTargetExportData.md @@ -7,8 +7,8 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **entityType** | **EntityType** | | | | **entity** | **ExportableEntity** | | [optional] | +| **entityType** | **EntityType** | | | | **relations** | **List\** | | [optional] | | **attributes** | **Map\\>** | Map of attributes where key is the scope of attributes and value is the list of attributes for that scope | [optional] | | **calculatedFields** | **List\** | | [optional] | diff --git a/ce/docs/RuleChainDebugEventFilter.md b/ce/docs/RuleChainDebugEventFilter.md index dd85917d..6f9e9e0e 100644 --- a/ce/docs/RuleChainDebugEventFilter.md +++ b/ce/docs/RuleChainDebugEventFilter.md @@ -10,9 +10,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| | **server** | **String** | String value representing the server name, identifier or ip address where the platform is running | [optional] | -| **isError** | **Boolean** | | [optional] | | **errorStr** | **String** | The case insensitive 'contains' filter based on error message | [optional] | | **message** | **String** | String value representing the message | [optional] | +| **isError** | **Boolean** | | [optional] | | **error** | **Boolean** | | [optional] | diff --git a/ce/docs/RuleNode.md b/ce/docs/RuleNode.md index a8302333..d74fd1f5 100644 --- a/ce/docs/RuleNode.md +++ b/ce/docs/RuleNode.md @@ -19,7 +19,7 @@ | **configurationVersion** | **Integer** | Version of rule node configuration. | [optional] | | **_configuration** | **com.fasterxml.jackson.databind.JsonNode** | JSON with the rule node configuration. Structure depends on the rule node implementation. | [optional] | | **externalId** | **RuleNodeId** | | [optional] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the rule node. Contains 'layoutX' and 'layoutY' properties for visualization. | [optional] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the rule node. May include: 'layoutX' (number, X coordinate for visualization), 'layoutY' (number, Y coordinate for visualization), 'description' (string). | [optional] | diff --git a/ce/docs/RuleNodeDebugEventFilter.md b/ce/docs/RuleNodeDebugEventFilter.md index 2772bee5..16baea68 100644 --- a/ce/docs/RuleNodeDebugEventFilter.md +++ b/ce/docs/RuleNodeDebugEventFilter.md @@ -10,7 +10,6 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| | **server** | **String** | String value representing the server name, identifier or ip address where the platform is running | [optional] | -| **isError** | **Boolean** | | [optional] | | **errorStr** | **String** | The case insensitive 'contains' filter based on error message | [optional] | | **msgDirectionType** | **MsgDirectionTypeEnum** | String value representing msg direction type (incoming to entity or outcoming from entity) | [optional] | | **entityId** | **String** | String value representing the entity id in the event body (originator of the message) | [optional] | @@ -20,6 +19,7 @@ | **relationType** | **String** | String value representing the type of message routing | [optional] | | **dataSearch** | **String** | The case insensitive 'contains' filter based on data (key and value) for the message. | [optional] | | **metadataSearch** | **String** | The case insensitive 'contains' filter based on metadata (key and value) for the message. | [optional] | +| **isError** | **Boolean** | | [optional] | | **error** | **Boolean** | | [optional] | diff --git a/ce/docs/TelemetryControllerApi.md b/ce/docs/TelemetryControllerApi.md index ac054be7..a0003e21 100644 --- a/ce/docs/TelemetryControllerApi.md +++ b/ce/docs/TelemetryControllerApi.md @@ -58,7 +58,7 @@ String deleteEntityAttributes(@Nonnull String entityType, @Nonnull String entity Delete entity attributes (deleteEntityAttributes) -Delete entity attributes using provided Entity Id, scope and a list of keys. Referencing a non-existing entity Id or invalid entity type will cause an error. Available for users with 'TENANT_ADMIN' or 'CUSTOMER_USER' authority. +Delete entity attributes using provided Entity Id, scope and a list of keys. This operation is idempotent: keys that do not exist are silently ignored and the response is still 200 OK. Referencing a non-existing entity Id or invalid entity type will cause an error. Available for users with 'TENANT_ADMIN' or 'CUSTOMER_USER' authority. ### Parameters diff --git a/ce/docs/Tenant.md b/ce/docs/Tenant.md index 664d16b4..396da50b 100644 --- a/ce/docs/Tenant.md +++ b/ce/docs/Tenant.md @@ -24,7 +24,7 @@ A JSON value representing the tenant. | **tenantProfileId** | **TenantProfileId** | JSON object with Tenant Profile Id | [optional] | | **version** | **Long** | | [optional] | | **name** | **String** | Name of the tenant. Read-only, duplicated from title for backward compatibility | [optional] [readonly] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the device | [optional] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar). | [optional] | diff --git a/ce/docs/TenantInfo.md b/ce/docs/TenantInfo.md index d4e122e7..1e8d506b 100644 --- a/ce/docs/TenantInfo.md +++ b/ce/docs/TenantInfo.md @@ -23,7 +23,7 @@ | **version** | **Long** | | [optional] | | **tenantProfileName** | **String** | Tenant Profile name | [optional] | | **name** | **String** | Name of the tenant. Read-only, duplicated from title for backward compatibility | [optional] [readonly] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the device | [optional] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar). | [optional] | diff --git a/ce/docs/User.md b/ce/docs/User.md index 1579dd2c..b2c6d151 100644 --- a/ce/docs/User.md +++ b/ce/docs/User.md @@ -20,7 +20,7 @@ A JSON value representing the User. | **phone** | **String** | Phone number of the user | [optional] | | **version** | **Long** | | [optional] | | **name** | **String** | Duplicates the email of the user, readonly | [optional] [readonly] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the user | [optional] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the user. May include: 'defaultDashboardId' (string, UUID of the default dashboard), 'defaultDashboardFullscreen' (boolean), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean), 'lang' (string, user locale, e.g. 'en_US'), 'authProviderName' (string, name of the authentication provider). | [optional] | diff --git a/ce/docs/WebViewPage.md b/ce/docs/WebViewPage.md index 1677715b..02e60f05 100644 --- a/ce/docs/WebViewPage.md +++ b/ce/docs/WebViewPage.md @@ -9,10 +9,10 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **url** | **String** | Url | [optional] | | **label** | **String** | Page label | [optional] | | **visible** | **Boolean** | Indicates if page is visible | | | **icon** | **String** | URL of the page icon | [optional] | +| **url** | **String** | Url | [optional] | diff --git a/ce/spec/openapi.json b/ce/spec/openapi.json index 944c3d8c..2b0fbb68 100644 --- a/ce/spec/openapi.json +++ b/ce/spec/openapi.json @@ -45232,7 +45232,7 @@ "message": "User password expired!", "errorCode": 15, "timestamp": 1609459200000, - "resetToken": "uUNiGaibsmdojca25XYNJcReKFDoKI" + "resetToken": "udgDQOpS1Q4ZFEL8qHF9s8cSKQ7d1h" } } } @@ -45340,7 +45340,7 @@ "message": "User password expired!", "errorCode": 15, "timestamp": 1609459200000, - "resetToken": "uUNiGaibsmdojca25XYNJcReKFDoKI" + "resetToken": "udgDQOpS1Q4ZFEL8qHF9s8cSKQ7d1h" } } } @@ -68252,7 +68252,7 @@ "telemetry-controller" ], "summary": "Delete entity attributes (deleteEntityAttributes)", - "description": "Delete entity attributes using provided Entity Id, scope and a list of keys. Referencing a non-existing entity Id or invalid entity type will cause an error. \n\nAvailable for users with 'TENANT_ADMIN' or 'CUSTOMER_USER' authority.", + "description": "Delete entity attributes using provided Entity Id, scope and a list of keys. This operation is idempotent: keys that do not exist are silently ignored and the response is still 200 OK. Referencing a non-existing entity Id or invalid entity type will cause an error. \n\nAvailable for users with 'TENANT_ADMIN' or 'CUSTOMER_USER' authority.", "operationId": "deleteEntityAttributes", "parameters": [ { @@ -68310,7 +68310,7 @@ ], "responses": { "200": { - "description": "Entity attributes was removed for the selected keys in the request. Platform creates an audit log event about entity attributes removal with action type 'ATTRIBUTES_DELETED'.", + "description": "Entity attributes were removed for the selected keys in the request (keys that did not exist are silently ignored). Platform creates an audit log event about entity attributes removal with action type 'ATTRIBUTES_DELETED'.", "content": { "application/json": { "schema": { @@ -82940,7 +82940,10 @@ }, "additionalInfo": { "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the asset" + "description": "Additional parameters of the asset. May include: 'description' (string).", + "example": { + "description": "Building A asset" + } } }, "required": [ @@ -83044,7 +83047,10 @@ }, "additionalInfo": { "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the asset" + "description": "Additional parameters of the asset. May include: 'description' (string).", + "example": { + "description": "Building A asset" + } } }, "required": [ @@ -83236,11 +83242,6 @@ { "type": "object", "properties": { - "assetType": { - "type": "string", - "deprecated": true, - "writeOnly": true - }, "assetTypes": { "type": "array", "items": { @@ -83249,6 +83250,11 @@ }, "assetNameFilter": { "type": "string" + }, + "assetType": { + "type": "string", + "deprecated": true, + "writeOnly": true } } } @@ -84121,10 +84127,6 @@ "description": "String value representing the server name, identifier or ip address where the platform is running", "example": "ip-172-31-24-152" }, - "isError": { - "type": "boolean", - "writeOnly": true - }, "errorStr": { "type": "string", "description": "The case insensitive 'contains' filter based on error message", @@ -84173,6 +84175,10 @@ "x + y": 32 } }, + "isError": { + "type": "boolean", + "writeOnly": true + }, "error": { "type": "boolean" } @@ -84683,11 +84689,6 @@ { "type": "object", "properties": { - "path": { - "type": "string", - "description": "Path to custom page", - "example": "/alarmDetails/868c7083-032d-4f52-b8b4-7859aebb6a4e" - }, "label": { "type": "string", "description": "Page label", @@ -84702,6 +84703,11 @@ "type": "string", "description": "URL of the page icon", "example": "home_icon" + }, + "path": { + "type": "string", + "description": "Path to custom page", + "example": "/alarmDetails/868c7083-032d-4f52-b8b4-7859aebb6a4e" } } } @@ -84826,7 +84832,13 @@ }, "additionalInfo": { "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the device" + "description": "Additional parameters of the customer. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar), 'isPublic' (boolean, whether this is a public customer).", + "example": { + "description": "Regional customer", + "homeDashboardId": "784f394c-42b6-435a-983c-b7beff2784f9", + "homeDashboardHideToolbar": false, + "isPublic": false + } } }, "required": [ @@ -84889,6 +84901,22 @@ "Dashboard": { "type": "object", "properties": { + "id": { + "$ref": "#/components/schemas/DashboardId", + "description": "JSON object with the dashboard Id. Specify existing dashboard Id to update the dashboard. Referencing non-existing dashboard id will cause error. Omit this field to create new dashboard." + }, + "createdTime": { + "type": "integer", + "format": "int64", + "description": "Timestamp of the dashboard creation, in milliseconds", + "example": 1609459200000, + "readOnly": true + }, + "tenantId": { + "$ref": "#/components/schemas/TenantId", + "description": "JSON object with Tenant Id. Tenant Id of the dashboard can't be changed.", + "readOnly": true + }, "title": { "type": "string", "description": "Title of the dashboard." @@ -84898,6 +84926,15 @@ "description": "Thumbnail picture for rendering of the dashboards in a grid view on mobile devices.", "readOnly": true }, + "assignedCustomers": { + "type": "array", + "description": "List of assigned customers with their info.", + "items": { + "$ref": "#/components/schemas/ShortCustomerInfo" + }, + "readOnly": true, + "uniqueItems": true + }, "mobileHide": { "type": "boolean", "description": "Hide dashboard from mobile devices. Useful if the dashboard is not designed for small screens.", @@ -84909,14 +84946,9 @@ "description": "Order on mobile devices. Useful to adjust sorting of the dashboards for mobile applications", "readOnly": true }, - "configuration": { - "$ref": "#/components/schemas/JsonNode", - "description": "JSON object with main configuration of the dashboard: layouts, widgets, aliases, etc. The JSON structure of the dashboard configuration is quite complex. The easiest way to learn it is to export existing dashboard to JSON." - }, - "name": { - "type": "string", - "description": "Same as title of the dashboard. Read-only field. Update the 'title' to change the 'name' of the dashboard.", - "readOnly": true + "version": { + "type": "integer", + "format": "int64" }, "resources": { "type": "array", @@ -84924,34 +84956,14 @@ "$ref": "#/components/schemas/ResourceExportData" } }, - "id": { - "$ref": "#/components/schemas/DashboardId", - "description": "JSON object with the dashboard Id. Specify existing dashboard Id to update the dashboard. Referencing non-existing dashboard id will cause error. Omit this field to create new dashboard." - }, - "createdTime": { - "type": "integer", - "format": "int64", - "description": "Timestamp of the dashboard creation, in milliseconds", - "example": 1609459200000, - "readOnly": true + "configuration": { + "$ref": "#/components/schemas/JsonNode", + "description": "JSON object with main configuration of the dashboard: layouts, widgets, aliases, etc. The JSON structure of the dashboard configuration is quite complex. The easiest way to learn it is to export existing dashboard to JSON." }, - "tenantId": { - "$ref": "#/components/schemas/TenantId", - "description": "JSON object with Tenant Id. Tenant Id of the dashboard can't be changed.", + "name": { + "type": "string", + "description": "Same as title of the dashboard. Read-only field. Update the 'title' to change the 'name' of the dashboard.", "readOnly": true - }, - "assignedCustomers": { - "type": "array", - "description": "List of assigned customers with their info.", - "items": { - "$ref": "#/components/schemas/ShortCustomerInfo" - }, - "readOnly": true, - "uniqueItems": true - }, - "version": { - "type": "integer", - "format": "int64" } }, "required": [ @@ -85061,11 +85073,6 @@ { "type": "object", "properties": { - "dashboardId": { - "type": "string", - "description": "Dashboard id", - "example": "784f394c-42b6-435a-983c-b7beff2784f9" - }, "label": { "type": "string", "description": "Page label", @@ -85080,6 +85087,11 @@ "type": "string", "description": "URL of the page icon", "example": "home_icon" + }, + "dashboardId": { + "type": "string", + "description": "Dashboard id", + "example": "784f394c-42b6-435a-983c-b7beff2784f9" } } } @@ -85198,11 +85210,6 @@ { "type": "object", "properties": { - "id": { - "$ref": "#/components/schemas/DefaultPageId", - "description": "Identifier for default page", - "example": "HOME" - }, "label": { "type": "string", "description": "Page label", @@ -85217,6 +85224,11 @@ "type": "string", "description": "URL of the page icon", "example": "home_icon" + }, + "id": { + "$ref": "#/components/schemas/DefaultPageId", + "description": "Identifier for default page", + "example": "HOME" } } } @@ -85675,7 +85687,12 @@ }, "additionalInfo": { "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the device" + "description": "Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device).", + "example": { + "gateway": false, + "description": "Temperature sensor", + "lastConnectedGateway": "784f394c-42b6-435a-983c-b7beff2784f9" + } }, "deviceData": { "$ref": "#/components/schemas/DeviceData", @@ -85981,7 +85998,12 @@ }, "additionalInfo": { "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the device" + "description": "Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device).", + "example": { + "gateway": false, + "description": "Temperature sensor", + "lastConnectedGateway": "784f394c-42b6-435a-983c-b7beff2784f9" + } }, "deviceData": { "$ref": "#/components/schemas/DeviceData", @@ -86396,11 +86418,6 @@ { "type": "object", "properties": { - "deviceType": { - "type": "string", - "deprecated": true, - "writeOnly": true - }, "deviceTypes": { "type": "array", "items": { @@ -86409,6 +86426,11 @@ }, "deviceNameFilter": { "type": "string" + }, + "deviceType": { + "type": "string", + "deprecated": true, + "writeOnly": true } } } @@ -86791,7 +86813,11 @@ "format": "int64" }, "additionalInfo": { - "$ref": "#/components/schemas/JsonNode" + "$ref": "#/components/schemas/JsonNode", + "description": "Additional parameters of the edge. May include: 'description' (string).", + "example": { + "description": "Edge at location A" + } } }, "required": [ @@ -87112,7 +87138,11 @@ "type": "boolean" }, "additionalInfo": { - "$ref": "#/components/schemas/JsonNode" + "$ref": "#/components/schemas/JsonNode", + "description": "Additional parameters of the edge. May include: 'description' (string).", + "example": { + "description": "Edge at location A" + } } }, "required": [ @@ -87199,11 +87229,6 @@ { "type": "object", "properties": { - "edgeType": { - "type": "string", - "deprecated": true, - "writeOnly": true - }, "edgeTypes": { "type": "array", "items": { @@ -87212,6 +87237,11 @@ }, "edgeNameFilter": { "type": "string" + }, + "edgeType": { + "type": "string", + "deprecated": true, + "writeOnly": true } } } @@ -87861,7 +87891,10 @@ }, "additionalInfo": { "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the relation" + "description": "Additional parameters of the relation.", + "example": { + "description": "Power supply connection" + } } }, "required": [ @@ -87911,7 +87944,10 @@ }, "additionalInfo": { "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the relation" + "description": "Additional parameters of the relation.", + "example": { + "description": "Power supply connection" + } } }, "required": [ @@ -88189,7 +88225,10 @@ }, "additionalInfo": { "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the device" + "description": "Additional parameters of the entity view. May include: 'description' (string).", + "example": { + "description": "Temperature readings view" + } } }, "required": [ @@ -88299,7 +88338,10 @@ }, "additionalInfo": { "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the device" + "description": "Additional parameters of the entity view. May include: 'description' (string).", + "example": { + "description": "Temperature readings view" + } } }, "required": [ @@ -88377,11 +88419,6 @@ { "type": "object", "properties": { - "entityViewType": { - "type": "string", - "deprecated": true, - "writeOnly": true - }, "entityViewTypes": { "type": "array", "items": { @@ -88390,6 +88427,11 @@ }, "entityViewNameFilter": { "type": "string" + }, + "entityViewType": { + "type": "string", + "deprecated": true, + "writeOnly": true } } } @@ -88578,19 +88620,19 @@ "FeaturesInfo": { "type": "object", "properties": { - "twoFaEnabled": { + "smsEnabled": { "type": "boolean" }, - "emailEnabled": { + "oauthEnabled": { "type": "boolean" }, - "smsEnabled": { + "notificationEnabled": { "type": "boolean" }, - "oauthEnabled": { + "twoFaEnabled": { "type": "boolean" }, - "notificationEnabled": { + "emailEnabled": { "type": "boolean" } } @@ -91287,12 +91329,12 @@ "NotificationTargetExportData": { "type": "object", "properties": { - "entityType": { - "$ref": "#/components/schemas/EntityType" - }, "entity": { "$ref": "#/components/schemas/ExportableEntity" }, + "entityType": { + "$ref": "#/components/schemas/EntityType" + }, "relations": { "type": "array", "items": { @@ -95361,10 +95403,6 @@ "description": "String value representing the server name, identifier or ip address where the platform is running", "example": "ip-172-31-24-152" }, - "isError": { - "type": "boolean", - "writeOnly": true - }, "errorStr": { "type": "string", "description": "The case insensitive 'contains' filter based on error message", @@ -95374,6 +95412,10 @@ "type": "string", "description": "String value representing the message" }, + "isError": { + "type": "boolean", + "writeOnly": true + }, "error": { "type": "boolean" } @@ -95671,7 +95713,12 @@ }, "additionalInfo": { "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the rule node. Contains 'layoutX' and 'layoutY' properties for visualization." + "description": "Additional parameters of the rule node. May include: 'layoutX' (number, X coordinate for visualization), 'layoutY' (number, Y coordinate for visualization), 'description' (string).", + "example": { + "layoutX": 320, + "layoutY": 160, + "description": "Filter temperature data" + } } } }, @@ -95688,10 +95735,6 @@ "description": "String value representing the server name, identifier or ip address where the platform is running", "example": "ip-172-31-24-152" }, - "isError": { - "type": "boolean", - "writeOnly": true - }, "errorStr": { "type": "string", "description": "The case insensitive 'contains' filter based on error message", @@ -95742,6 +95785,10 @@ "description": "The case insensitive 'contains' filter based on metadata (key and value) for the message.", "example": "deviceName" }, + "isError": { + "type": "boolean", + "writeOnly": true + }, "error": { "type": "boolean" } @@ -97370,7 +97417,12 @@ }, "additionalInfo": { "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the device" + "description": "Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar).", + "example": { + "description": "Main tenant", + "homeDashboardId": "784f394c-42b6-435a-983c-b7beff2784f9", + "homeDashboardHideToolbar": true + } } }, "required": [ @@ -97512,7 +97564,12 @@ }, "additionalInfo": { "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the device" + "description": "Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar).", + "example": { + "description": "Main tenant", + "homeDashboardId": "784f394c-42b6-435a-983c-b7beff2784f9", + "homeDashboardHideToolbar": true + } } }, "required": [ @@ -98313,7 +98370,14 @@ }, "additionalInfo": { "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the user" + "description": "Additional parameters of the user. May include: 'defaultDashboardId' (string, UUID of the default dashboard), 'defaultDashboardFullscreen' (boolean), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean), 'lang' (string, user locale, e.g. 'en_US'), 'authProviderName' (string, name of the authentication provider).", + "example": { + "defaultDashboardId": "784f394c-42b6-435a-983c-b7beff2784f9", + "defaultDashboardFullscreen": false, + "homeDashboardId": "784f394c-42b6-435a-983c-b7beff2784f9", + "homeDashboardHideToolbar": true, + "lang": "en_US" + } } }, "required": [ @@ -98727,11 +98791,6 @@ { "type": "object", "properties": { - "url": { - "type": "string", - "description": "Url", - "example": "/url" - }, "label": { "type": "string", "description": "Page label", @@ -98746,6 +98805,11 @@ "type": "string", "description": "URL of the page icon", "example": "home_icon" + }, + "url": { + "type": "string", + "description": "Url", + "example": "/url" } } } diff --git a/ce/src/main/java/org/thingsboard/client/api/ThingsboardApi.java b/ce/src/main/java/org/thingsboard/client/api/ThingsboardApi.java index a70987f6..88525735 100644 --- a/ce/src/main/java/org/thingsboard/client/api/ThingsboardApi.java +++ b/ce/src/main/java/org/thingsboard/client/api/ThingsboardApi.java @@ -6741,7 +6741,7 @@ private HttpRequest.Builder deleteEdgeRequestBuilder(@javax.annotation.Nonnull S /** * Delete entity attributes (deleteEntityAttributes) - * Delete entity attributes using provided Entity Id, scope and a list of keys. Referencing a non-existing entity Id or invalid entity type will cause an error. Available for users with 'TENANT_ADMIN' or 'CUSTOMER_USER' authority. + * Delete entity attributes using provided Entity Id, scope and a list of keys. This operation is idempotent: keys that do not exist are silently ignored and the response is still 200 OK. Referencing a non-existing entity Id or invalid entity type will cause an error. Available for users with 'TENANT_ADMIN' or 'CUSTOMER_USER' authority. * @param entityType A string value representing the entity type. For example, 'DEVICE' (required) * @param entityId A string value representing the entity id. For example, '784f394c-42b6-435a-983c-b7beff2784f9' (required) * @param scope A string value representing the attributes scope. For example, 'SERVER_SCOPE'. (required) @@ -6756,7 +6756,7 @@ public String deleteEntityAttributes(@javax.annotation.Nonnull String entityType /** * Delete entity attributes (deleteEntityAttributes) - * Delete entity attributes using provided Entity Id, scope and a list of keys. Referencing a non-existing entity Id or invalid entity type will cause an error. Available for users with 'TENANT_ADMIN' or 'CUSTOMER_USER' authority. + * Delete entity attributes using provided Entity Id, scope and a list of keys. This operation is idempotent: keys that do not exist are silently ignored and the response is still 200 OK. Referencing a non-existing entity Id or invalid entity type will cause an error. Available for users with 'TENANT_ADMIN' or 'CUSTOMER_USER' authority. * @param entityType A string value representing the entity type. For example, 'DEVICE' (required) * @param entityId A string value representing the entity id. For example, '784f394c-42b6-435a-983c-b7beff2784f9' (required) * @param scope A string value representing the attributes scope. For example, 'SERVER_SCOPE'. (required) @@ -6773,7 +6773,7 @@ public String deleteEntityAttributes(@javax.annotation.Nonnull String entityType /** * Delete entity attributes (deleteEntityAttributes) - * Delete entity attributes using provided Entity Id, scope and a list of keys. Referencing a non-existing entity Id or invalid entity type will cause an error. Available for users with 'TENANT_ADMIN' or 'CUSTOMER_USER' authority. + * Delete entity attributes using provided Entity Id, scope and a list of keys. This operation is idempotent: keys that do not exist are silently ignored and the response is still 200 OK. Referencing a non-existing entity Id or invalid entity type will cause an error. Available for users with 'TENANT_ADMIN' or 'CUSTOMER_USER' authority. * @param entityType A string value representing the entity type. For example, 'DEVICE' (required) * @param entityId A string value representing the entity id. For example, '784f394c-42b6-435a-983c-b7beff2784f9' (required) * @param scope A string value representing the attributes scope. For example, 'SERVER_SCOPE'. (required) @@ -6788,7 +6788,7 @@ public ApiResponse deleteEntityAttributesWithHttpInfo(@javax.annotation. /** * Delete entity attributes (deleteEntityAttributes) - * Delete entity attributes using provided Entity Id, scope and a list of keys. Referencing a non-existing entity Id or invalid entity type will cause an error. Available for users with 'TENANT_ADMIN' or 'CUSTOMER_USER' authority. + * Delete entity attributes using provided Entity Id, scope and a list of keys. This operation is idempotent: keys that do not exist are silently ignored and the response is still 200 OK. Referencing a non-existing entity Id or invalid entity type will cause an error. Available for users with 'TENANT_ADMIN' or 'CUSTOMER_USER' authority. * @param entityType A string value representing the entity type. For example, 'DEVICE' (required) * @param entityId A string value representing the entity id. For example, '784f394c-42b6-435a-983c-b7beff2784f9' (required) * @param scope A string value representing the attributes scope. For example, 'SERVER_SCOPE'. (required) diff --git a/ce/src/main/java/org/thingsboard/client/model/Asset.java b/ce/src/main/java/org/thingsboard/client/model/Asset.java index d99035be..b7a87447 100644 --- a/ce/src/main/java/org/thingsboard/client/model/Asset.java +++ b/ce/src/main/java/org/thingsboard/client/model/Asset.java @@ -299,7 +299,7 @@ public Asset additionalInfo(@javax.annotation.Nullable com.fasterxml.jackson.dat } /** - * Additional parameters of the asset + * Additional parameters of the asset. May include: 'description' (string). * @return additionalInfo */ @javax.annotation.Nullable diff --git a/ce/src/main/java/org/thingsboard/client/model/AssetInfo.java b/ce/src/main/java/org/thingsboard/client/model/AssetInfo.java index e32bf570..ba43e7a4 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AssetInfo.java +++ b/ce/src/main/java/org/thingsboard/client/model/AssetInfo.java @@ -362,7 +362,7 @@ public AssetInfo additionalInfo(@javax.annotation.Nullable com.fasterxml.jackson } /** - * Additional parameters of the asset + * Additional parameters of the asset. May include: 'description' (string). * @return additionalInfo */ @javax.annotation.Nullable diff --git a/ce/src/main/java/org/thingsboard/client/model/AssetTypeFilter.java b/ce/src/main/java/org/thingsboard/client/model/AssetTypeFilter.java index da719270..bb1737ee 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AssetTypeFilter.java +++ b/ce/src/main/java/org/thingsboard/client/model/AssetTypeFilter.java @@ -42,9 +42,9 @@ * AssetTypeFilter */ @JsonPropertyOrder({ - AssetTypeFilter.JSON_PROPERTY_ASSET_TYPE, AssetTypeFilter.JSON_PROPERTY_ASSET_TYPES, - AssetTypeFilter.JSON_PROPERTY_ASSET_NAME_FILTER + AssetTypeFilter.JSON_PROPERTY_ASSET_NAME_FILTER, + AssetTypeFilter.JSON_PROPERTY_ASSET_TYPE }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @JsonIgnoreProperties( @@ -54,10 +54,6 @@ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = true) public class AssetTypeFilter extends EntityFilter { - public static final String JSON_PROPERTY_ASSET_TYPE = "assetType"; - @javax.annotation.Nullable - private String assetType; - public static final String JSON_PROPERTY_ASSET_TYPES = "assetTypes"; @javax.annotation.Nullable private List assetTypes = new ArrayList<>(); @@ -66,35 +62,13 @@ public class AssetTypeFilter extends EntityFilter { @javax.annotation.Nullable private String assetNameFilter; - public AssetTypeFilter() { - } - - public AssetTypeFilter assetType(@javax.annotation.Nullable String assetType) { - this.assetType = assetType; - return this; - } - - /** - * Get assetType - * @return assetType - * @deprecated - */ - @Deprecated + public static final String JSON_PROPERTY_ASSET_TYPE = "assetType"; @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_ASSET_TYPE, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getAssetType() { - return assetType; - } - + private String assetType; - @JsonProperty(value = JSON_PROPERTY_ASSET_TYPE, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAssetType(@javax.annotation.Nullable String assetType) { - this.assetType = assetType; + public AssetTypeFilter() { } - public AssetTypeFilter assetTypes(@javax.annotation.Nullable List assetTypes) { this.assetTypes = assetTypes; return this; @@ -151,6 +125,32 @@ public void setAssetNameFilter(@javax.annotation.Nullable String assetNameFilter } + public AssetTypeFilter assetType(@javax.annotation.Nullable String assetType) { + this.assetType = assetType; + return this; + } + + /** + * Get assetType + * @return assetType + * @deprecated + */ + @Deprecated + @javax.annotation.Nullable + @JsonProperty(value = JSON_PROPERTY_ASSET_TYPE, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getAssetType() { + return assetType; + } + + + @JsonProperty(value = JSON_PROPERTY_ASSET_TYPE, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAssetType(@javax.annotation.Nullable String assetType) { + this.assetType = assetType; + } + + @Override public AssetTypeFilter type(@javax.annotation.Nonnull String type) { this.setType(type); @@ -169,15 +169,15 @@ public boolean equals(Object o) { return false; } AssetTypeFilter assetTypeFilter = (AssetTypeFilter) o; - return Objects.equals(this.assetType, assetTypeFilter.assetType) && - Objects.equals(this.assetTypes, assetTypeFilter.assetTypes) && + return Objects.equals(this.assetTypes, assetTypeFilter.assetTypes) && Objects.equals(this.assetNameFilter, assetTypeFilter.assetNameFilter) && + Objects.equals(this.assetType, assetTypeFilter.assetType) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(assetType, assetTypes, assetNameFilter, super.hashCode()); + return Objects.hash(assetTypes, assetNameFilter, assetType, super.hashCode()); } @Override @@ -185,9 +185,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AssetTypeFilter {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" assetType: ").append(toIndentedString(assetType)).append("\n"); sb.append(" assetTypes: ").append(toIndentedString(assetTypes)).append("\n"); sb.append(" assetNameFilter: ").append(toIndentedString(assetNameFilter)).append("\n"); + sb.append(" assetType: ").append(toIndentedString(assetType)).append("\n"); sb.append("}"); return sb.toString(); } @@ -240,11 +240,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%stype%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getType())))); } - // add `assetType` to the URL query string - if (getAssetType() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sassetType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAssetType())))); - } - // add `assetTypes` to the URL query string if (getAssetTypes() != null) { for (int i = 0; i < getAssetTypes().size(); i++) { @@ -259,6 +254,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sassetNameFilter%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAssetNameFilter())))); } + // add `assetType` to the URL query string + if (getAssetType() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sassetType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAssetType())))); + } + return joiner.toString(); } static { diff --git a/ce/src/main/java/org/thingsboard/client/model/CalculatedFieldDebugEventFilter.java b/ce/src/main/java/org/thingsboard/client/model/CalculatedFieldDebugEventFilter.java index 0a51d437..d24b4447 100644 --- a/ce/src/main/java/org/thingsboard/client/model/CalculatedFieldDebugEventFilter.java +++ b/ce/src/main/java/org/thingsboard/client/model/CalculatedFieldDebugEventFilter.java @@ -42,7 +42,6 @@ */ @JsonPropertyOrder({ CalculatedFieldDebugEventFilter.JSON_PROPERTY_SERVER, - CalculatedFieldDebugEventFilter.JSON_PROPERTY_IS_ERROR, CalculatedFieldDebugEventFilter.JSON_PROPERTY_ERROR_STR, CalculatedFieldDebugEventFilter.JSON_PROPERTY_ENTITY_ID, CalculatedFieldDebugEventFilter.JSON_PROPERTY_ENTITY_TYPE, @@ -50,6 +49,7 @@ CalculatedFieldDebugEventFilter.JSON_PROPERTY_MSG_TYPE, CalculatedFieldDebugEventFilter.JSON_PROPERTY_ARGUMENTS, CalculatedFieldDebugEventFilter.JSON_PROPERTY_RESULT, + CalculatedFieldDebugEventFilter.JSON_PROPERTY_IS_ERROR, CalculatedFieldDebugEventFilter.JSON_PROPERTY_ERROR }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @@ -64,10 +64,6 @@ public class CalculatedFieldDebugEventFilter extends EventFilter { @javax.annotation.Nullable private String server; - public static final String JSON_PROPERTY_IS_ERROR = "isError"; - @javax.annotation.Nullable - private Boolean isError; - public static final String JSON_PROPERTY_ERROR_STR = "errorStr"; @javax.annotation.Nullable private String errorStr; @@ -129,6 +125,10 @@ public static EntityTypeEnum fromValue(String value) { @javax.annotation.Nullable private String result; + public static final String JSON_PROPERTY_IS_ERROR = "isError"; + @javax.annotation.Nullable + private Boolean isError; + public static final String JSON_PROPERTY_ERROR = "error"; @javax.annotation.Nullable private Boolean error; @@ -160,30 +160,6 @@ public void setServer(@javax.annotation.Nullable String server) { } - public CalculatedFieldDebugEventFilter isError(@javax.annotation.Nullable Boolean isError) { - this.isError = isError; - return this; - } - - /** - * Get isError - * @return isError - */ - @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_IS_ERROR, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Boolean getIsError() { - return isError; - } - - - @JsonProperty(value = JSON_PROPERTY_IS_ERROR, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setIsError(@javax.annotation.Nullable Boolean isError) { - this.isError = isError; - } - - public CalculatedFieldDebugEventFilter errorStr(@javax.annotation.Nullable String errorStr) { this.errorStr = errorStr; return this; @@ -352,6 +328,30 @@ public void setResult(@javax.annotation.Nullable String result) { } + public CalculatedFieldDebugEventFilter isError(@javax.annotation.Nullable Boolean isError) { + this.isError = isError; + return this; + } + + /** + * Get isError + * @return isError + */ + @javax.annotation.Nullable + @JsonProperty(value = JSON_PROPERTY_IS_ERROR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Boolean getIsError() { + return isError; + } + + + @JsonProperty(value = JSON_PROPERTY_IS_ERROR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setIsError(@javax.annotation.Nullable Boolean isError) { + this.isError = isError; + } + + public CalculatedFieldDebugEventFilter error(@javax.annotation.Nullable Boolean error) { this.error = error; return this; @@ -401,7 +401,6 @@ public boolean equals(Object o) { } CalculatedFieldDebugEventFilter calculatedFieldDebugEventFilter = (CalculatedFieldDebugEventFilter) o; return Objects.equals(this.server, calculatedFieldDebugEventFilter.server) && - Objects.equals(this.isError, calculatedFieldDebugEventFilter.isError) && Objects.equals(this.errorStr, calculatedFieldDebugEventFilter.errorStr) && Objects.equals(this.entityId, calculatedFieldDebugEventFilter.entityId) && Objects.equals(this.entityType, calculatedFieldDebugEventFilter.entityType) && @@ -409,13 +408,14 @@ public boolean equals(Object o) { Objects.equals(this.msgType, calculatedFieldDebugEventFilter.msgType) && Objects.equals(this.arguments, calculatedFieldDebugEventFilter.arguments) && Objects.equals(this.result, calculatedFieldDebugEventFilter.result) && + Objects.equals(this.isError, calculatedFieldDebugEventFilter.isError) && Objects.equals(this.error, calculatedFieldDebugEventFilter.error) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(server, isError, errorStr, entityId, entityType, msgId, msgType, arguments, result, error, super.hashCode()); + return Objects.hash(server, errorStr, entityId, entityType, msgId, msgType, arguments, result, isError, error, super.hashCode()); } @Override @@ -424,7 +424,6 @@ public String toString() { sb.append("class CalculatedFieldDebugEventFilter {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" server: ").append(toIndentedString(server)).append("\n"); - sb.append(" isError: ").append(toIndentedString(isError)).append("\n"); sb.append(" errorStr: ").append(toIndentedString(errorStr)).append("\n"); sb.append(" entityId: ").append(toIndentedString(entityId)).append("\n"); sb.append(" entityType: ").append(toIndentedString(entityType)).append("\n"); @@ -432,6 +431,7 @@ public String toString() { sb.append(" msgType: ").append(toIndentedString(msgType)).append("\n"); sb.append(" arguments: ").append(toIndentedString(arguments)).append("\n"); sb.append(" result: ").append(toIndentedString(result)).append("\n"); + sb.append(" isError: ").append(toIndentedString(isError)).append("\n"); sb.append(" error: ").append(toIndentedString(error)).append("\n"); sb.append("}"); return sb.toString(); @@ -495,11 +495,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sserver%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getServer())))); } - // add `isError` to the URL query string - if (getIsError() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sisError%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getIsError())))); - } - // add `errorStr` to the URL query string if (getErrorStr() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%serrorStr%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getErrorStr())))); @@ -535,6 +530,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sresult%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getResult())))); } + // add `isError` to the URL query string + if (getIsError() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sisError%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getIsError())))); + } + // 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())))); diff --git a/ce/src/main/java/org/thingsboard/client/model/CustomMobilePage.java b/ce/src/main/java/org/thingsboard/client/model/CustomMobilePage.java index f47b069c..832857f3 100644 --- a/ce/src/main/java/org/thingsboard/client/model/CustomMobilePage.java +++ b/ce/src/main/java/org/thingsboard/client/model/CustomMobilePage.java @@ -41,10 +41,10 @@ * CustomMobilePage */ @JsonPropertyOrder({ - CustomMobilePage.JSON_PROPERTY_PATH, CustomMobilePage.JSON_PROPERTY_LABEL, CustomMobilePage.JSON_PROPERTY_VISIBLE, - CustomMobilePage.JSON_PROPERTY_ICON + CustomMobilePage.JSON_PROPERTY_ICON, + CustomMobilePage.JSON_PROPERTY_PATH }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @JsonIgnoreProperties( @@ -54,10 +54,6 @@ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = true) public class CustomMobilePage extends MobilePage { - public static final String JSON_PROPERTY_PATH = "path"; - @javax.annotation.Nullable - private String path; - public static final String JSON_PROPERTY_LABEL = "label"; @javax.annotation.Nullable private String label; @@ -70,33 +66,13 @@ public class CustomMobilePage extends MobilePage { @javax.annotation.Nullable private String icon; - public CustomMobilePage() { - } - - public CustomMobilePage path(@javax.annotation.Nullable String path) { - this.path = path; - return this; - } - - /** - * Path to custom page - * @return path - */ + public static final String JSON_PROPERTY_PATH = "path"; @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_PATH, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getPath() { - return path; - } - + private String path; - @JsonProperty(value = JSON_PROPERTY_PATH, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setPath(@javax.annotation.Nullable String path) { - this.path = path; + public CustomMobilePage() { } - public CustomMobilePage label(@javax.annotation.Nullable String label) { this.label = label; return this; @@ -169,6 +145,30 @@ public void setIcon(@javax.annotation.Nullable String icon) { } + public CustomMobilePage path(@javax.annotation.Nullable String path) { + this.path = path; + return this; + } + + /** + * Path to custom page + * @return path + */ + @javax.annotation.Nullable + @JsonProperty(value = JSON_PROPERTY_PATH, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getPath() { + return path; + } + + + @JsonProperty(value = JSON_PROPERTY_PATH, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPath(@javax.annotation.Nullable String path) { + this.path = path; + } + + @Override public CustomMobilePage type(@javax.annotation.Nonnull MobilePageType type) { this.setType(type); @@ -187,16 +187,16 @@ public boolean equals(Object o) { return false; } CustomMobilePage customMobilePage = (CustomMobilePage) o; - return Objects.equals(this.path, customMobilePage.path) && - Objects.equals(this.label, customMobilePage.label) && + return Objects.equals(this.label, customMobilePage.label) && Objects.equals(this.visible, customMobilePage.visible) && Objects.equals(this.icon, customMobilePage.icon) && + Objects.equals(this.path, customMobilePage.path) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(path, label, visible, icon, super.hashCode()); + return Objects.hash(label, visible, icon, path, super.hashCode()); } @Override @@ -204,10 +204,10 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class CustomMobilePage {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" path: ").append(toIndentedString(path)).append("\n"); sb.append(" label: ").append(toIndentedString(label)).append("\n"); sb.append(" visible: ").append(toIndentedString(visible)).append("\n"); sb.append(" icon: ").append(toIndentedString(icon)).append("\n"); + sb.append(" path: ").append(toIndentedString(path)).append("\n"); sb.append("}"); return sb.toString(); } @@ -265,11 +265,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%svisible%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getVisible())))); } - // add `path` to the URL query string - if (getPath() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%spath%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPath())))); - } - // add `label` to the URL query string if (getLabel() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%slabel%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getLabel())))); @@ -280,6 +275,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sicon%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getIcon())))); } + // add `path` to the URL query string + if (getPath() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%spath%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPath())))); + } + return joiner.toString(); } static { diff --git a/ce/src/main/java/org/thingsboard/client/model/Customer.java b/ce/src/main/java/org/thingsboard/client/model/Customer.java index 0856c5a2..69ec69f0 100644 --- a/ce/src/main/java/org/thingsboard/client/model/Customer.java +++ b/ce/src/main/java/org/thingsboard/client/model/Customer.java @@ -450,7 +450,7 @@ public Customer additionalInfo(@javax.annotation.Nullable com.fasterxml.jackson. } /** - * Additional parameters of the device + * Additional parameters of the customer. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar), 'isPublic' (boolean, whether this is a public customer). * @return additionalInfo */ @javax.annotation.Nullable diff --git a/ce/src/main/java/org/thingsboard/client/model/Dashboard.java b/ce/src/main/java/org/thingsboard/client/model/Dashboard.java index 0d56c575..82e43370 100644 --- a/ce/src/main/java/org/thingsboard/client/model/Dashboard.java +++ b/ce/src/main/java/org/thingsboard/client/model/Dashboard.java @@ -44,21 +44,33 @@ * Dashboard */ @JsonPropertyOrder({ + Dashboard.JSON_PROPERTY_ID, + Dashboard.JSON_PROPERTY_CREATED_TIME, + Dashboard.JSON_PROPERTY_TENANT_ID, Dashboard.JSON_PROPERTY_TITLE, Dashboard.JSON_PROPERTY_IMAGE, + Dashboard.JSON_PROPERTY_ASSIGNED_CUSTOMERS, Dashboard.JSON_PROPERTY_MOBILE_HIDE, Dashboard.JSON_PROPERTY_MOBILE_ORDER, - Dashboard.JSON_PROPERTY_CONFIGURATION, - Dashboard.JSON_PROPERTY_NAME, + Dashboard.JSON_PROPERTY_VERSION, Dashboard.JSON_PROPERTY_RESOURCES, - Dashboard.JSON_PROPERTY_ID, - Dashboard.JSON_PROPERTY_CREATED_TIME, - Dashboard.JSON_PROPERTY_TENANT_ID, - Dashboard.JSON_PROPERTY_ASSIGNED_CUSTOMERS, - Dashboard.JSON_PROPERTY_VERSION + Dashboard.JSON_PROPERTY_CONFIGURATION, + Dashboard.JSON_PROPERTY_NAME }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") public class Dashboard { + public static final String JSON_PROPERTY_ID = "id"; + @javax.annotation.Nullable + private DashboardId id; + + public static final String JSON_PROPERTY_CREATED_TIME = "createdTime"; + @javax.annotation.Nullable + private Long createdTime; + + public static final String JSON_PROPERTY_TENANT_ID = "tenantId"; + @javax.annotation.Nullable + private TenantId tenantId; + public static final String JSON_PROPERTY_TITLE = "title"; @javax.annotation.Nonnull private String title; @@ -67,6 +79,10 @@ public class Dashboard { @javax.annotation.Nullable private String image; + public static final String JSON_PROPERTY_ASSIGNED_CUSTOMERS = "assignedCustomers"; + @javax.annotation.Nullable + private Set assignedCustomers = new LinkedHashSet<>(); + public static final String JSON_PROPERTY_MOBILE_HIDE = "mobileHide"; @javax.annotation.Nullable private Boolean mobileHide; @@ -75,59 +91,95 @@ public class Dashboard { @javax.annotation.Nullable private Integer mobileOrder; - public static final String JSON_PROPERTY_CONFIGURATION = "configuration"; - @javax.annotation.Nullable - private com.fasterxml.jackson.databind.JsonNode _configuration; - - public static final String JSON_PROPERTY_NAME = "name"; + public static final String JSON_PROPERTY_VERSION = "version"; @javax.annotation.Nullable - private String name; + private Long version; public static final String JSON_PROPERTY_RESOURCES = "resources"; @javax.annotation.Nullable private List resources = new ArrayList<>(); - public static final String JSON_PROPERTY_ID = "id"; - @javax.annotation.Nullable - private DashboardId id; - - public static final String JSON_PROPERTY_CREATED_TIME = "createdTime"; - @javax.annotation.Nullable - private Long createdTime; - - public static final String JSON_PROPERTY_TENANT_ID = "tenantId"; - @javax.annotation.Nullable - private TenantId tenantId; - - public static final String JSON_PROPERTY_ASSIGNED_CUSTOMERS = "assignedCustomers"; + public static final String JSON_PROPERTY_CONFIGURATION = "configuration"; @javax.annotation.Nullable - private Set assignedCustomers = new LinkedHashSet<>(); + private com.fasterxml.jackson.databind.JsonNode _configuration; - public static final String JSON_PROPERTY_VERSION = "version"; + public static final String JSON_PROPERTY_NAME = "name"; @javax.annotation.Nullable - private Long version; + private String name; public Dashboard() { } @JsonCreator public Dashboard( + @JsonProperty(JSON_PROPERTY_CREATED_TIME) Long createdTime, + @JsonProperty(JSON_PROPERTY_TENANT_ID) TenantId tenantId, @JsonProperty(JSON_PROPERTY_IMAGE) String image, @JsonProperty(JSON_PROPERTY_MOBILE_HIDE) Boolean mobileHide, @JsonProperty(JSON_PROPERTY_MOBILE_ORDER) Integer mobileOrder, - @JsonProperty(JSON_PROPERTY_NAME) String name, - @JsonProperty(JSON_PROPERTY_CREATED_TIME) Long createdTime, - @JsonProperty(JSON_PROPERTY_TENANT_ID) TenantId tenantId + @JsonProperty(JSON_PROPERTY_NAME) String name ) { this(); + this.createdTime = createdTime; + this.tenantId = tenantId; this.image = image; this.mobileHide = mobileHide; this.mobileOrder = mobileOrder; this.name = name; - this.createdTime = createdTime; - this.tenantId = tenantId; } + public Dashboard id(@javax.annotation.Nullable DashboardId id) { + this.id = id; + return this; + } + + /** + * JSON object with the dashboard Id. Specify existing dashboard Id to update the dashboard. Referencing non-existing dashboard id will cause error. Omit this field to create new dashboard. + * @return id + */ + @javax.annotation.Nullable + @JsonProperty(value = JSON_PROPERTY_ID, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public DashboardId getId() { + return id; + } + + + @JsonProperty(value = JSON_PROPERTY_ID, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setId(@javax.annotation.Nullable DashboardId id) { + this.id = id; + } + + + /** + * Timestamp of the dashboard creation, in milliseconds + * @return createdTime + */ + @javax.annotation.Nullable + @JsonProperty(value = JSON_PROPERTY_CREATED_TIME, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long getCreatedTime() { + return createdTime; + } + + + + + /** + * JSON object with Tenant Id. Tenant Id of the dashboard can't be changed. + * @return tenantId + */ + @javax.annotation.Nullable + @JsonProperty(value = JSON_PROPERTY_TENANT_ID, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public TenantId getTenantId() { + return tenantId; + } + + + + public Dashboard title(@javax.annotation.Nonnull String title) { this.title = title; return this; @@ -166,6 +218,39 @@ public String getImage() { + public Dashboard assignedCustomers(@javax.annotation.Nullable Set assignedCustomers) { + this.assignedCustomers = assignedCustomers; + return this; + } + + public Dashboard addAssignedCustomersItem(ShortCustomerInfo assignedCustomersItem) { + if (this.assignedCustomers == null) { + this.assignedCustomers = new LinkedHashSet<>(); + } + this.assignedCustomers.add(assignedCustomersItem); + return this; + } + + /** + * List of assigned customers with their info. + * @return assignedCustomers + */ + @javax.annotation.Nullable + @JsonProperty(value = JSON_PROPERTY_ASSIGNED_CUSTOMERS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Set getAssignedCustomers() { + return assignedCustomers; + } + + + @JsonDeserialize(as = LinkedHashSet.class) + @JsonProperty(value = JSON_PROPERTY_ASSIGNED_CUSTOMERS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAssignedCustomers(@javax.annotation.Nullable Set assignedCustomers) { + this.assignedCustomers = assignedCustomers; + } + + /** * Hide dashboard from mobile devices. Useful if the dashboard is not designed for small screens. * @return mobileHide @@ -194,44 +279,30 @@ public Integer getMobileOrder() { - public Dashboard _configuration(@javax.annotation.Nullable com.fasterxml.jackson.databind.JsonNode _configuration) { - this._configuration = _configuration; + public Dashboard version(@javax.annotation.Nullable Long version) { + this.version = version; return this; } /** - * JSON object with main configuration of the dashboard: layouts, widgets, aliases, etc. The JSON structure of the dashboard configuration is quite complex. The easiest way to learn it is to export existing dashboard to JSON. - * @return _configuration + * Get version + * @return version */ @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_CONFIGURATION, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getConfiguration() { - return _configuration; - } - - - @JsonProperty(value = JSON_PROPERTY_CONFIGURATION, required = false) + @JsonProperty(value = JSON_PROPERTY_VERSION, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setConfiguration(@javax.annotation.Nullable com.fasterxml.jackson.databind.JsonNode _configuration) { - this._configuration = _configuration; + public Long getVersion() { + return version; } - /** - * Same as title of the dashboard. Read-only field. Update the 'title' to change the 'name' of the dashboard. - * @return name - */ - @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_NAME, required = false) + @JsonProperty(value = JSON_PROPERTY_VERSION, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getName() { - return name; + public void setVersion(@javax.annotation.Nullable Long version) { + this.version = version; } - - public Dashboard resources(@javax.annotation.Nullable List resources) { this.resources = resources; return this; @@ -264,113 +335,42 @@ public void setResources(@javax.annotation.Nullable List res } - public Dashboard id(@javax.annotation.Nullable DashboardId id) { - this.id = id; - return this; - } - - /** - * JSON object with the dashboard Id. Specify existing dashboard Id to update the dashboard. Referencing non-existing dashboard id will cause error. Omit this field to create new dashboard. - * @return id - */ - @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_ID, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public DashboardId getId() { - return id; - } - - - @JsonProperty(value = JSON_PROPERTY_ID, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setId(@javax.annotation.Nullable DashboardId id) { - this.id = id; - } - - - /** - * Timestamp of the dashboard creation, in milliseconds - * @return createdTime - */ - @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_CREATED_TIME, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Long getCreatedTime() { - return createdTime; - } - - - - - /** - * JSON object with Tenant Id. Tenant Id of the dashboard can't be changed. - * @return tenantId - */ - @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_TENANT_ID, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public TenantId getTenantId() { - return tenantId; - } - - - - - public Dashboard assignedCustomers(@javax.annotation.Nullable Set assignedCustomers) { - this.assignedCustomers = assignedCustomers; - return this; - } - - public Dashboard addAssignedCustomersItem(ShortCustomerInfo assignedCustomersItem) { - if (this.assignedCustomers == null) { - this.assignedCustomers = new LinkedHashSet<>(); - } - this.assignedCustomers.add(assignedCustomersItem); + public Dashboard _configuration(@javax.annotation.Nullable com.fasterxml.jackson.databind.JsonNode _configuration) { + this._configuration = _configuration; return this; } /** - * List of assigned customers with their info. - * @return assignedCustomers + * JSON object with main configuration of the dashboard: layouts, widgets, aliases, etc. The JSON structure of the dashboard configuration is quite complex. The easiest way to learn it is to export existing dashboard to JSON. + * @return _configuration */ @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_ASSIGNED_CUSTOMERS, required = false) + @JsonProperty(value = JSON_PROPERTY_CONFIGURATION, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Set getAssignedCustomers() { - return assignedCustomers; + public com.fasterxml.jackson.databind.JsonNode getConfiguration() { + return _configuration; } - @JsonDeserialize(as = LinkedHashSet.class) - @JsonProperty(value = JSON_PROPERTY_ASSIGNED_CUSTOMERS, required = false) + @JsonProperty(value = JSON_PROPERTY_CONFIGURATION, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAssignedCustomers(@javax.annotation.Nullable Set assignedCustomers) { - this.assignedCustomers = assignedCustomers; + public void setConfiguration(@javax.annotation.Nullable com.fasterxml.jackson.databind.JsonNode _configuration) { + this._configuration = _configuration; } - public Dashboard version(@javax.annotation.Nullable Long version) { - this.version = version; - return this; - } - /** - * Get version - * @return version + * Same as title of the dashboard. Read-only field. Update the 'title' to change the 'name' of the dashboard. + * @return name */ @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_VERSION, required = false) + @JsonProperty(value = JSON_PROPERTY_NAME, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Long getVersion() { - return version; + public String getName() { + return name; } - @JsonProperty(value = JSON_PROPERTY_VERSION, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setVersion(@javax.annotation.Nullable Long version) { - this.version = version; - } /** @@ -385,41 +385,41 @@ public boolean equals(Object o) { return false; } Dashboard dashboard = (Dashboard) o; - return Objects.equals(this.title, dashboard.title) && + return Objects.equals(this.id, dashboard.id) && + Objects.equals(this.createdTime, dashboard.createdTime) && + Objects.equals(this.tenantId, dashboard.tenantId) && + Objects.equals(this.title, dashboard.title) && Objects.equals(this.image, dashboard.image) && + Objects.equals(this.assignedCustomers, dashboard.assignedCustomers) && Objects.equals(this.mobileHide, dashboard.mobileHide) && Objects.equals(this.mobileOrder, dashboard.mobileOrder) && - Objects.equals(this._configuration, dashboard._configuration) && - Objects.equals(this.name, dashboard.name) && + Objects.equals(this.version, dashboard.version) && Objects.equals(this.resources, dashboard.resources) && - Objects.equals(this.id, dashboard.id) && - Objects.equals(this.createdTime, dashboard.createdTime) && - Objects.equals(this.tenantId, dashboard.tenantId) && - Objects.equals(this.assignedCustomers, dashboard.assignedCustomers) && - Objects.equals(this.version, dashboard.version); + Objects.equals(this._configuration, dashboard._configuration) && + Objects.equals(this.name, dashboard.name); } @Override public int hashCode() { - return Objects.hash(title, image, mobileHide, mobileOrder, _configuration, name, resources, id, createdTime, tenantId, assignedCustomers, version); + return Objects.hash(id, createdTime, tenantId, title, image, assignedCustomers, mobileHide, mobileOrder, version, resources, _configuration, name); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Dashboard {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" tenantId: ").append(toIndentedString(tenantId)).append("\n"); sb.append(" title: ").append(toIndentedString(title)).append("\n"); sb.append(" image: ").append(toIndentedString(image)).append("\n"); + sb.append(" assignedCustomers: ").append(toIndentedString(assignedCustomers)).append("\n"); sb.append(" mobileHide: ").append(toIndentedString(mobileHide)).append("\n"); sb.append(" mobileOrder: ").append(toIndentedString(mobileOrder)).append("\n"); + sb.append(" version: ").append(toIndentedString(version)).append("\n"); + sb.append(" resources: ").append(toIndentedString(resources)).append("\n"); sb.append(" _configuration: ").append(toIndentedString(_configuration)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" resources: ").append(toIndentedString(resources)).append("\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); - sb.append(" tenantId: ").append(toIndentedString(tenantId)).append("\n"); - sb.append(" assignedCustomers: ").append(toIndentedString(assignedCustomers)).append("\n"); - sb.append(" version: ").append(toIndentedString(version)).append("\n"); sb.append("}"); return sb.toString(); } @@ -467,6 +467,21 @@ public String toUrlQueryString(String prefix) { StringJoiner joiner = new StringJoiner("&"); + // add `id` to the URL query string + if (getId() != null) { + joiner.add(getId().toUrlQueryString(prefix + "id" + suffix)); + } + + // add `createdTime` to the URL query string + if (getCreatedTime() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); + } + + // add `tenantId` to the URL query string + if (getTenantId() != null) { + joiner.add(getTenantId().toUrlQueryString(prefix + "tenantId" + suffix)); + } + // add `title` to the URL query string if (getTitle() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%stitle%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getTitle())))); @@ -477,6 +492,18 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%simage%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getImage())))); } + // add `assignedCustomers` to the URL query string + if (getAssignedCustomers() != null) { + int i = 0; + for (ShortCustomerInfo _item : getAssignedCustomers()) { + if (_item != null) { + joiner.add(_item.toUrlQueryString(String.format(java.util.Locale.ROOT, "%sassignedCustomers%s%s", prefix, suffix, + "".equals(suffix) ? "" : String.format(java.util.Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix)))); + } + } + i++; + } + // add `mobileHide` to the URL query string if (getMobileHide() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%smobileHide%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMobileHide())))); @@ -487,14 +514,9 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%smobileOrder%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMobileOrder())))); } - // add `configuration` to the URL query string - if (getConfiguration() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sconfiguration%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getConfiguration())))); - } - - // add `name` to the URL query string - if (getName() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); + // add `version` to the URL query string + if (getVersion() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sversion%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getVersion())))); } // add `resources` to the URL query string @@ -507,36 +529,14 @@ public String toUrlQueryString(String prefix) { } } - // add `id` to the URL query string - if (getId() != null) { - joiner.add(getId().toUrlQueryString(prefix + "id" + suffix)); - } - - // add `createdTime` to the URL query string - if (getCreatedTime() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); - } - - // add `tenantId` to the URL query string - if (getTenantId() != null) { - joiner.add(getTenantId().toUrlQueryString(prefix + "tenantId" + suffix)); - } - - // add `assignedCustomers` to the URL query string - if (getAssignedCustomers() != null) { - int i = 0; - for (ShortCustomerInfo _item : getAssignedCustomers()) { - if (_item != null) { - joiner.add(_item.toUrlQueryString(String.format(java.util.Locale.ROOT, "%sassignedCustomers%s%s", prefix, suffix, - "".equals(suffix) ? "" : String.format(java.util.Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix)))); - } - } - i++; + // add `configuration` to the URL query string + if (getConfiguration() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sconfiguration%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getConfiguration())))); } - // add `version` to the URL query string - if (getVersion() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sversion%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getVersion())))); + // add `name` to the URL query string + if (getName() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); } return joiner.toString(); diff --git a/ce/src/main/java/org/thingsboard/client/model/DashboardPage.java b/ce/src/main/java/org/thingsboard/client/model/DashboardPage.java index 4bc5c381..f20ac3ac 100644 --- a/ce/src/main/java/org/thingsboard/client/model/DashboardPage.java +++ b/ce/src/main/java/org/thingsboard/client/model/DashboardPage.java @@ -41,10 +41,10 @@ * DashboardPage */ @JsonPropertyOrder({ - DashboardPage.JSON_PROPERTY_DASHBOARD_ID, DashboardPage.JSON_PROPERTY_LABEL, DashboardPage.JSON_PROPERTY_VISIBLE, - DashboardPage.JSON_PROPERTY_ICON + DashboardPage.JSON_PROPERTY_ICON, + DashboardPage.JSON_PROPERTY_DASHBOARD_ID }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @JsonIgnoreProperties( @@ -54,10 +54,6 @@ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = true) public class DashboardPage extends MobilePage { - public static final String JSON_PROPERTY_DASHBOARD_ID = "dashboardId"; - @javax.annotation.Nullable - private String dashboardId; - public static final String JSON_PROPERTY_LABEL = "label"; @javax.annotation.Nullable private String label; @@ -70,33 +66,13 @@ public class DashboardPage extends MobilePage { @javax.annotation.Nullable private String icon; - public DashboardPage() { - } - - public DashboardPage dashboardId(@javax.annotation.Nullable String dashboardId) { - this.dashboardId = dashboardId; - return this; - } - - /** - * Dashboard id - * @return dashboardId - */ + public static final String JSON_PROPERTY_DASHBOARD_ID = "dashboardId"; @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_DASHBOARD_ID, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getDashboardId() { - return dashboardId; - } - + private String dashboardId; - @JsonProperty(value = JSON_PROPERTY_DASHBOARD_ID, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDashboardId(@javax.annotation.Nullable String dashboardId) { - this.dashboardId = dashboardId; + public DashboardPage() { } - public DashboardPage label(@javax.annotation.Nullable String label) { this.label = label; return this; @@ -169,6 +145,30 @@ public void setIcon(@javax.annotation.Nullable String icon) { } + public DashboardPage dashboardId(@javax.annotation.Nullable String dashboardId) { + this.dashboardId = dashboardId; + return this; + } + + /** + * Dashboard id + * @return dashboardId + */ + @javax.annotation.Nullable + @JsonProperty(value = JSON_PROPERTY_DASHBOARD_ID, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getDashboardId() { + return dashboardId; + } + + + @JsonProperty(value = JSON_PROPERTY_DASHBOARD_ID, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setDashboardId(@javax.annotation.Nullable String dashboardId) { + this.dashboardId = dashboardId; + } + + @Override public DashboardPage type(@javax.annotation.Nonnull MobilePageType type) { this.setType(type); @@ -187,16 +187,16 @@ public boolean equals(Object o) { return false; } DashboardPage dashboardPage = (DashboardPage) o; - return Objects.equals(this.dashboardId, dashboardPage.dashboardId) && - Objects.equals(this.label, dashboardPage.label) && + return Objects.equals(this.label, dashboardPage.label) && Objects.equals(this.visible, dashboardPage.visible) && Objects.equals(this.icon, dashboardPage.icon) && + Objects.equals(this.dashboardId, dashboardPage.dashboardId) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(dashboardId, label, visible, icon, super.hashCode()); + return Objects.hash(label, visible, icon, dashboardId, super.hashCode()); } @Override @@ -204,10 +204,10 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class DashboardPage {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" dashboardId: ").append(toIndentedString(dashboardId)).append("\n"); sb.append(" label: ").append(toIndentedString(label)).append("\n"); sb.append(" visible: ").append(toIndentedString(visible)).append("\n"); sb.append(" icon: ").append(toIndentedString(icon)).append("\n"); + sb.append(" dashboardId: ").append(toIndentedString(dashboardId)).append("\n"); sb.append("}"); return sb.toString(); } @@ -265,11 +265,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%svisible%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getVisible())))); } - // add `dashboardId` to the URL query string - if (getDashboardId() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sdashboardId%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDashboardId())))); - } - // add `label` to the URL query string if (getLabel() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%slabel%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getLabel())))); @@ -280,6 +275,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sicon%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getIcon())))); } + // add `dashboardId` to the URL query string + if (getDashboardId() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sdashboardId%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDashboardId())))); + } + return joiner.toString(); } static { diff --git a/ce/src/main/java/org/thingsboard/client/model/DefaultMobilePage.java b/ce/src/main/java/org/thingsboard/client/model/DefaultMobilePage.java index ca5f7a23..7a9fb2c7 100644 --- a/ce/src/main/java/org/thingsboard/client/model/DefaultMobilePage.java +++ b/ce/src/main/java/org/thingsboard/client/model/DefaultMobilePage.java @@ -42,10 +42,10 @@ * DefaultMobilePage */ @JsonPropertyOrder({ - DefaultMobilePage.JSON_PROPERTY_ID, DefaultMobilePage.JSON_PROPERTY_LABEL, DefaultMobilePage.JSON_PROPERTY_VISIBLE, - DefaultMobilePage.JSON_PROPERTY_ICON + DefaultMobilePage.JSON_PROPERTY_ICON, + DefaultMobilePage.JSON_PROPERTY_ID }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @JsonIgnoreProperties( @@ -55,10 +55,6 @@ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = true) public class DefaultMobilePage extends MobilePage { - public static final String JSON_PROPERTY_ID = "id"; - @javax.annotation.Nullable - private DefaultPageId id; - public static final String JSON_PROPERTY_LABEL = "label"; @javax.annotation.Nullable private String label; @@ -71,33 +67,13 @@ public class DefaultMobilePage extends MobilePage { @javax.annotation.Nullable private String icon; - public DefaultMobilePage() { - } - - public DefaultMobilePage id(@javax.annotation.Nullable DefaultPageId id) { - this.id = id; - return this; - } - - /** - * Identifier for default page - * @return id - */ + public static final String JSON_PROPERTY_ID = "id"; @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_ID, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public DefaultPageId getId() { - return id; - } - + private DefaultPageId id; - @JsonProperty(value = JSON_PROPERTY_ID, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setId(@javax.annotation.Nullable DefaultPageId id) { - this.id = id; + public DefaultMobilePage() { } - public DefaultMobilePage label(@javax.annotation.Nullable String label) { this.label = label; return this; @@ -170,6 +146,30 @@ public void setIcon(@javax.annotation.Nullable String icon) { } + public DefaultMobilePage id(@javax.annotation.Nullable DefaultPageId id) { + this.id = id; + return this; + } + + /** + * Identifier for default page + * @return id + */ + @javax.annotation.Nullable + @JsonProperty(value = JSON_PROPERTY_ID, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public DefaultPageId getId() { + return id; + } + + + @JsonProperty(value = JSON_PROPERTY_ID, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setId(@javax.annotation.Nullable DefaultPageId id) { + this.id = id; + } + + @Override public DefaultMobilePage type(@javax.annotation.Nonnull MobilePageType type) { this.setType(type); @@ -188,16 +188,16 @@ public boolean equals(Object o) { return false; } DefaultMobilePage defaultMobilePage = (DefaultMobilePage) o; - return Objects.equals(this.id, defaultMobilePage.id) && - Objects.equals(this.label, defaultMobilePage.label) && + return Objects.equals(this.label, defaultMobilePage.label) && Objects.equals(this.visible, defaultMobilePage.visible) && Objects.equals(this.icon, defaultMobilePage.icon) && + Objects.equals(this.id, defaultMobilePage.id) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(id, label, visible, icon, super.hashCode()); + return Objects.hash(label, visible, icon, id, super.hashCode()); } @Override @@ -205,10 +205,10 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class DefaultMobilePage {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" label: ").append(toIndentedString(label)).append("\n"); sb.append(" visible: ").append(toIndentedString(visible)).append("\n"); sb.append(" icon: ").append(toIndentedString(icon)).append("\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append("}"); return sb.toString(); } @@ -266,11 +266,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%svisible%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getVisible())))); } - // add `id` to the URL query string - if (getId() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); - } - // add `label` to the URL query string if (getLabel() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%slabel%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getLabel())))); @@ -281,6 +276,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sicon%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getIcon())))); } + // add `id` to the URL query string + if (getId() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sid%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getId())))); + } + return joiner.toString(); } static { diff --git a/ce/src/main/java/org/thingsboard/client/model/Device.java b/ce/src/main/java/org/thingsboard/client/model/Device.java index 8103aa56..ec5f9690 100644 --- a/ce/src/main/java/org/thingsboard/client/model/Device.java +++ b/ce/src/main/java/org/thingsboard/client/model/Device.java @@ -364,7 +364,7 @@ public Device additionalInfo(@javax.annotation.Nullable com.fasterxml.jackson.da } /** - * Additional parameters of the device + * Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device). * @return additionalInfo */ @javax.annotation.Nullable diff --git a/ce/src/main/java/org/thingsboard/client/model/DeviceInfo.java b/ce/src/main/java/org/thingsboard/client/model/DeviceInfo.java index 770f8009..2eb5acdf 100644 --- a/ce/src/main/java/org/thingsboard/client/model/DeviceInfo.java +++ b/ce/src/main/java/org/thingsboard/client/model/DeviceInfo.java @@ -448,7 +448,7 @@ public DeviceInfo additionalInfo(@javax.annotation.Nullable com.fasterxml.jackso } /** - * Additional parameters of the device + * Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device). * @return additionalInfo */ @javax.annotation.Nullable diff --git a/ce/src/main/java/org/thingsboard/client/model/DeviceTypeFilter.java b/ce/src/main/java/org/thingsboard/client/model/DeviceTypeFilter.java index 09e5eedd..73bd7616 100644 --- a/ce/src/main/java/org/thingsboard/client/model/DeviceTypeFilter.java +++ b/ce/src/main/java/org/thingsboard/client/model/DeviceTypeFilter.java @@ -42,9 +42,9 @@ * DeviceTypeFilter */ @JsonPropertyOrder({ - DeviceTypeFilter.JSON_PROPERTY_DEVICE_TYPE, DeviceTypeFilter.JSON_PROPERTY_DEVICE_TYPES, - DeviceTypeFilter.JSON_PROPERTY_DEVICE_NAME_FILTER + DeviceTypeFilter.JSON_PROPERTY_DEVICE_NAME_FILTER, + DeviceTypeFilter.JSON_PROPERTY_DEVICE_TYPE }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @JsonIgnoreProperties( @@ -54,10 +54,6 @@ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = true) public class DeviceTypeFilter extends EntityFilter { - public static final String JSON_PROPERTY_DEVICE_TYPE = "deviceType"; - @javax.annotation.Nullable - private String deviceType; - public static final String JSON_PROPERTY_DEVICE_TYPES = "deviceTypes"; @javax.annotation.Nullable private List deviceTypes = new ArrayList<>(); @@ -66,35 +62,13 @@ public class DeviceTypeFilter extends EntityFilter { @javax.annotation.Nullable private String deviceNameFilter; - public DeviceTypeFilter() { - } - - public DeviceTypeFilter deviceType(@javax.annotation.Nullable String deviceType) { - this.deviceType = deviceType; - return this; - } - - /** - * Get deviceType - * @return deviceType - * @deprecated - */ - @Deprecated + public static final String JSON_PROPERTY_DEVICE_TYPE = "deviceType"; @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_DEVICE_TYPE, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getDeviceType() { - return deviceType; - } - + private String deviceType; - @JsonProperty(value = JSON_PROPERTY_DEVICE_TYPE, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDeviceType(@javax.annotation.Nullable String deviceType) { - this.deviceType = deviceType; + public DeviceTypeFilter() { } - public DeviceTypeFilter deviceTypes(@javax.annotation.Nullable List deviceTypes) { this.deviceTypes = deviceTypes; return this; @@ -151,6 +125,32 @@ public void setDeviceNameFilter(@javax.annotation.Nullable String deviceNameFilt } + public DeviceTypeFilter deviceType(@javax.annotation.Nullable String deviceType) { + this.deviceType = deviceType; + return this; + } + + /** + * Get deviceType + * @return deviceType + * @deprecated + */ + @Deprecated + @javax.annotation.Nullable + @JsonProperty(value = JSON_PROPERTY_DEVICE_TYPE, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getDeviceType() { + return deviceType; + } + + + @JsonProperty(value = JSON_PROPERTY_DEVICE_TYPE, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setDeviceType(@javax.annotation.Nullable String deviceType) { + this.deviceType = deviceType; + } + + @Override public DeviceTypeFilter type(@javax.annotation.Nonnull String type) { this.setType(type); @@ -169,15 +169,15 @@ public boolean equals(Object o) { return false; } DeviceTypeFilter deviceTypeFilter = (DeviceTypeFilter) o; - return Objects.equals(this.deviceType, deviceTypeFilter.deviceType) && - Objects.equals(this.deviceTypes, deviceTypeFilter.deviceTypes) && + return Objects.equals(this.deviceTypes, deviceTypeFilter.deviceTypes) && Objects.equals(this.deviceNameFilter, deviceTypeFilter.deviceNameFilter) && + Objects.equals(this.deviceType, deviceTypeFilter.deviceType) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(deviceType, deviceTypes, deviceNameFilter, super.hashCode()); + return Objects.hash(deviceTypes, deviceNameFilter, deviceType, super.hashCode()); } @Override @@ -185,9 +185,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class DeviceTypeFilter {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" deviceType: ").append(toIndentedString(deviceType)).append("\n"); sb.append(" deviceTypes: ").append(toIndentedString(deviceTypes)).append("\n"); sb.append(" deviceNameFilter: ").append(toIndentedString(deviceNameFilter)).append("\n"); + sb.append(" deviceType: ").append(toIndentedString(deviceType)).append("\n"); sb.append("}"); return sb.toString(); } @@ -240,11 +240,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%stype%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getType())))); } - // add `deviceType` to the URL query string - if (getDeviceType() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sdeviceType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDeviceType())))); - } - // add `deviceTypes` to the URL query string if (getDeviceTypes() != null) { for (int i = 0; i < getDeviceTypes().size(); i++) { @@ -259,6 +254,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sdeviceNameFilter%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDeviceNameFilter())))); } + // add `deviceType` to the URL query string + if (getDeviceType() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sdeviceType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDeviceType())))); + } + return joiner.toString(); } static { diff --git a/ce/src/main/java/org/thingsboard/client/model/Edge.java b/ce/src/main/java/org/thingsboard/client/model/Edge.java index 7f20d4fb..4630c5d1 100644 --- a/ce/src/main/java/org/thingsboard/client/model/Edge.java +++ b/ce/src/main/java/org/thingsboard/client/model/Edge.java @@ -100,7 +100,7 @@ public class Edge { public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; @javax.annotation.Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo = null; + private com.fasterxml.jackson.databind.JsonNode additionalInfo; public Edge() { } @@ -349,7 +349,7 @@ public Edge additionalInfo(@javax.annotation.Nullable com.fasterxml.jackson.data } /** - * Get additionalInfo + * Additional parameters of the edge. May include: 'description' (string). * @return additionalInfo */ @javax.annotation.Nullable diff --git a/ce/src/main/java/org/thingsboard/client/model/EdgeInfo.java b/ce/src/main/java/org/thingsboard/client/model/EdgeInfo.java index e4ab4ea9..0fb634c8 100644 --- a/ce/src/main/java/org/thingsboard/client/model/EdgeInfo.java +++ b/ce/src/main/java/org/thingsboard/client/model/EdgeInfo.java @@ -110,7 +110,7 @@ public class EdgeInfo { public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; @javax.annotation.Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo = null; + private com.fasterxml.jackson.databind.JsonNode additionalInfo; public EdgeInfo() { } @@ -407,7 +407,7 @@ public EdgeInfo additionalInfo(@javax.annotation.Nullable com.fasterxml.jackson. } /** - * Get additionalInfo + * Additional parameters of the edge. May include: 'description' (string). * @return additionalInfo */ @javax.annotation.Nullable diff --git a/ce/src/main/java/org/thingsboard/client/model/EdgeTypeFilter.java b/ce/src/main/java/org/thingsboard/client/model/EdgeTypeFilter.java index ae09f398..52452af6 100644 --- a/ce/src/main/java/org/thingsboard/client/model/EdgeTypeFilter.java +++ b/ce/src/main/java/org/thingsboard/client/model/EdgeTypeFilter.java @@ -42,9 +42,9 @@ * EdgeTypeFilter */ @JsonPropertyOrder({ - EdgeTypeFilter.JSON_PROPERTY_EDGE_TYPE, EdgeTypeFilter.JSON_PROPERTY_EDGE_TYPES, - EdgeTypeFilter.JSON_PROPERTY_EDGE_NAME_FILTER + EdgeTypeFilter.JSON_PROPERTY_EDGE_NAME_FILTER, + EdgeTypeFilter.JSON_PROPERTY_EDGE_TYPE }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @JsonIgnoreProperties( @@ -54,10 +54,6 @@ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = true) public class EdgeTypeFilter extends EntityFilter { - public static final String JSON_PROPERTY_EDGE_TYPE = "edgeType"; - @javax.annotation.Nullable - private String edgeType; - public static final String JSON_PROPERTY_EDGE_TYPES = "edgeTypes"; @javax.annotation.Nullable private List edgeTypes = new ArrayList<>(); @@ -66,35 +62,13 @@ public class EdgeTypeFilter extends EntityFilter { @javax.annotation.Nullable private String edgeNameFilter; - public EdgeTypeFilter() { - } - - public EdgeTypeFilter edgeType(@javax.annotation.Nullable String edgeType) { - this.edgeType = edgeType; - return this; - } - - /** - * Get edgeType - * @return edgeType - * @deprecated - */ - @Deprecated + public static final String JSON_PROPERTY_EDGE_TYPE = "edgeType"; @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_EDGE_TYPE, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getEdgeType() { - return edgeType; - } - + private String edgeType; - @JsonProperty(value = JSON_PROPERTY_EDGE_TYPE, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setEdgeType(@javax.annotation.Nullable String edgeType) { - this.edgeType = edgeType; + public EdgeTypeFilter() { } - public EdgeTypeFilter edgeTypes(@javax.annotation.Nullable List edgeTypes) { this.edgeTypes = edgeTypes; return this; @@ -151,6 +125,32 @@ public void setEdgeNameFilter(@javax.annotation.Nullable String edgeNameFilter) } + public EdgeTypeFilter edgeType(@javax.annotation.Nullable String edgeType) { + this.edgeType = edgeType; + return this; + } + + /** + * Get edgeType + * @return edgeType + * @deprecated + */ + @Deprecated + @javax.annotation.Nullable + @JsonProperty(value = JSON_PROPERTY_EDGE_TYPE, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getEdgeType() { + return edgeType; + } + + + @JsonProperty(value = JSON_PROPERTY_EDGE_TYPE, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setEdgeType(@javax.annotation.Nullable String edgeType) { + this.edgeType = edgeType; + } + + @Override public EdgeTypeFilter type(@javax.annotation.Nonnull String type) { this.setType(type); @@ -169,15 +169,15 @@ public boolean equals(Object o) { return false; } EdgeTypeFilter edgeTypeFilter = (EdgeTypeFilter) o; - return Objects.equals(this.edgeType, edgeTypeFilter.edgeType) && - Objects.equals(this.edgeTypes, edgeTypeFilter.edgeTypes) && + return Objects.equals(this.edgeTypes, edgeTypeFilter.edgeTypes) && Objects.equals(this.edgeNameFilter, edgeTypeFilter.edgeNameFilter) && + Objects.equals(this.edgeType, edgeTypeFilter.edgeType) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(edgeType, edgeTypes, edgeNameFilter, super.hashCode()); + return Objects.hash(edgeTypes, edgeNameFilter, edgeType, super.hashCode()); } @Override @@ -185,9 +185,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class EdgeTypeFilter {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" edgeType: ").append(toIndentedString(edgeType)).append("\n"); sb.append(" edgeTypes: ").append(toIndentedString(edgeTypes)).append("\n"); sb.append(" edgeNameFilter: ").append(toIndentedString(edgeNameFilter)).append("\n"); + sb.append(" edgeType: ").append(toIndentedString(edgeType)).append("\n"); sb.append("}"); return sb.toString(); } @@ -240,11 +240,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%stype%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getType())))); } - // add `edgeType` to the URL query string - if (getEdgeType() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sedgeType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEdgeType())))); - } - // add `edgeTypes` to the URL query string if (getEdgeTypes() != null) { for (int i = 0; i < getEdgeTypes().size(); i++) { @@ -259,6 +254,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sedgeNameFilter%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEdgeNameFilter())))); } + // add `edgeType` to the URL query string + if (getEdgeType() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sedgeType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEdgeType())))); + } + return joiner.toString(); } static { diff --git a/ce/src/main/java/org/thingsboard/client/model/EntityRelation.java b/ce/src/main/java/org/thingsboard/client/model/EntityRelation.java index 839163cd..ba971f99 100644 --- a/ce/src/main/java/org/thingsboard/client/model/EntityRelation.java +++ b/ce/src/main/java/org/thingsboard/client/model/EntityRelation.java @@ -199,7 +199,7 @@ public EntityRelation additionalInfo(@javax.annotation.Nullable com.fasterxml.ja } /** - * Additional parameters of the relation + * Additional parameters of the relation. * @return additionalInfo */ @javax.annotation.Nullable diff --git a/ce/src/main/java/org/thingsboard/client/model/EntityRelationInfo.java b/ce/src/main/java/org/thingsboard/client/model/EntityRelationInfo.java index 842257ed..18e0df33 100644 --- a/ce/src/main/java/org/thingsboard/client/model/EntityRelationInfo.java +++ b/ce/src/main/java/org/thingsboard/client/model/EntityRelationInfo.java @@ -247,7 +247,7 @@ public EntityRelationInfo additionalInfo(@javax.annotation.Nullable com.fasterxm } /** - * Additional parameters of the relation + * Additional parameters of the relation. * @return additionalInfo */ @javax.annotation.Nullable diff --git a/ce/src/main/java/org/thingsboard/client/model/EntityView.java b/ce/src/main/java/org/thingsboard/client/model/EntityView.java index 28698423..aad23d8e 100644 --- a/ce/src/main/java/org/thingsboard/client/model/EntityView.java +++ b/ce/src/main/java/org/thingsboard/client/model/EntityView.java @@ -358,7 +358,7 @@ public EntityView additionalInfo(@javax.annotation.Nullable com.fasterxml.jackso } /** - * Additional parameters of the device + * Additional parameters of the entity view. May include: 'description' (string). * @return additionalInfo */ @javax.annotation.Nullable diff --git a/ce/src/main/java/org/thingsboard/client/model/EntityViewInfo.java b/ce/src/main/java/org/thingsboard/client/model/EntityViewInfo.java index 12ed4a28..2963893a 100644 --- a/ce/src/main/java/org/thingsboard/client/model/EntityViewInfo.java +++ b/ce/src/main/java/org/thingsboard/client/model/EntityViewInfo.java @@ -400,7 +400,7 @@ public EntityViewInfo additionalInfo(@javax.annotation.Nullable com.fasterxml.ja } /** - * Additional parameters of the device + * Additional parameters of the entity view. May include: 'description' (string). * @return additionalInfo */ @javax.annotation.Nullable diff --git a/ce/src/main/java/org/thingsboard/client/model/EntityViewTypeFilter.java b/ce/src/main/java/org/thingsboard/client/model/EntityViewTypeFilter.java index e8bd7482..484da5e6 100644 --- a/ce/src/main/java/org/thingsboard/client/model/EntityViewTypeFilter.java +++ b/ce/src/main/java/org/thingsboard/client/model/EntityViewTypeFilter.java @@ -42,9 +42,9 @@ * EntityViewTypeFilter */ @JsonPropertyOrder({ - EntityViewTypeFilter.JSON_PROPERTY_ENTITY_VIEW_TYPE, EntityViewTypeFilter.JSON_PROPERTY_ENTITY_VIEW_TYPES, - EntityViewTypeFilter.JSON_PROPERTY_ENTITY_VIEW_NAME_FILTER + EntityViewTypeFilter.JSON_PROPERTY_ENTITY_VIEW_NAME_FILTER, + EntityViewTypeFilter.JSON_PROPERTY_ENTITY_VIEW_TYPE }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @JsonIgnoreProperties( @@ -54,10 +54,6 @@ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = true) public class EntityViewTypeFilter extends EntityFilter { - public static final String JSON_PROPERTY_ENTITY_VIEW_TYPE = "entityViewType"; - @javax.annotation.Nullable - private String entityViewType; - public static final String JSON_PROPERTY_ENTITY_VIEW_TYPES = "entityViewTypes"; @javax.annotation.Nullable private List entityViewTypes = new ArrayList<>(); @@ -66,35 +62,13 @@ public class EntityViewTypeFilter extends EntityFilter { @javax.annotation.Nullable private String entityViewNameFilter; - public EntityViewTypeFilter() { - } - - public EntityViewTypeFilter entityViewType(@javax.annotation.Nullable String entityViewType) { - this.entityViewType = entityViewType; - return this; - } - - /** - * Get entityViewType - * @return entityViewType - * @deprecated - */ - @Deprecated + public static final String JSON_PROPERTY_ENTITY_VIEW_TYPE = "entityViewType"; @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_ENTITY_VIEW_TYPE, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getEntityViewType() { - return entityViewType; - } - + private String entityViewType; - @JsonProperty(value = JSON_PROPERTY_ENTITY_VIEW_TYPE, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setEntityViewType(@javax.annotation.Nullable String entityViewType) { - this.entityViewType = entityViewType; + public EntityViewTypeFilter() { } - public EntityViewTypeFilter entityViewTypes(@javax.annotation.Nullable List entityViewTypes) { this.entityViewTypes = entityViewTypes; return this; @@ -151,6 +125,32 @@ public void setEntityViewNameFilter(@javax.annotation.Nullable String entityView } + public EntityViewTypeFilter entityViewType(@javax.annotation.Nullable String entityViewType) { + this.entityViewType = entityViewType; + return this; + } + + /** + * Get entityViewType + * @return entityViewType + * @deprecated + */ + @Deprecated + @javax.annotation.Nullable + @JsonProperty(value = JSON_PROPERTY_ENTITY_VIEW_TYPE, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getEntityViewType() { + return entityViewType; + } + + + @JsonProperty(value = JSON_PROPERTY_ENTITY_VIEW_TYPE, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setEntityViewType(@javax.annotation.Nullable String entityViewType) { + this.entityViewType = entityViewType; + } + + @Override public EntityViewTypeFilter type(@javax.annotation.Nonnull String type) { this.setType(type); @@ -169,15 +169,15 @@ public boolean equals(Object o) { return false; } EntityViewTypeFilter entityViewTypeFilter = (EntityViewTypeFilter) o; - return Objects.equals(this.entityViewType, entityViewTypeFilter.entityViewType) && - Objects.equals(this.entityViewTypes, entityViewTypeFilter.entityViewTypes) && + return Objects.equals(this.entityViewTypes, entityViewTypeFilter.entityViewTypes) && Objects.equals(this.entityViewNameFilter, entityViewTypeFilter.entityViewNameFilter) && + Objects.equals(this.entityViewType, entityViewTypeFilter.entityViewType) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(entityViewType, entityViewTypes, entityViewNameFilter, super.hashCode()); + return Objects.hash(entityViewTypes, entityViewNameFilter, entityViewType, super.hashCode()); } @Override @@ -185,9 +185,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class EntityViewTypeFilter {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" entityViewType: ").append(toIndentedString(entityViewType)).append("\n"); sb.append(" entityViewTypes: ").append(toIndentedString(entityViewTypes)).append("\n"); sb.append(" entityViewNameFilter: ").append(toIndentedString(entityViewNameFilter)).append("\n"); + sb.append(" entityViewType: ").append(toIndentedString(entityViewType)).append("\n"); sb.append("}"); return sb.toString(); } @@ -240,11 +240,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%stype%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getType())))); } - // add `entityViewType` to the URL query string - if (getEntityViewType() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sentityViewType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEntityViewType())))); - } - // add `entityViewTypes` to the URL query string if (getEntityViewTypes() != null) { for (int i = 0; i < getEntityViewTypes().size(); i++) { @@ -259,6 +254,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sentityViewNameFilter%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEntityViewNameFilter())))); } + // add `entityViewType` to the URL query string + if (getEntityViewType() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sentityViewType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEntityViewType())))); + } + return joiner.toString(); } static { diff --git a/ce/src/main/java/org/thingsboard/client/model/FeaturesInfo.java b/ce/src/main/java/org/thingsboard/client/model/FeaturesInfo.java index e5644cd0..da660036 100644 --- a/ce/src/main/java/org/thingsboard/client/model/FeaturesInfo.java +++ b/ce/src/main/java/org/thingsboard/client/model/FeaturesInfo.java @@ -35,22 +35,14 @@ * FeaturesInfo */ @JsonPropertyOrder({ - FeaturesInfo.JSON_PROPERTY_TWO_FA_ENABLED, - FeaturesInfo.JSON_PROPERTY_EMAIL_ENABLED, FeaturesInfo.JSON_PROPERTY_SMS_ENABLED, FeaturesInfo.JSON_PROPERTY_OAUTH_ENABLED, - FeaturesInfo.JSON_PROPERTY_NOTIFICATION_ENABLED + FeaturesInfo.JSON_PROPERTY_NOTIFICATION_ENABLED, + FeaturesInfo.JSON_PROPERTY_TWO_FA_ENABLED, + FeaturesInfo.JSON_PROPERTY_EMAIL_ENABLED }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") public class FeaturesInfo { - public static final String JSON_PROPERTY_TWO_FA_ENABLED = "twoFaEnabled"; - @javax.annotation.Nullable - private Boolean twoFaEnabled; - - public static final String JSON_PROPERTY_EMAIL_ENABLED = "emailEnabled"; - @javax.annotation.Nullable - private Boolean emailEnabled; - public static final String JSON_PROPERTY_SMS_ENABLED = "smsEnabled"; @javax.annotation.Nullable private Boolean smsEnabled; @@ -63,57 +55,17 @@ public class FeaturesInfo { @javax.annotation.Nullable private Boolean notificationEnabled; - public FeaturesInfo() { - } - - public FeaturesInfo twoFaEnabled(@javax.annotation.Nullable Boolean twoFaEnabled) { - this.twoFaEnabled = twoFaEnabled; - return this; - } - - /** - * Get twoFaEnabled - * @return twoFaEnabled - */ + public static final String JSON_PROPERTY_TWO_FA_ENABLED = "twoFaEnabled"; @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_TWO_FA_ENABLED, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Boolean getTwoFaEnabled() { - return twoFaEnabled; - } - - - @JsonProperty(value = JSON_PROPERTY_TWO_FA_ENABLED, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setTwoFaEnabled(@javax.annotation.Nullable Boolean twoFaEnabled) { - this.twoFaEnabled = twoFaEnabled; - } - - - public FeaturesInfo emailEnabled(@javax.annotation.Nullable Boolean emailEnabled) { - this.emailEnabled = emailEnabled; - return this; - } + private Boolean twoFaEnabled; - /** - * Get emailEnabled - * @return emailEnabled - */ + public static final String JSON_PROPERTY_EMAIL_ENABLED = "emailEnabled"; @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_EMAIL_ENABLED, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Boolean getEmailEnabled() { - return emailEnabled; - } - + private Boolean emailEnabled; - @JsonProperty(value = JSON_PROPERTY_EMAIL_ENABLED, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setEmailEnabled(@javax.annotation.Nullable Boolean emailEnabled) { - this.emailEnabled = emailEnabled; + public FeaturesInfo() { } - public FeaturesInfo smsEnabled(@javax.annotation.Nullable Boolean smsEnabled) { this.smsEnabled = smsEnabled; return this; @@ -186,6 +138,54 @@ public void setNotificationEnabled(@javax.annotation.Nullable Boolean notificati } + public FeaturesInfo twoFaEnabled(@javax.annotation.Nullable Boolean twoFaEnabled) { + this.twoFaEnabled = twoFaEnabled; + return this; + } + + /** + * Get twoFaEnabled + * @return twoFaEnabled + */ + @javax.annotation.Nullable + @JsonProperty(value = JSON_PROPERTY_TWO_FA_ENABLED, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Boolean getTwoFaEnabled() { + return twoFaEnabled; + } + + + @JsonProperty(value = JSON_PROPERTY_TWO_FA_ENABLED, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setTwoFaEnabled(@javax.annotation.Nullable Boolean twoFaEnabled) { + this.twoFaEnabled = twoFaEnabled; + } + + + public FeaturesInfo emailEnabled(@javax.annotation.Nullable Boolean emailEnabled) { + this.emailEnabled = emailEnabled; + return this; + } + + /** + * Get emailEnabled + * @return emailEnabled + */ + @javax.annotation.Nullable + @JsonProperty(value = JSON_PROPERTY_EMAIL_ENABLED, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Boolean getEmailEnabled() { + return emailEnabled; + } + + + @JsonProperty(value = JSON_PROPERTY_EMAIL_ENABLED, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setEmailEnabled(@javax.annotation.Nullable Boolean emailEnabled) { + this.emailEnabled = emailEnabled; + } + + /** * Return true if this FeaturesInfo object is equal to o. */ @@ -198,27 +198,27 @@ public boolean equals(Object o) { return false; } FeaturesInfo featuresInfo = (FeaturesInfo) o; - return Objects.equals(this.twoFaEnabled, featuresInfo.twoFaEnabled) && - Objects.equals(this.emailEnabled, featuresInfo.emailEnabled) && - Objects.equals(this.smsEnabled, featuresInfo.smsEnabled) && + return Objects.equals(this.smsEnabled, featuresInfo.smsEnabled) && Objects.equals(this.oauthEnabled, featuresInfo.oauthEnabled) && - Objects.equals(this.notificationEnabled, featuresInfo.notificationEnabled); + Objects.equals(this.notificationEnabled, featuresInfo.notificationEnabled) && + Objects.equals(this.twoFaEnabled, featuresInfo.twoFaEnabled) && + Objects.equals(this.emailEnabled, featuresInfo.emailEnabled); } @Override public int hashCode() { - return Objects.hash(twoFaEnabled, emailEnabled, smsEnabled, oauthEnabled, notificationEnabled); + return Objects.hash(smsEnabled, oauthEnabled, notificationEnabled, twoFaEnabled, emailEnabled); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FeaturesInfo {\n"); - sb.append(" twoFaEnabled: ").append(toIndentedString(twoFaEnabled)).append("\n"); - sb.append(" emailEnabled: ").append(toIndentedString(emailEnabled)).append("\n"); sb.append(" smsEnabled: ").append(toIndentedString(smsEnabled)).append("\n"); sb.append(" oauthEnabled: ").append(toIndentedString(oauthEnabled)).append("\n"); sb.append(" notificationEnabled: ").append(toIndentedString(notificationEnabled)).append("\n"); + sb.append(" twoFaEnabled: ").append(toIndentedString(twoFaEnabled)).append("\n"); + sb.append(" emailEnabled: ").append(toIndentedString(emailEnabled)).append("\n"); sb.append("}"); return sb.toString(); } @@ -266,16 +266,6 @@ public String toUrlQueryString(String prefix) { StringJoiner joiner = new StringJoiner("&"); - // add `twoFaEnabled` to the URL query string - if (getTwoFaEnabled() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%stwoFaEnabled%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getTwoFaEnabled())))); - } - - // add `emailEnabled` to the URL query string - if (getEmailEnabled() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%semailEnabled%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEmailEnabled())))); - } - // add `smsEnabled` to the URL query string if (getSmsEnabled() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%ssmsEnabled%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getSmsEnabled())))); @@ -291,6 +281,16 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%snotificationEnabled%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getNotificationEnabled())))); } + // add `twoFaEnabled` to the URL query string + if (getTwoFaEnabled() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%stwoFaEnabled%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getTwoFaEnabled())))); + } + + // add `emailEnabled` to the URL query string + if (getEmailEnabled() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%semailEnabled%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEmailEnabled())))); + } + return joiner.toString(); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/NotificationTargetExportData.java b/ce/src/main/java/org/thingsboard/client/model/NotificationTargetExportData.java index 083f4934..026690e8 100644 --- a/ce/src/main/java/org/thingsboard/client/model/NotificationTargetExportData.java +++ b/ce/src/main/java/org/thingsboard/client/model/NotificationTargetExportData.java @@ -44,22 +44,22 @@ * NotificationTargetExportData */ @JsonPropertyOrder({ - NotificationTargetExportData.JSON_PROPERTY_ENTITY_TYPE, NotificationTargetExportData.JSON_PROPERTY_ENTITY, + NotificationTargetExportData.JSON_PROPERTY_ENTITY_TYPE, NotificationTargetExportData.JSON_PROPERTY_RELATIONS, NotificationTargetExportData.JSON_PROPERTY_ATTRIBUTES, NotificationTargetExportData.JSON_PROPERTY_CALCULATED_FIELDS }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") public class NotificationTargetExportData { - public static final String JSON_PROPERTY_ENTITY_TYPE = "entityType"; - @javax.annotation.Nonnull - private EntityType entityType; - public static final String JSON_PROPERTY_ENTITY = "entity"; @javax.annotation.Nullable private ExportableEntity entity; + public static final String JSON_PROPERTY_ENTITY_TYPE = "entityType"; + @javax.annotation.Nonnull + private EntityType entityType; + public static final String JSON_PROPERTY_RELATIONS = "relations"; @javax.annotation.Nullable private List relations = new ArrayList<>(); @@ -75,30 +75,6 @@ public class NotificationTargetExportData { public NotificationTargetExportData() { } - public NotificationTargetExportData entityType(@javax.annotation.Nonnull EntityType entityType) { - this.entityType = entityType; - return this; - } - - /** - * Get entityType - * @return entityType - */ - @javax.annotation.Nonnull - @JsonProperty(value = JSON_PROPERTY_ENTITY_TYPE, required = true) - @JsonInclude(value = JsonInclude.Include.ALWAYS) - public EntityType getEntityType() { - return entityType; - } - - - @JsonProperty(value = JSON_PROPERTY_ENTITY_TYPE, required = true) - @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setEntityType(@javax.annotation.Nonnull EntityType entityType) { - this.entityType = entityType; - } - - public NotificationTargetExportData entity(@javax.annotation.Nullable ExportableEntity entity) { this.entity = entity; return this; @@ -123,6 +99,30 @@ public void setEntity(@javax.annotation.Nullable ExportableEntity entity) { } + public NotificationTargetExportData entityType(@javax.annotation.Nonnull EntityType entityType) { + this.entityType = entityType; + return this; + } + + /** + * Get entityType + * @return entityType + */ + @javax.annotation.Nonnull + @JsonProperty(value = JSON_PROPERTY_ENTITY_TYPE, required = true) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public EntityType getEntityType() { + return entityType; + } + + + @JsonProperty(value = JSON_PROPERTY_ENTITY_TYPE, required = true) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setEntityType(@javax.annotation.Nonnull EntityType entityType) { + this.entityType = entityType; + } + + public NotificationTargetExportData relations(@javax.annotation.Nullable List relations) { this.relations = relations; return this; @@ -231,8 +231,8 @@ public boolean equals(Object o) { return false; } NotificationTargetExportData notificationTargetExportData = (NotificationTargetExportData) o; - return Objects.equals(this.entityType, notificationTargetExportData.entityType) && - Objects.equals(this.entity, notificationTargetExportData.entity) && + return Objects.equals(this.entity, notificationTargetExportData.entity) && + Objects.equals(this.entityType, notificationTargetExportData.entityType) && Objects.equals(this.relations, notificationTargetExportData.relations) && Objects.equals(this.attributes, notificationTargetExportData.attributes) && Objects.equals(this.calculatedFields, notificationTargetExportData.calculatedFields); @@ -240,15 +240,15 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(entityType, entity, relations, attributes, calculatedFields); + return Objects.hash(entity, entityType, relations, attributes, calculatedFields); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class NotificationTargetExportData {\n"); - sb.append(" entityType: ").append(toIndentedString(entityType)).append("\n"); sb.append(" entity: ").append(toIndentedString(entity)).append("\n"); + sb.append(" entityType: ").append(toIndentedString(entityType)).append("\n"); sb.append(" relations: ").append(toIndentedString(relations)).append("\n"); sb.append(" attributes: ").append(toIndentedString(attributes)).append("\n"); sb.append(" calculatedFields: ").append(toIndentedString(calculatedFields)).append("\n"); @@ -299,16 +299,16 @@ public String toUrlQueryString(String prefix) { StringJoiner joiner = new StringJoiner("&"); - // add `entityType` to the URL query string - if (getEntityType() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sentityType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEntityType())))); - } - // add `entity` to the URL query string if (getEntity() != null) { joiner.add(getEntity().toUrlQueryString(prefix + "entity" + suffix)); } + // add `entityType` to the URL query string + if (getEntityType() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sentityType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEntityType())))); + } + // add `relations` to the URL query string if (getRelations() != null) { for (int i = 0; i < getRelations().size(); i++) { diff --git a/ce/src/main/java/org/thingsboard/client/model/RuleChainDebugEventFilter.java b/ce/src/main/java/org/thingsboard/client/model/RuleChainDebugEventFilter.java index e139b231..833de14b 100644 --- a/ce/src/main/java/org/thingsboard/client/model/RuleChainDebugEventFilter.java +++ b/ce/src/main/java/org/thingsboard/client/model/RuleChainDebugEventFilter.java @@ -42,9 +42,9 @@ */ @JsonPropertyOrder({ RuleChainDebugEventFilter.JSON_PROPERTY_SERVER, - RuleChainDebugEventFilter.JSON_PROPERTY_IS_ERROR, RuleChainDebugEventFilter.JSON_PROPERTY_ERROR_STR, RuleChainDebugEventFilter.JSON_PROPERTY_MESSAGE, + RuleChainDebugEventFilter.JSON_PROPERTY_IS_ERROR, RuleChainDebugEventFilter.JSON_PROPERTY_ERROR }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @@ -59,10 +59,6 @@ public class RuleChainDebugEventFilter extends EventFilter { @javax.annotation.Nullable private String server; - public static final String JSON_PROPERTY_IS_ERROR = "isError"; - @javax.annotation.Nullable - private Boolean isError; - public static final String JSON_PROPERTY_ERROR_STR = "errorStr"; @javax.annotation.Nullable private String errorStr; @@ -71,6 +67,10 @@ public class RuleChainDebugEventFilter extends EventFilter { @javax.annotation.Nullable private String message; + public static final String JSON_PROPERTY_IS_ERROR = "isError"; + @javax.annotation.Nullable + private Boolean isError; + public static final String JSON_PROPERTY_ERROR = "error"; @javax.annotation.Nullable private Boolean error; @@ -102,30 +102,6 @@ public void setServer(@javax.annotation.Nullable String server) { } - public RuleChainDebugEventFilter isError(@javax.annotation.Nullable Boolean isError) { - this.isError = isError; - return this; - } - - /** - * Get isError - * @return isError - */ - @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_IS_ERROR, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Boolean getIsError() { - return isError; - } - - - @JsonProperty(value = JSON_PROPERTY_IS_ERROR, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setIsError(@javax.annotation.Nullable Boolean isError) { - this.isError = isError; - } - - public RuleChainDebugEventFilter errorStr(@javax.annotation.Nullable String errorStr) { this.errorStr = errorStr; return this; @@ -174,6 +150,30 @@ public void setMessage(@javax.annotation.Nullable String message) { } + public RuleChainDebugEventFilter isError(@javax.annotation.Nullable Boolean isError) { + this.isError = isError; + return this; + } + + /** + * Get isError + * @return isError + */ + @javax.annotation.Nullable + @JsonProperty(value = JSON_PROPERTY_IS_ERROR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Boolean getIsError() { + return isError; + } + + + @JsonProperty(value = JSON_PROPERTY_IS_ERROR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setIsError(@javax.annotation.Nullable Boolean isError) { + this.isError = isError; + } + + public RuleChainDebugEventFilter error(@javax.annotation.Nullable Boolean error) { this.error = error; return this; @@ -223,16 +223,16 @@ public boolean equals(Object o) { } RuleChainDebugEventFilter ruleChainDebugEventFilter = (RuleChainDebugEventFilter) o; return Objects.equals(this.server, ruleChainDebugEventFilter.server) && - Objects.equals(this.isError, ruleChainDebugEventFilter.isError) && Objects.equals(this.errorStr, ruleChainDebugEventFilter.errorStr) && Objects.equals(this.message, ruleChainDebugEventFilter.message) && + Objects.equals(this.isError, ruleChainDebugEventFilter.isError) && Objects.equals(this.error, ruleChainDebugEventFilter.error) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(server, isError, errorStr, message, error, super.hashCode()); + return Objects.hash(server, errorStr, message, isError, error, super.hashCode()); } @Override @@ -241,9 +241,9 @@ public String toString() { sb.append("class RuleChainDebugEventFilter {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" server: ").append(toIndentedString(server)).append("\n"); - sb.append(" isError: ").append(toIndentedString(isError)).append("\n"); sb.append(" errorStr: ").append(toIndentedString(errorStr)).append("\n"); sb.append(" message: ").append(toIndentedString(message)).append("\n"); + sb.append(" isError: ").append(toIndentedString(isError)).append("\n"); sb.append(" error: ").append(toIndentedString(error)).append("\n"); sb.append("}"); return sb.toString(); @@ -307,11 +307,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sserver%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getServer())))); } - // add `isError` to the URL query string - if (getIsError() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sisError%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getIsError())))); - } - // add `errorStr` to the URL query string if (getErrorStr() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%serrorStr%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getErrorStr())))); @@ -322,6 +317,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%smessage%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMessage())))); } + // add `isError` to the URL query string + if (getIsError() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sisError%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getIsError())))); + } + // 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())))); diff --git a/ce/src/main/java/org/thingsboard/client/model/RuleNode.java b/ce/src/main/java/org/thingsboard/client/model/RuleNode.java index 5c587f30..a4dbb24c 100644 --- a/ce/src/main/java/org/thingsboard/client/model/RuleNode.java +++ b/ce/src/main/java/org/thingsboard/client/model/RuleNode.java @@ -395,7 +395,7 @@ public RuleNode additionalInfo(@javax.annotation.Nullable com.fasterxml.jackson. } /** - * Additional parameters of the rule node. Contains 'layoutX' and 'layoutY' properties for visualization. + * Additional parameters of the rule node. May include: 'layoutX' (number, X coordinate for visualization), 'layoutY' (number, Y coordinate for visualization), 'description' (string). * @return additionalInfo */ @javax.annotation.Nullable diff --git a/ce/src/main/java/org/thingsboard/client/model/RuleNodeDebugEventFilter.java b/ce/src/main/java/org/thingsboard/client/model/RuleNodeDebugEventFilter.java index 74c7f029..2bb03d17 100644 --- a/ce/src/main/java/org/thingsboard/client/model/RuleNodeDebugEventFilter.java +++ b/ce/src/main/java/org/thingsboard/client/model/RuleNodeDebugEventFilter.java @@ -42,7 +42,6 @@ */ @JsonPropertyOrder({ RuleNodeDebugEventFilter.JSON_PROPERTY_SERVER, - RuleNodeDebugEventFilter.JSON_PROPERTY_IS_ERROR, RuleNodeDebugEventFilter.JSON_PROPERTY_ERROR_STR, RuleNodeDebugEventFilter.JSON_PROPERTY_MSG_DIRECTION_TYPE, RuleNodeDebugEventFilter.JSON_PROPERTY_ENTITY_ID, @@ -52,6 +51,7 @@ RuleNodeDebugEventFilter.JSON_PROPERTY_RELATION_TYPE, RuleNodeDebugEventFilter.JSON_PROPERTY_DATA_SEARCH, RuleNodeDebugEventFilter.JSON_PROPERTY_METADATA_SEARCH, + RuleNodeDebugEventFilter.JSON_PROPERTY_IS_ERROR, RuleNodeDebugEventFilter.JSON_PROPERTY_ERROR }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @@ -66,10 +66,6 @@ public class RuleNodeDebugEventFilter extends EventFilter { @javax.annotation.Nullable private String server; - public static final String JSON_PROPERTY_IS_ERROR = "isError"; - @javax.annotation.Nullable - private Boolean isError; - public static final String JSON_PROPERTY_ERROR_STR = "errorStr"; @javax.annotation.Nullable private String errorStr; @@ -174,6 +170,10 @@ public static EntityTypeEnum fromValue(String value) { @javax.annotation.Nullable private String metadataSearch; + public static final String JSON_PROPERTY_IS_ERROR = "isError"; + @javax.annotation.Nullable + private Boolean isError; + public static final String JSON_PROPERTY_ERROR = "error"; @javax.annotation.Nullable private Boolean error; @@ -205,30 +205,6 @@ public void setServer(@javax.annotation.Nullable String server) { } - public RuleNodeDebugEventFilter isError(@javax.annotation.Nullable Boolean isError) { - this.isError = isError; - return this; - } - - /** - * Get isError - * @return isError - */ - @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_IS_ERROR, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Boolean getIsError() { - return isError; - } - - - @JsonProperty(value = JSON_PROPERTY_IS_ERROR, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setIsError(@javax.annotation.Nullable Boolean isError) { - this.isError = isError; - } - - public RuleNodeDebugEventFilter errorStr(@javax.annotation.Nullable String errorStr) { this.errorStr = errorStr; return this; @@ -445,6 +421,30 @@ public void setMetadataSearch(@javax.annotation.Nullable String metadataSearch) } + public RuleNodeDebugEventFilter isError(@javax.annotation.Nullable Boolean isError) { + this.isError = isError; + return this; + } + + /** + * Get isError + * @return isError + */ + @javax.annotation.Nullable + @JsonProperty(value = JSON_PROPERTY_IS_ERROR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Boolean getIsError() { + return isError; + } + + + @JsonProperty(value = JSON_PROPERTY_IS_ERROR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setIsError(@javax.annotation.Nullable Boolean isError) { + this.isError = isError; + } + + public RuleNodeDebugEventFilter error(@javax.annotation.Nullable Boolean error) { this.error = error; return this; @@ -494,7 +494,6 @@ public boolean equals(Object o) { } RuleNodeDebugEventFilter ruleNodeDebugEventFilter = (RuleNodeDebugEventFilter) o; return Objects.equals(this.server, ruleNodeDebugEventFilter.server) && - Objects.equals(this.isError, ruleNodeDebugEventFilter.isError) && Objects.equals(this.errorStr, ruleNodeDebugEventFilter.errorStr) && Objects.equals(this.msgDirectionType, ruleNodeDebugEventFilter.msgDirectionType) && Objects.equals(this.entityId, ruleNodeDebugEventFilter.entityId) && @@ -504,13 +503,14 @@ public boolean equals(Object o) { Objects.equals(this.relationType, ruleNodeDebugEventFilter.relationType) && Objects.equals(this.dataSearch, ruleNodeDebugEventFilter.dataSearch) && Objects.equals(this.metadataSearch, ruleNodeDebugEventFilter.metadataSearch) && + Objects.equals(this.isError, ruleNodeDebugEventFilter.isError) && Objects.equals(this.error, ruleNodeDebugEventFilter.error) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(server, isError, errorStr, msgDirectionType, entityId, entityType, msgId, msgType, relationType, dataSearch, metadataSearch, error, super.hashCode()); + return Objects.hash(server, errorStr, msgDirectionType, entityId, entityType, msgId, msgType, relationType, dataSearch, metadataSearch, isError, error, super.hashCode()); } @Override @@ -519,7 +519,6 @@ public String toString() { sb.append("class RuleNodeDebugEventFilter {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" server: ").append(toIndentedString(server)).append("\n"); - sb.append(" isError: ").append(toIndentedString(isError)).append("\n"); sb.append(" errorStr: ").append(toIndentedString(errorStr)).append("\n"); sb.append(" msgDirectionType: ").append(toIndentedString(msgDirectionType)).append("\n"); sb.append(" entityId: ").append(toIndentedString(entityId)).append("\n"); @@ -529,6 +528,7 @@ public String toString() { sb.append(" relationType: ").append(toIndentedString(relationType)).append("\n"); sb.append(" dataSearch: ").append(toIndentedString(dataSearch)).append("\n"); sb.append(" metadataSearch: ").append(toIndentedString(metadataSearch)).append("\n"); + sb.append(" isError: ").append(toIndentedString(isError)).append("\n"); sb.append(" error: ").append(toIndentedString(error)).append("\n"); sb.append("}"); return sb.toString(); @@ -592,11 +592,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sserver%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getServer())))); } - // add `isError` to the URL query string - if (getIsError() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sisError%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getIsError())))); - } - // add `errorStr` to the URL query string if (getErrorStr() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%serrorStr%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getErrorStr())))); @@ -642,6 +637,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%smetadataSearch%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMetadataSearch())))); } + // add `isError` to the URL query string + if (getIsError() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sisError%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getIsError())))); + } + // 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())))); diff --git a/ce/src/main/java/org/thingsboard/client/model/Tenant.java b/ce/src/main/java/org/thingsboard/client/model/Tenant.java index 7366cb89..177809cc 100644 --- a/ce/src/main/java/org/thingsboard/client/model/Tenant.java +++ b/ce/src/main/java/org/thingsboard/client/model/Tenant.java @@ -479,7 +479,7 @@ public Tenant additionalInfo(@javax.annotation.Nullable com.fasterxml.jackson.da } /** - * Additional parameters of the device + * Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar). * @return additionalInfo */ @javax.annotation.Nullable diff --git a/ce/src/main/java/org/thingsboard/client/model/TenantInfo.java b/ce/src/main/java/org/thingsboard/client/model/TenantInfo.java index 142fd585..09ae9865 100644 --- a/ce/src/main/java/org/thingsboard/client/model/TenantInfo.java +++ b/ce/src/main/java/org/thingsboard/client/model/TenantInfo.java @@ -508,7 +508,7 @@ public TenantInfo additionalInfo(@javax.annotation.Nullable com.fasterxml.jackso } /** - * Additional parameters of the device + * Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar). * @return additionalInfo */ @javax.annotation.Nullable diff --git a/ce/src/main/java/org/thingsboard/client/model/User.java b/ce/src/main/java/org/thingsboard/client/model/User.java index e5703530..55346226 100644 --- a/ce/src/main/java/org/thingsboard/client/model/User.java +++ b/ce/src/main/java/org/thingsboard/client/model/User.java @@ -365,7 +365,7 @@ public User additionalInfo(@javax.annotation.Nullable com.fasterxml.jackson.data } /** - * Additional parameters of the user + * Additional parameters of the user. May include: 'defaultDashboardId' (string, UUID of the default dashboard), 'defaultDashboardFullscreen' (boolean), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean), 'lang' (string, user locale, e.g. 'en_US'), 'authProviderName' (string, name of the authentication provider). * @return additionalInfo */ @javax.annotation.Nullable diff --git a/ce/src/main/java/org/thingsboard/client/model/WebViewPage.java b/ce/src/main/java/org/thingsboard/client/model/WebViewPage.java index e02cef2c..d0d5588c 100644 --- a/ce/src/main/java/org/thingsboard/client/model/WebViewPage.java +++ b/ce/src/main/java/org/thingsboard/client/model/WebViewPage.java @@ -41,10 +41,10 @@ * WebViewPage */ @JsonPropertyOrder({ - WebViewPage.JSON_PROPERTY_URL, WebViewPage.JSON_PROPERTY_LABEL, WebViewPage.JSON_PROPERTY_VISIBLE, - WebViewPage.JSON_PROPERTY_ICON + WebViewPage.JSON_PROPERTY_ICON, + WebViewPage.JSON_PROPERTY_URL }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @JsonIgnoreProperties( @@ -54,10 +54,6 @@ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = true) public class WebViewPage extends MobilePage { - public static final String JSON_PROPERTY_URL = "url"; - @javax.annotation.Nullable - private String url; - public static final String JSON_PROPERTY_LABEL = "label"; @javax.annotation.Nullable private String label; @@ -70,33 +66,13 @@ public class WebViewPage extends MobilePage { @javax.annotation.Nullable private String icon; - public WebViewPage() { - } - - public WebViewPage url(@javax.annotation.Nullable String url) { - this.url = url; - return this; - } - - /** - * Url - * @return url - */ + public static final String JSON_PROPERTY_URL = "url"; @javax.annotation.Nullable - @JsonProperty(value = JSON_PROPERTY_URL, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getUrl() { - return url; - } - + private String url; - @JsonProperty(value = JSON_PROPERTY_URL, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setUrl(@javax.annotation.Nullable String url) { - this.url = url; + public WebViewPage() { } - public WebViewPage label(@javax.annotation.Nullable String label) { this.label = label; return this; @@ -169,6 +145,30 @@ public void setIcon(@javax.annotation.Nullable String icon) { } + public WebViewPage url(@javax.annotation.Nullable String url) { + this.url = url; + return this; + } + + /** + * Url + * @return url + */ + @javax.annotation.Nullable + @JsonProperty(value = JSON_PROPERTY_URL, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getUrl() { + return url; + } + + + @JsonProperty(value = JSON_PROPERTY_URL, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setUrl(@javax.annotation.Nullable String url) { + this.url = url; + } + + @Override public WebViewPage type(@javax.annotation.Nonnull MobilePageType type) { this.setType(type); @@ -187,16 +187,16 @@ public boolean equals(Object o) { return false; } WebViewPage webViewPage = (WebViewPage) o; - return Objects.equals(this.url, webViewPage.url) && - Objects.equals(this.label, webViewPage.label) && + return Objects.equals(this.label, webViewPage.label) && Objects.equals(this.visible, webViewPage.visible) && Objects.equals(this.icon, webViewPage.icon) && + Objects.equals(this.url, webViewPage.url) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(url, label, visible, icon, super.hashCode()); + return Objects.hash(label, visible, icon, url, super.hashCode()); } @Override @@ -204,10 +204,10 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class WebViewPage {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" url: ").append(toIndentedString(url)).append("\n"); sb.append(" label: ").append(toIndentedString(label)).append("\n"); sb.append(" visible: ").append(toIndentedString(visible)).append("\n"); sb.append(" icon: ").append(toIndentedString(icon)).append("\n"); + sb.append(" url: ").append(toIndentedString(url)).append("\n"); sb.append("}"); return sb.toString(); } @@ -265,11 +265,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%svisible%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getVisible())))); } - // add `url` to the URL query string - if (getUrl() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%surl%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getUrl())))); - } - // add `label` to the URL query string if (getLabel() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%slabel%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getLabel())))); @@ -280,6 +275,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sicon%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getIcon())))); } + // add `url` to the URL query string + if (getUrl() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%surl%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getUrl())))); + } + return joiner.toString(); } static {