From 0a1915572c47db304f9c01b9336d9c90db805c66 Mon Sep 17 00:00:00 2001 From: Viacheslav Klimov Date: Mon, 12 Oct 2026 07:39:12 +0100 Subject: [PATCH] Update PAAS OpenAPI spec in master (from develop/4.4) --- paas/docs/DefaultMobilePage.md | 2 +- paas/docs/DefaultPageId.md | 2 + paas/docs/DeviceProfile.md | 8 +-- paas/docs/DeviceProfileData.md | 8 +-- .../DeviceProfileTransportConfiguration.md | 8 +-- paas/docs/LwM2MBootstrapServerCredential.md | 8 +-- paas/docs/LwM2MServerSecurityConfigDefault.md | 2 +- ...wm2mDeviceProfileTransportConfiguration.md | 8 +-- paas/docs/MobileAppBundle.md | 2 +- paas/docs/MobileAppBundleInfo.md | 2 +- paas/docs/MobileLayoutConfig.md | 2 +- paas/docs/MobilePage.md | 2 +- .../NoSecLwM2MBootstrapServerCredential.md | 2 +- .../docs/PSKLwM2MBootstrapServerCredential.md | 2 +- paas/docs/PageDataDeviceProfile.md | 8 +-- paas/docs/PageDataMobileAppBundleInfo.md | 2 +- paas/docs/PageDataTenant.md | 1 + paas/docs/PageDataTenantInfo.md | 1 + .../docs/RPKLwM2MBootstrapServerCredential.md | 2 +- paas/docs/SignUpControllerApi.md | 4 +- paas/docs/SubscriptionDetails.md | 1 + paas/docs/SubscriptionItems.md | 1 + paas/docs/SubscriptionUsage.md | 1 + paas/docs/TbResourceControllerApi.md | 6 +- paas/docs/Tenant.md | 1 + paas/docs/TenantAddonData.md | 1 + paas/docs/TenantInfo.md | 1 + .../X509LwM2MBootstrapServerCredential.md | 2 +- paas/spec/openapi.json | 67 +++++++++++-------- .../org/thingsboard/client/ApiClient.java | 4 +- .../client/api/ThingsboardApi.java | 33 ++++----- .../client/model/DefaultPageId.java | 4 +- .../LwM2MServerSecurityConfigDefault.java | 2 +- .../NoSecLwM2MBootstrapServerCredential.java | 2 +- .../PSKLwM2MBootstrapServerCredential.java | 2 +- .../RPKLwM2MBootstrapServerCredential.java | 2 +- .../client/model/SubscriptionItems.java | 38 ++++++++++- .../client/model/SubscriptionUsage.java | 38 ++++++++++- .../client/model/TenantAddonData.java | 38 ++++++++++- .../X509LwM2MBootstrapServerCredential.java | 2 +- 40 files changed, 227 insertions(+), 95 deletions(-) diff --git a/paas/docs/DefaultMobilePage.md b/paas/docs/DefaultMobilePage.md index 7983c854..cfb52b1e 100644 --- a/paas/docs/DefaultMobilePage.md +++ b/paas/docs/DefaultMobilePage.md @@ -24,7 +24,7 @@ | visible | Boolean | | [optional] | #### DefaultPageId (enum) -`HOME` | `ALARMS` | `DEVICES` | `CUSTOMERS` | `ASSETS` | `AUDIT_LOGS` | `NOTIFICATIONS` | `DEVICE_LIST` | `DASHBOARDS` +`HOME` | `ALARMS` | `DEVICES` | `CUSTOMERS` | `ASSETS` | `AUDIT_LOGS` | `NOTIFICATIONS` | `DEVICE_LIST` | `DASHBOARDS` | `LIVE_LOCATION_TRACKING` #### MobilePageType (enum) `DEFAULT` | `DASHBOARD` | `WEB_VIEW` | `CUSTOM` diff --git a/paas/docs/DefaultPageId.md b/paas/docs/DefaultPageId.md index 0d6096ce..230ca713 100644 --- a/paas/docs/DefaultPageId.md +++ b/paas/docs/DefaultPageId.md @@ -24,6 +24,8 @@ * `DASHBOARDS` (value: `"DASHBOARDS"`) +* `LIVE_LOCATION_TRACKING` (value: `"LIVE_LOCATION_TRACKING"`) + --- diff --git a/paas/docs/DeviceProfile.md b/paas/docs/DeviceProfile.md index fdc08351..ad36bc4e 100644 --- a/paas/docs/DeviceProfile.md +++ b/paas/docs/DeviceProfile.md @@ -160,7 +160,7 @@ A JSON value representing the device profile. #### NoSecLwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`NO_SEC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | @@ -176,7 +176,7 @@ A JSON value representing the device profile. #### PSKLwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`PSK`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | @@ -192,7 +192,7 @@ A JSON value representing the device profile. #### RPKLwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`RPK`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | @@ -208,7 +208,7 @@ A JSON value representing the device profile. #### X509LwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`X509`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | diff --git a/paas/docs/DeviceProfileData.md b/paas/docs/DeviceProfileData.md index e07f0377..a7ad2d9d 100644 --- a/paas/docs/DeviceProfileData.md +++ b/paas/docs/DeviceProfileData.md @@ -121,7 +121,7 @@ #### NoSecLwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`NO_SEC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | @@ -137,7 +137,7 @@ #### PSKLwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`PSK`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | @@ -153,7 +153,7 @@ #### RPKLwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`RPK`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | @@ -169,7 +169,7 @@ #### X509LwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`X509`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | diff --git a/paas/docs/DeviceProfileTransportConfiguration.md b/paas/docs/DeviceProfileTransportConfiguration.md index 6e35f4b3..6736d6b6 100644 --- a/paas/docs/DeviceProfileTransportConfiguration.md +++ b/paas/docs/DeviceProfileTransportConfiguration.md @@ -92,7 +92,7 @@ Configuration for device profile transport #### NoSecLwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`NO_SEC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | @@ -108,7 +108,7 @@ Configuration for device profile transport #### PSKLwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`PSK`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | @@ -124,7 +124,7 @@ Configuration for device profile transport #### RPKLwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`RPK`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | @@ -140,7 +140,7 @@ Configuration for device profile transport #### X509LwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`X509`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | diff --git a/paas/docs/LwM2MBootstrapServerCredential.md b/paas/docs/LwM2MBootstrapServerCredential.md index ce4ea705..006e0128 100644 --- a/paas/docs/LwM2MBootstrapServerCredential.md +++ b/paas/docs/LwM2MBootstrapServerCredential.md @@ -16,7 +16,7 @@ #### NoSecLwM2MBootstrapServerCredential *(securityMode=`NO_SEC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | @@ -32,7 +32,7 @@ #### PSKLwM2MBootstrapServerCredential *(securityMode=`PSK`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | @@ -48,7 +48,7 @@ #### RPKLwM2MBootstrapServerCredential *(securityMode=`RPK`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | @@ -64,7 +64,7 @@ #### X509LwM2MBootstrapServerCredential *(securityMode=`X509`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | diff --git a/paas/docs/LwM2MServerSecurityConfigDefault.md b/paas/docs/LwM2MServerSecurityConfigDefault.md index 99dc66f0..8c64d2e9 100644 --- a/paas/docs/LwM2MServerSecurityConfigDefault.md +++ b/paas/docs/LwM2MServerSecurityConfigDefault.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **shortServerId** | **Integer** | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| **shortServerId** | **Integer** | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | **bootstrapServerIs** | **Boolean** | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | **host** | **String** | Host for 'No Security' mode | [optional] [readonly] | | **port** | **Integer** | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | diff --git a/paas/docs/Lwm2mDeviceProfileTransportConfiguration.md b/paas/docs/Lwm2mDeviceProfileTransportConfiguration.md index 78091d6f..f5c8265b 100644 --- a/paas/docs/Lwm2mDeviceProfileTransportConfiguration.md +++ b/paas/docs/Lwm2mDeviceProfileTransportConfiguration.md @@ -42,7 +42,7 @@ #### NoSecLwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`NO_SEC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | @@ -58,7 +58,7 @@ #### PSKLwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`PSK`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | @@ -74,7 +74,7 @@ #### RPKLwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`RPK`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | @@ -90,7 +90,7 @@ #### X509LwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`X509`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | diff --git a/paas/docs/MobileAppBundle.md b/paas/docs/MobileAppBundle.md index 8a5d768d..a6043b0b 100644 --- a/paas/docs/MobileAppBundle.md +++ b/paas/docs/MobileAppBundle.md @@ -181,7 +181,7 @@ A JSON value representing the Mobile Application Bundle. | id | UUID | string | | #### DefaultPageId (enum) -`HOME` | `ALARMS` | `DEVICES` | `CUSTOMERS` | `ASSETS` | `AUDIT_LOGS` | `NOTIFICATIONS` | `DEVICE_LIST` | `DASHBOARDS` +`HOME` | `ALARMS` | `DEVICES` | `CUSTOMERS` | `ASSETS` | `AUDIT_LOGS` | `NOTIFICATIONS` | `DEVICE_LIST` | `DASHBOARDS` | `LIVE_LOCATION_TRACKING` #### SignUpFieldId (enum) `EMAIL` | `PASSWORD` | `REPEAT_PASSWORD` | `FIRST_NAME` | `LAST_NAME` | `PHONE` | `COUNTRY` | `CITY` | `STATE` | `ZIP` | … (12 values total) diff --git a/paas/docs/MobileAppBundleInfo.md b/paas/docs/MobileAppBundleInfo.md index 0bd533a2..a572d527 100644 --- a/paas/docs/MobileAppBundleInfo.md +++ b/paas/docs/MobileAppBundleInfo.md @@ -196,7 +196,7 @@ | id | UUID | string | | #### DefaultPageId (enum) -`HOME` | `ALARMS` | `DEVICES` | `CUSTOMERS` | `ASSETS` | `AUDIT_LOGS` | `NOTIFICATIONS` | `DEVICE_LIST` | `DASHBOARDS` +`HOME` | `ALARMS` | `DEVICES` | `CUSTOMERS` | `ASSETS` | `AUDIT_LOGS` | `NOTIFICATIONS` | `DEVICE_LIST` | `DASHBOARDS` | `LIVE_LOCATION_TRACKING` #### SignUpFieldId (enum) `EMAIL` | `PASSWORD` | `REPEAT_PASSWORD` | `FIRST_NAME` | `LAST_NAME` | `PHONE` | `COUNTRY` | `CITY` | `STATE` | `ZIP` | … (12 values total) diff --git a/paas/docs/MobileLayoutConfig.md b/paas/docs/MobileLayoutConfig.md index 9bb63861..3931faac 100644 --- a/paas/docs/MobileLayoutConfig.md +++ b/paas/docs/MobileLayoutConfig.md @@ -51,7 +51,7 @@ `DEFAULT` | `DASHBOARD` | `WEB_VIEW` | `CUSTOM` #### DefaultPageId (enum) -`HOME` | `ALARMS` | `DEVICES` | `CUSTOMERS` | `ASSETS` | `AUDIT_LOGS` | `NOTIFICATIONS` | `DEVICE_LIST` | `DASHBOARDS` +`HOME` | `ALARMS` | `DEVICES` | `CUSTOMERS` | `ASSETS` | `AUDIT_LOGS` | `NOTIFICATIONS` | `DEVICE_LIST` | `DASHBOARDS` | `LIVE_LOCATION_TRACKING` --- diff --git a/paas/docs/MobilePage.md b/paas/docs/MobilePage.md index 000c5479..14b0557a 100644 --- a/paas/docs/MobilePage.md +++ b/paas/docs/MobilePage.md @@ -50,7 +50,7 @@ Configuration for a mobile page `DEFAULT` | `DASHBOARD` | `WEB_VIEW` | `CUSTOM` #### DefaultPageId (enum) -`HOME` | `ALARMS` | `DEVICES` | `CUSTOMERS` | `ASSETS` | `AUDIT_LOGS` | `NOTIFICATIONS` | `DEVICE_LIST` | `DASHBOARDS` +`HOME` | `ALARMS` | `DEVICES` | `CUSTOMERS` | `ASSETS` | `AUDIT_LOGS` | `NOTIFICATIONS` | `DEVICE_LIST` | `DASHBOARDS` | `LIVE_LOCATION_TRACKING` --- diff --git a/paas/docs/NoSecLwM2MBootstrapServerCredential.md b/paas/docs/NoSecLwM2MBootstrapServerCredential.md index 92115362..a7d281fd 100644 --- a/paas/docs/NoSecLwM2MBootstrapServerCredential.md +++ b/paas/docs/NoSecLwM2MBootstrapServerCredential.md @@ -9,7 +9,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **shortServerId** | **Integer** | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| **shortServerId** | **Integer** | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | **bootstrapServerIs** | **Boolean** | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | **host** | **String** | Host for 'No Security' mode | [optional] [readonly] | | **port** | **Integer** | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | diff --git a/paas/docs/PSKLwM2MBootstrapServerCredential.md b/paas/docs/PSKLwM2MBootstrapServerCredential.md index 7edd866a..64ce90ad 100644 --- a/paas/docs/PSKLwM2MBootstrapServerCredential.md +++ b/paas/docs/PSKLwM2MBootstrapServerCredential.md @@ -9,7 +9,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **shortServerId** | **Integer** | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| **shortServerId** | **Integer** | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | **bootstrapServerIs** | **Boolean** | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | **host** | **String** | Host for 'No Security' mode | [optional] [readonly] | | **port** | **Integer** | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | diff --git a/paas/docs/PageDataDeviceProfile.md b/paas/docs/PageDataDeviceProfile.md index 4bbe386e..7d9d00db 100644 --- a/paas/docs/PageDataDeviceProfile.md +++ b/paas/docs/PageDataDeviceProfile.md @@ -166,7 +166,7 @@ #### NoSecLwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`NO_SEC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | @@ -182,7 +182,7 @@ #### PSKLwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`PSK`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | @@ -198,7 +198,7 @@ #### RPKLwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`RPK`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | @@ -214,7 +214,7 @@ #### X509LwM2MBootstrapServerCredential *(extends LwM2MBootstrapServerCredential, securityMode=`X509`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| shortServerId | Integer | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | bootstrapServerIs | Boolean | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | host | String | Host for 'No Security' mode | [optional] [readonly] | | port | Integer | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | diff --git a/paas/docs/PageDataMobileAppBundleInfo.md b/paas/docs/PageDataMobileAppBundleInfo.md index 3bb66058..3b651eb5 100644 --- a/paas/docs/PageDataMobileAppBundleInfo.md +++ b/paas/docs/PageDataMobileAppBundleInfo.md @@ -204,7 +204,7 @@ | id | UUID | string | | #### DefaultPageId (enum) -`HOME` | `ALARMS` | `DEVICES` | `CUSTOMERS` | `ASSETS` | `AUDIT_LOGS` | `NOTIFICATIONS` | `DEVICE_LIST` | `DASHBOARDS` +`HOME` | `ALARMS` | `DEVICES` | `CUSTOMERS` | `ASSETS` | `AUDIT_LOGS` | `NOTIFICATIONS` | `DEVICE_LIST` | `DASHBOARDS` | `LIVE_LOCATION_TRACKING` #### SignUpFieldId (enum) `EMAIL` | `PASSWORD` | `REPEAT_PASSWORD` | `FIRST_NAME` | `LAST_NAME` | `PHONE` | `COUNTRY` | `CITY` | `STATE` | `ZIP` | … (12 values total) diff --git a/paas/docs/PageDataTenant.md b/paas/docs/PageDataTenant.md index 5858cd8a..25e8875d 100644 --- a/paas/docs/PageDataTenant.md +++ b/paas/docs/PageDataTenant.md @@ -64,6 +64,7 @@ | maxAiCredits | Long | | [optional] | | edgeEnabled | Boolean | | [optional] | | maxEdges | Long | | [optional] | +| maxAgents | Long | | [optional] | | trendzEnabled | Boolean | | [optional] | | whiteLabelingEnabled | Boolean | | [optional] | | _default | Boolean | | [optional] | diff --git a/paas/docs/PageDataTenantInfo.md b/paas/docs/PageDataTenantInfo.md index 9f4df387..cc2b79e5 100644 --- a/paas/docs/PageDataTenantInfo.md +++ b/paas/docs/PageDataTenantInfo.md @@ -65,6 +65,7 @@ | maxAiCredits | Long | | [optional] | | edgeEnabled | Boolean | | [optional] | | maxEdges | Long | | [optional] | +| maxAgents | Long | | [optional] | | trendzEnabled | Boolean | | [optional] | | whiteLabelingEnabled | Boolean | | [optional] | | _default | Boolean | | [optional] | diff --git a/paas/docs/RPKLwM2MBootstrapServerCredential.md b/paas/docs/RPKLwM2MBootstrapServerCredential.md index 0eb87a46..6331b25e 100644 --- a/paas/docs/RPKLwM2MBootstrapServerCredential.md +++ b/paas/docs/RPKLwM2MBootstrapServerCredential.md @@ -9,7 +9,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **shortServerId** | **Integer** | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| **shortServerId** | **Integer** | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | **bootstrapServerIs** | **Boolean** | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | **host** | **String** | Host for 'No Security' mode | [optional] [readonly] | | **port** | **Integer** | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | diff --git a/paas/docs/SignUpControllerApi.md b/paas/docs/SignUpControllerApi.md index 659ecf41..e48604b9 100644 --- a/paas/docs/SignUpControllerApi.md +++ b/paas/docs/SignUpControllerApi.md @@ -40,7 +40,7 @@ JwtPair acceptPrivacyPolicy() Accept privacy policy (acceptPrivacyPolicy) -Accept privacy policy by the current user. +Accept privacy policy by the current user. Stores the acceptance flag 'privacyPolicyAccepted' and the acceptance time 'privacyPolicyAcceptedTs' (epoch milliseconds) in the user's additional info. Repeated acceptance overwrites the stored time. ### Return type @@ -72,7 +72,7 @@ JwtPair acceptTermsOfUse() Accept Terms of Use (acceptTermsOfUse) -Accept Terms of Use by the current user. +Accept Terms of Use by the current user. Stores the acceptance flag 'termsOfUseAccepted' and the acceptance time 'termsOfUseAcceptedTs' (epoch milliseconds) in the user's additional info. Repeated acceptance overwrites the stored time. ### Return type diff --git a/paas/docs/SubscriptionDetails.md b/paas/docs/SubscriptionDetails.md index f6be3270..73496ac6 100644 --- a/paas/docs/SubscriptionDetails.md +++ b/paas/docs/SubscriptionDetails.md @@ -48,6 +48,7 @@ | extraCustomerPackCount | Long | | [optional] | | extraIntegrationPackCount | Long | | [optional] | | extraCalculatedFieldCount | Long | | [optional] | +| extraAgentPackCount | Long | | [optional] | | trafficPackCount | Long | | [optional] | | computePackCount | Long | | [optional] | | storagePackCount | Long | | [optional] | diff --git a/paas/docs/SubscriptionItems.md b/paas/docs/SubscriptionItems.md index 8b36780c..fa40b710 100644 --- a/paas/docs/SubscriptionItems.md +++ b/paas/docs/SubscriptionItems.md @@ -11,6 +11,7 @@ | **extraCustomerPackCount** | **Long** | | [optional] | | **extraIntegrationPackCount** | **Long** | | [optional] | | **extraCalculatedFieldCount** | **Long** | | [optional] | +| **extraAgentPackCount** | **Long** | | [optional] | | **trafficPackCount** | **Long** | | [optional] | | **computePackCount** | **Long** | | [optional] | | **storagePackCount** | **Long** | | [optional] | diff --git a/paas/docs/SubscriptionUsage.md b/paas/docs/SubscriptionUsage.md index 4876a550..391ceed1 100644 --- a/paas/docs/SubscriptionUsage.md +++ b/paas/docs/SubscriptionUsage.md @@ -17,6 +17,7 @@ | **converters** | **Long** | | [optional] | | **schedulerEvents** | **Long** | | [optional] | | **edges** | **Long** | | [optional] | +| **agents** | **Long** | | [optional] | | **transportMessages** | **Long** | | [optional] | | **transportDataPoints** | **Long** | | [optional] | | **reExecutions** | **Long** | | [optional] | diff --git a/paas/docs/TbResourceControllerApi.md b/paas/docs/TbResourceControllerApi.md index e7b75d89..72b1822d 100644 --- a/paas/docs/TbResourceControllerApi.md +++ b/paas/docs/TbResourceControllerApi.md @@ -21,7 +21,7 @@ List getLwm2mListObjectsPage(@Nonnull Integer pageSize, @Nonnull In TbResource getResourceById(@Nonnull String resourceId) // Get Resource (getResourceById) TbResourceInfo getResourceInfo(@Nonnull String resourceType, @Nonnull String scope, @Nonnull String key) // Get resource info (getResourceInfo) TbResourceInfo getResourceInfoById(@Nonnull String resourceId) // Get Resource Info (getResourceInfoById) -PageDataTbResourceInfo getResources(@Nonnull Integer pageSize, @Nonnull Integer page, @Nullable String resourceType, @Nullable String resourceSubType, @Nullable String textSearch, @Nullable String sortProperty, @Nullable String sortOrder) // Get Resource Infos (getResources) +PageDataTbResourceInfo getResources(@Nonnull Integer pageSize, @Nonnull Integer page, @Nullable Set resourceType, @Nullable String resourceSubType, @Nullable String textSearch, @Nullable String sortProperty, @Nullable String sortOrder) // Get Resource Infos (getResources) List getSystemOrTenantResourcesByIds(@Nonnull List resourceIds) // Get Resource Infos by ids (getSystemOrTenantResourcesByIds) PageDataTbResourceInfo getTenantResources(@Nonnull Integer pageSize, @Nonnull Integer page, @Nullable String textSearch, @Nullable String sortProperty, @Nullable String sortOrder) // Get All Resource Infos (getTenantResources) TbResourceInfo saveResource(@Nonnull TbResource tbResource) // Create Or Update Resource (saveResource) @@ -338,7 +338,7 @@ Fetch the Resource Info object based on the provided Resource Id. Resource Info ## getResources ``` -PageDataTbResourceInfo getResources(@Nonnull Integer pageSize, @Nonnull Integer page, @Nullable String resourceType, @Nullable String resourceSubType, @Nullable String textSearch, @Nullable String sortProperty, @Nullable String sortOrder) +PageDataTbResourceInfo getResources(@Nonnull Integer pageSize, @Nonnull Integer page, @Nullable Set resourceType, @Nullable String resourceSubType, @Nullable String textSearch, @Nullable String sortProperty, @Nullable String sortOrder) ``` **GET** `/api/resource` @@ -354,7 +354,7 @@ Returns a page of Resource Info objects owned by tenant or sysadmin. You can spe |------------- | ------------- | ------------- | -------------| | **pageSize** | **Integer** | Maximum amount of entities in a one page | | | **page** | **Integer** | Sequence number of page starting from 0 | | -| **resourceType** | **String** | A string value representing the resource type. | [optional] [enum: LWM2M_MODEL, JKS, PKCS_12, JS_MODULE] | +| **resourceType** | **Set** | A list of resource types, separated by comma ','. | [optional] | | **resourceSubType** | **String** | A string value representing the resource sub-type. | [optional] [enum: EXTENSION, MODULE] | | **textSearch** | **String** | The case insensitive 'substring' filter based on the resource title. | [optional] | | **sortProperty** | **String** | Property of entity to sort by | [optional] [enum: createdTime, title, resourceType, tenantId] | diff --git a/paas/docs/Tenant.md b/paas/docs/Tenant.md index 86d522e6..122c583a 100644 --- a/paas/docs/Tenant.md +++ b/paas/docs/Tenant.md @@ -58,6 +58,7 @@ A JSON value representing the tenant. | maxAiCredits | Long | | [optional] | | edgeEnabled | Boolean | | [optional] | | maxEdges | Long | | [optional] | +| maxAgents | Long | | [optional] | | trendzEnabled | Boolean | | [optional] | | whiteLabelingEnabled | Boolean | | [optional] | | _default | Boolean | | [optional] | diff --git a/paas/docs/TenantAddonData.md b/paas/docs/TenantAddonData.md index 346a0f0a..6721b050 100644 --- a/paas/docs/TenantAddonData.md +++ b/paas/docs/TenantAddonData.md @@ -25,6 +25,7 @@ | **maxAiCredits** | **Long** | | [optional] | | **edgeEnabled** | **Boolean** | | [optional] | | **maxEdges** | **Long** | | [optional] | +| **maxAgents** | **Long** | | [optional] | | **trendzEnabled** | **Boolean** | | [optional] | | **whiteLabelingEnabled** | **Boolean** | | [optional] | | **_default** | **Boolean** | | [optional] | diff --git a/paas/docs/TenantInfo.md b/paas/docs/TenantInfo.md index 7b225945..942bc677 100644 --- a/paas/docs/TenantInfo.md +++ b/paas/docs/TenantInfo.md @@ -57,6 +57,7 @@ | maxAiCredits | Long | | [optional] | | edgeEnabled | Boolean | | [optional] | | maxEdges | Long | | [optional] | +| maxAgents | Long | | [optional] | | trendzEnabled | Boolean | | [optional] | | whiteLabelingEnabled | Boolean | | [optional] | | _default | Boolean | | [optional] | diff --git a/paas/docs/X509LwM2MBootstrapServerCredential.md b/paas/docs/X509LwM2MBootstrapServerCredential.md index 6cac8975..5c1d8e1d 100644 --- a/paas/docs/X509LwM2MBootstrapServerCredential.md +++ b/paas/docs/X509LwM2MBootstrapServerCredential.md @@ -9,7 +9,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **shortServerId** | **Integer** | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | +| **shortServerId** | **Integer** | Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. | [optional] [readonly] | | **bootstrapServerIs** | **Boolean** | Is Bootstrap Server or Lwm2m Server. The LwM2M Client MAY be configured to use one or more LwM2M Server Account(s). The LwM2M Client MUST have at most one LwM2M Bootstrap-Server Account. (*) The LwM2M client MUST have at least one LwM2M server account after completing the boot sequence specified. | [optional] [readonly] | | **host** | **String** | Host for 'No Security' mode | [optional] [readonly] | | **port** | **Integer** | Port for Lwm2m Server: 'No Security' mode: Lwm2m Server or Bootstrap Server | [optional] [readonly] | diff --git a/paas/spec/openapi.json b/paas/spec/openapi.json index 5d4a0199..2e795d33 100644 --- a/paas/spec/openapi.json +++ b/paas/spec/openapi.json @@ -2,7 +2,7 @@ "openapi": "3.1.0", "info": { "title": "ThingsBoard REST API", - "description": " ThingsBoard Professional Edition IoT platform REST API documentation.", + "description": " ThingsBoard IoT platform REST API documentation.", "contact": { "name": "ThingsBoard, Inc.", "url": "https://thingsboard.io", @@ -16,7 +16,7 @@ }, "servers": [ { - "url": "http://localhost:35993", + "url": "http://localhost:36471", "description": "Generated server url" } ], @@ -118186,7 +118186,7 @@ "sign-up-controller" ], "summary": "Accept privacy policy (acceptPrivacyPolicy)", - "description": "Accept privacy policy by the current user.", + "description": "Accept privacy policy by the current user. Stores the acceptance flag 'privacyPolicyAccepted' and the acceptance time 'privacyPolicyAcceptedTs' (epoch milliseconds) in the user's additional info. Repeated acceptance overwrites the stored time.", "operationId": "acceptPrivacyPolicy", "responses": { "200": { @@ -118485,7 +118485,7 @@ "sign-up-controller" ], "summary": "Accept Terms of Use (acceptTermsOfUse)", - "description": "Accept Terms of Use by the current user.", + "description": "Accept Terms of Use by the current user. Stores the acceptance flag 'termsOfUseAccepted' and the acceptance time 'termsOfUseAcceptedTs' (epoch milliseconds) in the user's additional info. Repeated acceptance overwrites the stored time.", "operationId": "acceptTermsOfUse", "responses": { "200": { @@ -120641,16 +120641,14 @@ { "name": "resourceType", "in": "query", - "description": "A string value representing the resource type.", + "description": "A list of resource types, separated by comma ','.", "required": false, "schema": { - "type": "string", - "enum": [ - "LWM2M_MODEL", - "JKS", - "PKCS_12", - "JS_MODULE" - ] + "type": "array", + "items": { + "$ref": "#/components/schemas/ResourceType" + }, + "uniqueItems": true } }, { @@ -155225,7 +155223,8 @@ "AUDIT_LOGS", "NOTIFICATIONS", "DEVICE_LIST", - "DASHBOARDS" + "DASHBOARDS", + "LIVE_LOCATION_TRACKING" ] }, "DefaultRuleChainCreateRequest": { @@ -162484,7 +162483,7 @@ }, "example": { "securityMode": "NO_SEC", - "shortServerId": 123, + "shortServerId": 1, "bootstrapServerIs": true, "host": "0.0.0.0", "port": "'5685' or '5687'", @@ -162512,8 +162511,8 @@ "shortServerId": { "type": "integer", "format": "int32", - "description": "Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server.", - "example": 123, + "description": "Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server.", + "example": 1, "readOnly": true }, "bootstrapServerIs": { @@ -163762,8 +163761,8 @@ "shortServerId": { "type": "integer", "format": "int32", - "description": "Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server.", - "example": 123, + "description": "Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server.", + "example": 1, "readOnly": true }, "bootstrapServerIs": { @@ -163842,7 +163841,7 @@ ], "example": { "securityMode": "NO_SEC", - "shortServerId": 123, + "shortServerId": 1, "bootstrapServerIs": true, "host": "0.0.0.0", "port": "'5685' or '5687'", @@ -165824,8 +165823,8 @@ "shortServerId": { "type": "integer", "format": "int32", - "description": "Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server.", - "example": 123, + "description": "Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server.", + "example": 1, "readOnly": true }, "bootstrapServerIs": { @@ -165904,7 +165903,7 @@ ], "example": { "securityMode": "PSK", - "shortServerId": 123, + "shortServerId": 1, "bootstrapServerIs": true, "host": "0.0.0.0", "port": "'5685' or '5687'", @@ -169039,8 +169038,8 @@ "shortServerId": { "type": "integer", "format": "int32", - "description": "Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server.", - "example": 123, + "description": "Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server.", + "example": 1, "readOnly": true }, "bootstrapServerIs": { @@ -169119,7 +169118,7 @@ ], "example": { "securityMode": "RPK", - "shortServerId": 123, + "shortServerId": 1, "bootstrapServerIs": true, "host": "0.0.0.0", "port": "'5685' or '5687'", @@ -174367,6 +174366,10 @@ "type": "integer", "format": "int64" }, + "extraAgentPackCount": { + "type": "integer", + "format": "int64" + }, "trafficPackCount": { "type": "integer", "format": "int64" @@ -174468,6 +174471,10 @@ "type": "integer", "format": "int64" }, + "agents": { + "type": "integer", + "format": "int64" + }, "transportMessages": { "type": "integer", "format": "int64" @@ -175416,6 +175423,10 @@ "type": "integer", "format": "int64" }, + "maxAgents": { + "type": "integer", + "format": "int64" + }, "trendzEnabled": { "type": "boolean" }, @@ -179017,8 +179028,8 @@ "shortServerId": { "type": "integer", "format": "int32", - "description": "Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server.", - "example": 123, + "description": "Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server.", + "example": 1, "readOnly": true }, "bootstrapServerIs": { @@ -179097,7 +179108,7 @@ ], "example": { "securityMode": "X509", - "shortServerId": 123, + "shortServerId": 1, "bootstrapServerIs": true, "host": "0.0.0.0", "port": "'5685' or '5687'", diff --git a/paas/src/main/java/org/thingsboard/client/ApiClient.java b/paas/src/main/java/org/thingsboard/client/ApiClient.java index f44f6e83..edf49f23 100644 --- a/paas/src/main/java/org/thingsboard/client/ApiClient.java +++ b/paas/src/main/java/org/thingsboard/client/ApiClient.java @@ -173,7 +173,7 @@ public static List parameterToPairs( public ApiClient() { this.builder = createDefaultHttpClientBuilder(); this.mapper = createDefaultObjectMapper(); - updateBaseUri("http://localhost:35993"); + updateBaseUri("http://localhost:36471"); interceptor = null; readTimeout = null; connectTimeout = null; @@ -191,7 +191,7 @@ public ApiClient() { public ApiClient(HttpClient.Builder builder, ObjectMapper mapper, String baseUri) { this.builder = builder; this.mapper = mapper; - updateBaseUri(baseUri != null ? baseUri : "http://localhost:35993"); + updateBaseUri(baseUri != null ? baseUri : "http://localhost:36471"); interceptor = null; readTimeout = null; connectTimeout = null; diff --git a/paas/src/main/java/org/thingsboard/client/api/ThingsboardApi.java b/paas/src/main/java/org/thingsboard/client/api/ThingsboardApi.java index 3bc4c307..1347ea61 100644 --- a/paas/src/main/java/org/thingsboard/client/api/ThingsboardApi.java +++ b/paas/src/main/java/org/thingsboard/client/api/ThingsboardApi.java @@ -273,6 +273,7 @@ import org.thingsboard.client.model.ResetPasswordEmailRequest; import org.thingsboard.client.model.ResetPasswordRequest; import org.thingsboard.client.model.ResourceExportData; +import org.thingsboard.client.model.ResourceType; import org.thingsboard.client.model.Role; import org.thingsboard.client.model.Rpc; import org.thingsboard.client.model.RuleChain; @@ -503,7 +504,7 @@ private File prepareDownloadFile(HttpResponse response) throws IOEx /** * Accept privacy policy (acceptPrivacyPolicy) - * Accept privacy policy by the current user. + * Accept privacy policy by the current user. Stores the acceptance flag 'privacyPolicyAccepted' and the acceptance time 'privacyPolicyAcceptedTs' (epoch milliseconds) in the user's additional info. Repeated acceptance overwrites the stored time. * @return JwtPair * @throws ApiException if fails to make API call */ @@ -514,7 +515,7 @@ public JwtPair acceptPrivacyPolicy() throws ApiException { /** * Accept privacy policy (acceptPrivacyPolicy) - * Accept privacy policy by the current user. + * Accept privacy policy by the current user. Stores the acceptance flag 'privacyPolicyAccepted' and the acceptance time 'privacyPolicyAcceptedTs' (epoch milliseconds) in the user's additional info. Repeated acceptance overwrites the stored time. * @param headers Optional headers to include in the request * @return ApiResponse<JwtPair> * @throws ApiException if fails to make API call @@ -643,7 +644,7 @@ private HttpRequest.Builder acceptPrivacyPolicyAndTermsOfUseRequestBuilder(Map resourceType = apiRequest.resourceType(); @Nullable String resourceSubType = apiRequest.resourceSubType(); @Nullable @@ -86286,7 +86287,7 @@ public PageDataTbResourceInfo getResources(GetResourcesArgs apiRequest) throws A public ApiResponse getResourcesWithHttpInfo(GetResourcesArgs apiRequest, Map headers) throws ApiException { Integer pageSize = apiRequest.pageSize(); Integer page = apiRequest.page(); - String resourceType = apiRequest.resourceType(); + Set resourceType = apiRequest.resourceType(); String resourceSubType = apiRequest.resourceSubType(); String textSearch = apiRequest.textSearch(); String sortProperty = apiRequest.sortProperty(); @@ -86299,7 +86300,7 @@ public ApiResponse getResourcesWithHttpInfo(GetResources * Returns a page of Resource Info objects owned by tenant or sysadmin. You can specify parameters to filter the results. The result is wrapped with PageData object that allows you to iterate over result set using pagination. See response schema for more details. Resource Info is a lightweight object that includes main information about the Resource excluding the heavyweight data. Available for users with 'SYS_ADMIN' or 'TENANT_ADMIN' authority. * @param pageSize Maximum amount of entities in a one page (required) * @param page Sequence number of page starting from 0 (required) - * @param resourceType A string value representing the resource type. (optional) + * @param resourceType A list of resource types, separated by comma ','. (optional) * @param resourceSubType A string value representing the resource sub-type. (optional) * @param textSearch The case insensitive 'substring' filter based on the resource title. (optional) * @param sortProperty Property of entity to sort by (optional) @@ -86313,7 +86314,7 @@ public ApiResponse getResourcesWithHttpInfo(GetResources * new parameters are added as optional builder fields. Scheduled for removal in a future release. */ @Deprecated(forRemoval = true) - public PageDataTbResourceInfo getResources(@Nonnull Integer pageSize, @Nonnull Integer page, @Nullable String resourceType, @Nullable String resourceSubType, @Nullable String textSearch, @Nullable String sortProperty, @Nullable String sortOrder) throws ApiException { + public PageDataTbResourceInfo getResources(@Nonnull Integer pageSize, @Nonnull Integer page, @Nullable Set resourceType, @Nullable String resourceSubType, @Nullable String textSearch, @Nullable String sortProperty, @Nullable String sortOrder) throws ApiException { ApiResponse localVarResponse = getResourcesWithHttpInfo(pageSize, page, resourceType, resourceSubType, textSearch, sortProperty, sortOrder, null); return localVarResponse.getData(); } @@ -86323,7 +86324,7 @@ public PageDataTbResourceInfo getResources(@Nonnull Integer pageSize, @Nonnull I * Returns a page of Resource Info objects owned by tenant or sysadmin. You can specify parameters to filter the results. The result is wrapped with PageData object that allows you to iterate over result set using pagination. See response schema for more details. Resource Info is a lightweight object that includes main information about the Resource excluding the heavyweight data. Available for users with 'SYS_ADMIN' or 'TENANT_ADMIN' authority. * @param pageSize Maximum amount of entities in a one page (required) * @param page Sequence number of page starting from 0 (required) - * @param resourceType A string value representing the resource type. (optional) + * @param resourceType A list of resource types, separated by comma ','. (optional) * @param resourceSubType A string value representing the resource sub-type. (optional) * @param textSearch The case insensitive 'substring' filter based on the resource title. (optional) * @param sortProperty Property of entity to sort by (optional) @@ -86338,7 +86339,7 @@ public PageDataTbResourceInfo getResources(@Nonnull Integer pageSize, @Nonnull I * new parameters are added as optional builder fields. Scheduled for removal in a future release. */ @Deprecated(forRemoval = true) - public ApiResponse getResourcesWithHttpInfo(@Nonnull Integer pageSize, @Nonnull Integer page, @Nullable String resourceType, @Nullable String resourceSubType, @Nullable String textSearch, @Nullable String sortProperty, @Nullable String sortOrder, Map headers) throws ApiException { + public ApiResponse getResourcesWithHttpInfo(@Nonnull Integer pageSize, @Nonnull Integer page, @Nullable Set resourceType, @Nullable String resourceSubType, @Nullable String textSearch, @Nullable String sortProperty, @Nullable String sortOrder, Map headers) throws ApiException { HttpRequest.Builder localVarRequestBuilder = getResourcesRequestBuilder(pageSize, page, resourceType, resourceSubType, textSearch, sortProperty, sortOrder, headers); try { HttpResponse localVarResponse = memberVarHttpClient.send( @@ -86373,7 +86374,7 @@ public ApiResponse getResourcesWithHttpInfo(@Nonnull Int } } - private HttpRequest.Builder getResourcesRequestBuilder(@Nonnull Integer pageSize, @Nonnull Integer page, @Nullable String resourceType, @Nullable String resourceSubType, @Nullable String textSearch, @Nullable String sortProperty, @Nullable String sortOrder, Map headers) throws ApiException { + private HttpRequest.Builder getResourcesRequestBuilder(@Nonnull Integer pageSize, @Nonnull Integer page, @Nullable Set resourceType, @Nullable String resourceSubType, @Nullable String textSearch, @Nullable String sortProperty, @Nullable String sortOrder, Map headers) throws ApiException { // verify the required parameter 'pageSize' is set if (pageSize == null) { throw new ApiException(400, "Missing the required parameter 'pageSize' when calling getResources"); @@ -86392,7 +86393,7 @@ private HttpRequest.Builder getResourcesRequestBuilder(@Nonnull Integer pageSize localVarQueryParameterBaseName = "page"; localVarQueryParams.addAll(ApiClient.parameterToPairs("page", page)); localVarQueryParameterBaseName = "resourceType"; - localVarQueryParams.addAll(ApiClient.parameterToPairs("resourceType", resourceType)); + localVarQueryParams.addAll(ApiClient.parameterToPairs("multi", "resourceType", resourceType)); localVarQueryParameterBaseName = "resourceSubType"; localVarQueryParams.addAll(ApiClient.parameterToPairs("resourceSubType", resourceSubType)); localVarQueryParameterBaseName = "textSearch"; @@ -86430,7 +86431,7 @@ public static final class GetResourcesArgs { @Nonnull private Integer page; // Sequence number of page starting from 0 (required) @Nullable - private String resourceType; // A string value representing the resource type. (optional) + private Set resourceType; // A list of resource types, separated by comma ','. (optional) @Nullable private String resourceSubType; // A string value representing the resource sub-type. (optional) @Nullable @@ -86457,7 +86458,7 @@ public Integer page() { return page; } @Nullable - public String resourceType() { + public Set resourceType() { return resourceType; } @Nullable @@ -86482,7 +86483,7 @@ public static Builder builder() { public static class Builder { private Integer pageSize; private Integer page; - private String resourceType; + private Set resourceType; private String resourceSubType; private String textSearch; private String sortProperty; @@ -86495,7 +86496,7 @@ public Builder page(@Nonnull Integer page) { this.page = page; return this; } - public Builder resourceType(@Nullable String resourceType) { + public Builder resourceType(@Nullable Set resourceType) { this.resourceType = resourceType; return this; } diff --git a/paas/src/main/java/org/thingsboard/client/model/DefaultPageId.java b/paas/src/main/java/org/thingsboard/client/model/DefaultPageId.java index 20878220..0ba92a55 100644 --- a/paas/src/main/java/org/thingsboard/client/model/DefaultPageId.java +++ b/paas/src/main/java/org/thingsboard/client/model/DefaultPageId.java @@ -48,7 +48,9 @@ public enum DefaultPageId { DEVICE_LIST("DEVICE_LIST"), - DASHBOARDS("DASHBOARDS"); + DASHBOARDS("DASHBOARDS"), + + LIVE_LOCATION_TRACKING("LIVE_LOCATION_TRACKING"); private String value; diff --git a/paas/src/main/java/org/thingsboard/client/model/LwM2MServerSecurityConfigDefault.java b/paas/src/main/java/org/thingsboard/client/model/LwM2MServerSecurityConfigDefault.java index 2fba7798..0e182ab9 100644 --- a/paas/src/main/java/org/thingsboard/client/model/LwM2MServerSecurityConfigDefault.java +++ b/paas/src/main/java/org/thingsboard/client/model/LwM2MServerSecurityConfigDefault.java @@ -148,7 +148,7 @@ public LwM2MServerSecurityConfigDefault( } /** - * Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. + * Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. * @return shortServerId */ @Nullable diff --git a/paas/src/main/java/org/thingsboard/client/model/NoSecLwM2MBootstrapServerCredential.java b/paas/src/main/java/org/thingsboard/client/model/NoSecLwM2MBootstrapServerCredential.java index 81de00d0..ff1b150a 100644 --- a/paas/src/main/java/org/thingsboard/client/model/NoSecLwM2MBootstrapServerCredential.java +++ b/paas/src/main/java/org/thingsboard/client/model/NoSecLwM2MBootstrapServerCredential.java @@ -145,7 +145,7 @@ public NoSecLwM2MBootstrapServerCredential( } /** - * Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. + * Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. * @return shortServerId */ @Nullable diff --git a/paas/src/main/java/org/thingsboard/client/model/PSKLwM2MBootstrapServerCredential.java b/paas/src/main/java/org/thingsboard/client/model/PSKLwM2MBootstrapServerCredential.java index 7ba5277d..a62fb42a 100644 --- a/paas/src/main/java/org/thingsboard/client/model/PSKLwM2MBootstrapServerCredential.java +++ b/paas/src/main/java/org/thingsboard/client/model/PSKLwM2MBootstrapServerCredential.java @@ -145,7 +145,7 @@ public PSKLwM2MBootstrapServerCredential( } /** - * Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. + * Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. * @return shortServerId */ @Nullable diff --git a/paas/src/main/java/org/thingsboard/client/model/RPKLwM2MBootstrapServerCredential.java b/paas/src/main/java/org/thingsboard/client/model/RPKLwM2MBootstrapServerCredential.java index 5ea9423d..f4992f8b 100644 --- a/paas/src/main/java/org/thingsboard/client/model/RPKLwM2MBootstrapServerCredential.java +++ b/paas/src/main/java/org/thingsboard/client/model/RPKLwM2MBootstrapServerCredential.java @@ -145,7 +145,7 @@ public RPKLwM2MBootstrapServerCredential( } /** - * Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. + * Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. * @return shortServerId */ @Nullable diff --git a/paas/src/main/java/org/thingsboard/client/model/SubscriptionItems.java b/paas/src/main/java/org/thingsboard/client/model/SubscriptionItems.java index 13604d7a..5c6ca5fd 100644 --- a/paas/src/main/java/org/thingsboard/client/model/SubscriptionItems.java +++ b/paas/src/main/java/org/thingsboard/client/model/SubscriptionItems.java @@ -41,6 +41,7 @@ SubscriptionItems.JSON_PROPERTY_EXTRA_CUSTOMER_PACK_COUNT, SubscriptionItems.JSON_PROPERTY_EXTRA_INTEGRATION_PACK_COUNT, SubscriptionItems.JSON_PROPERTY_EXTRA_CALCULATED_FIELD_COUNT, + SubscriptionItems.JSON_PROPERTY_EXTRA_AGENT_PACK_COUNT, SubscriptionItems.JSON_PROPERTY_TRAFFIC_PACK_COUNT, SubscriptionItems.JSON_PROPERTY_COMPUTE_PACK_COUNT, SubscriptionItems.JSON_PROPERTY_STORAGE_PACK_COUNT, @@ -71,6 +72,10 @@ public class SubscriptionItems { @Nullable private Long extraCalculatedFieldCount; + public static final String JSON_PROPERTY_EXTRA_AGENT_PACK_COUNT = "extraAgentPackCount"; + @Nullable + private Long extraAgentPackCount; + public static final String JSON_PROPERTY_TRAFFIC_PACK_COUNT = "trafficPackCount"; @Nullable private Long trafficPackCount; @@ -214,6 +219,30 @@ public void setExtraCalculatedFieldCount(@Nullable Long extraCalculatedFieldCoun } + public SubscriptionItems extraAgentPackCount(@Nullable Long extraAgentPackCount) { + this.extraAgentPackCount = extraAgentPackCount; + return this; + } + + /** + * Get extraAgentPackCount + * @return extraAgentPackCount + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_EXTRA_AGENT_PACK_COUNT, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long getExtraAgentPackCount() { + return extraAgentPackCount; + } + + + @JsonProperty(value = JSON_PROPERTY_EXTRA_AGENT_PACK_COUNT, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setExtraAgentPackCount(@Nullable Long extraAgentPackCount) { + this.extraAgentPackCount = extraAgentPackCount; + } + + public SubscriptionItems trafficPackCount(@Nullable Long trafficPackCount) { this.trafficPackCount = trafficPackCount; return this; @@ -494,6 +523,7 @@ public boolean equals(Object o) { Objects.equals(this.extraCustomerPackCount, subscriptionItems.extraCustomerPackCount) && Objects.equals(this.extraIntegrationPackCount, subscriptionItems.extraIntegrationPackCount) && Objects.equals(this.extraCalculatedFieldCount, subscriptionItems.extraCalculatedFieldCount) && + Objects.equals(this.extraAgentPackCount, subscriptionItems.extraAgentPackCount) && Objects.equals(this.trafficPackCount, subscriptionItems.trafficPackCount) && Objects.equals(this.computePackCount, subscriptionItems.computePackCount) && Objects.equals(this.storagePackCount, subscriptionItems.storagePackCount) && @@ -509,7 +539,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(extraDevicePackCount, extraCustomerPackCount, extraIntegrationPackCount, extraCalculatedFieldCount, trafficPackCount, computePackCount, storagePackCount, alarmPackCount, emailPackCount, smsPackCount, aiCreditsPackCount, edgeEnabled, extraEdgeCount, trendzEnabled, whiteLabelingAddonEnabled); + return Objects.hash(extraDevicePackCount, extraCustomerPackCount, extraIntegrationPackCount, extraCalculatedFieldCount, extraAgentPackCount, trafficPackCount, computePackCount, storagePackCount, alarmPackCount, emailPackCount, smsPackCount, aiCreditsPackCount, edgeEnabled, extraEdgeCount, trendzEnabled, whiteLabelingAddonEnabled); } @Override @@ -520,6 +550,7 @@ public String toString() { sb.append(" extraCustomerPackCount: ").append(toIndentedString(extraCustomerPackCount)).append("\n"); sb.append(" extraIntegrationPackCount: ").append(toIndentedString(extraIntegrationPackCount)).append("\n"); sb.append(" extraCalculatedFieldCount: ").append(toIndentedString(extraCalculatedFieldCount)).append("\n"); + sb.append(" extraAgentPackCount: ").append(toIndentedString(extraAgentPackCount)).append("\n"); sb.append(" trafficPackCount: ").append(toIndentedString(trafficPackCount)).append("\n"); sb.append(" computePackCount: ").append(toIndentedString(computePackCount)).append("\n"); sb.append(" storagePackCount: ").append(toIndentedString(storagePackCount)).append("\n"); @@ -598,6 +629,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sextraCalculatedFieldCount%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getExtraCalculatedFieldCount())))); } + // add `extraAgentPackCount` to the URL query string + if (getExtraAgentPackCount() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sextraAgentPackCount%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getExtraAgentPackCount())))); + } + // add `trafficPackCount` to the URL query string if (getTrafficPackCount() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%strafficPackCount%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getTrafficPackCount())))); diff --git a/paas/src/main/java/org/thingsboard/client/model/SubscriptionUsage.java b/paas/src/main/java/org/thingsboard/client/model/SubscriptionUsage.java index 68b7d933..63c9006a 100644 --- a/paas/src/main/java/org/thingsboard/client/model/SubscriptionUsage.java +++ b/paas/src/main/java/org/thingsboard/client/model/SubscriptionUsage.java @@ -47,6 +47,7 @@ SubscriptionUsage.JSON_PROPERTY_CONVERTERS, SubscriptionUsage.JSON_PROPERTY_SCHEDULER_EVENTS, SubscriptionUsage.JSON_PROPERTY_EDGES, + SubscriptionUsage.JSON_PROPERTY_AGENTS, SubscriptionUsage.JSON_PROPERTY_TRANSPORT_MESSAGES, SubscriptionUsage.JSON_PROPERTY_TRANSPORT_DATA_POINTS, SubscriptionUsage.JSON_PROPERTY_RE_EXECUTIONS, @@ -100,6 +101,10 @@ public class SubscriptionUsage { @Nullable private Long edges; + public static final String JSON_PROPERTY_AGENTS = "agents"; + @Nullable + private Long agents; + public static final String JSON_PROPERTY_TRANSPORT_MESSAGES = "transportMessages"; @Nullable private Long transportMessages; @@ -383,6 +388,30 @@ public void setEdges(@Nullable Long edges) { } + public SubscriptionUsage agents(@Nullable Long agents) { + this.agents = agents; + return this; + } + + /** + * Get agents + * @return agents + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_AGENTS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long getAgents() { + return agents; + } + + + @JsonProperty(value = JSON_PROPERTY_AGENTS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAgents(@Nullable Long agents) { + this.agents = agents; + } + + public SubscriptionUsage transportMessages(@Nullable Long transportMessages) { this.transportMessages = transportMessages; return this; @@ -645,6 +674,7 @@ public boolean equals(Object o) { Objects.equals(this.converters, subscriptionUsage.converters) && Objects.equals(this.schedulerEvents, subscriptionUsage.schedulerEvents) && Objects.equals(this.edges, subscriptionUsage.edges) && + Objects.equals(this.agents, subscriptionUsage.agents) && Objects.equals(this.transportMessages, subscriptionUsage.transportMessages) && Objects.equals(this.transportDataPoints, subscriptionUsage.transportDataPoints) && Objects.equals(this.reExecutions, subscriptionUsage.reExecutions) && @@ -659,7 +689,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(devices, assets, customers, users, dashboards, ruleChains, integrations, converters, schedulerEvents, edges, transportMessages, transportDataPoints, reExecutions, jsExecutions, dpStorageDays, emails, sms, alarms, reports, aiCredits); + return Objects.hash(devices, assets, customers, users, dashboards, ruleChains, integrations, converters, schedulerEvents, edges, agents, transportMessages, transportDataPoints, reExecutions, jsExecutions, dpStorageDays, emails, sms, alarms, reports, aiCredits); } @Override @@ -676,6 +706,7 @@ public String toString() { sb.append(" converters: ").append(toIndentedString(converters)).append("\n"); sb.append(" schedulerEvents: ").append(toIndentedString(schedulerEvents)).append("\n"); sb.append(" edges: ").append(toIndentedString(edges)).append("\n"); + sb.append(" agents: ").append(toIndentedString(agents)).append("\n"); sb.append(" transportMessages: ").append(toIndentedString(transportMessages)).append("\n"); sb.append(" transportDataPoints: ").append(toIndentedString(transportDataPoints)).append("\n"); sb.append(" reExecutions: ").append(toIndentedString(reExecutions)).append("\n"); @@ -783,6 +814,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sedges%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEdges())))); } + // add `agents` to the URL query string + if (getAgents() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sagents%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAgents())))); + } + // add `transportMessages` to the URL query string if (getTransportMessages() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%stransportMessages%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getTransportMessages())))); diff --git a/paas/src/main/java/org/thingsboard/client/model/TenantAddonData.java b/paas/src/main/java/org/thingsboard/client/model/TenantAddonData.java index df6a5518..88adc15e 100644 --- a/paas/src/main/java/org/thingsboard/client/model/TenantAddonData.java +++ b/paas/src/main/java/org/thingsboard/client/model/TenantAddonData.java @@ -55,6 +55,7 @@ TenantAddonData.JSON_PROPERTY_MAX_AI_CREDITS, TenantAddonData.JSON_PROPERTY_EDGE_ENABLED, TenantAddonData.JSON_PROPERTY_MAX_EDGES, + TenantAddonData.JSON_PROPERTY_MAX_AGENTS, TenantAddonData.JSON_PROPERTY_TRENDZ_ENABLED, TenantAddonData.JSON_PROPERTY_WHITE_LABELING_ENABLED, TenantAddonData.JSON_PROPERTY_DEFAULT @@ -133,6 +134,10 @@ public class TenantAddonData { @Nullable private Long maxEdges; + public static final String JSON_PROPERTY_MAX_AGENTS = "maxAgents"; + @Nullable + private Long maxAgents; + public static final String JSON_PROPERTY_TRENDZ_ENABLED = "trendzEnabled"; @Nullable private Boolean trendzEnabled; @@ -580,6 +585,30 @@ public void setMaxEdges(@Nullable Long maxEdges) { } + public TenantAddonData maxAgents(@Nullable Long maxAgents) { + this.maxAgents = maxAgents; + return this; + } + + /** + * Get maxAgents + * @return maxAgents + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_MAX_AGENTS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long getMaxAgents() { + return maxAgents; + } + + + @JsonProperty(value = JSON_PROPERTY_MAX_AGENTS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setMaxAgents(@Nullable Long maxAgents) { + this.maxAgents = maxAgents; + } + + public TenantAddonData trendzEnabled(@Nullable Boolean trendzEnabled) { this.trendzEnabled = trendzEnabled; return this; @@ -682,6 +711,7 @@ public boolean equals(Object o) { Objects.equals(this.maxAiCredits, tenantAddonData.maxAiCredits) && Objects.equals(this.edgeEnabled, tenantAddonData.edgeEnabled) && Objects.equals(this.maxEdges, tenantAddonData.maxEdges) && + Objects.equals(this.maxAgents, tenantAddonData.maxAgents) && Objects.equals(this.trendzEnabled, tenantAddonData.trendzEnabled) && Objects.equals(this.whiteLabelingEnabled, tenantAddonData.whiteLabelingEnabled) && Objects.equals(this._default, tenantAddonData._default); @@ -689,7 +719,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(maxDevices, maxAssets, maxCustomers, maxUsers, maxIntegrations, maxConverters, maxCalculatedFieldsPerEntity, maxTransportMessages, maxTransportDataPoints, maxREExecutions, maxJSExecutions, maxDPStorageDays, maxCreatedAlarms, maxEmails, maxSms, maxAiCredits, edgeEnabled, maxEdges, trendzEnabled, whiteLabelingEnabled, _default); + return Objects.hash(maxDevices, maxAssets, maxCustomers, maxUsers, maxIntegrations, maxConverters, maxCalculatedFieldsPerEntity, maxTransportMessages, maxTransportDataPoints, maxREExecutions, maxJSExecutions, maxDPStorageDays, maxCreatedAlarms, maxEmails, maxSms, maxAiCredits, edgeEnabled, maxEdges, maxAgents, trendzEnabled, whiteLabelingEnabled, _default); } @Override @@ -714,6 +744,7 @@ public String toString() { sb.append(" maxAiCredits: ").append(toIndentedString(maxAiCredits)).append("\n"); sb.append(" edgeEnabled: ").append(toIndentedString(edgeEnabled)).append("\n"); sb.append(" maxEdges: ").append(toIndentedString(maxEdges)).append("\n"); + sb.append(" maxAgents: ").append(toIndentedString(maxAgents)).append("\n"); sb.append(" trendzEnabled: ").append(toIndentedString(trendzEnabled)).append("\n"); sb.append(" whiteLabelingEnabled: ").append(toIndentedString(whiteLabelingEnabled)).append("\n"); sb.append(" _default: ").append(toIndentedString(_default)).append("\n"); @@ -854,6 +885,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%smaxEdges%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMaxEdges())))); } + // add `maxAgents` to the URL query string + if (getMaxAgents() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%smaxAgents%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getMaxAgents())))); + } + // add `trendzEnabled` to the URL query string if (getTrendzEnabled() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%strendzEnabled%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getTrendzEnabled())))); diff --git a/paas/src/main/java/org/thingsboard/client/model/X509LwM2MBootstrapServerCredential.java b/paas/src/main/java/org/thingsboard/client/model/X509LwM2MBootstrapServerCredential.java index 1233964d..3c0c0429 100644 --- a/paas/src/main/java/org/thingsboard/client/model/X509LwM2MBootstrapServerCredential.java +++ b/paas/src/main/java/org/thingsboard/client/model/X509LwM2MBootstrapServerCredential.java @@ -145,7 +145,7 @@ public X509LwM2MBootstrapServerCredential( } /** - * Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false'. The values ID:0 and ID:65535 values MUST NOT be used for identifying the LwM2M Server. + * Server short Id. Used as link to associate server Object Instance. This identifier uniquely identifies each LwM2M Server configured for the LwM2M Client. This Resource MUST be set when the Bootstrap-Server Resource has a value of 'false' and MUST be null when Bootstrap-Server is 'true'. The values 0 and 65535 MUST NOT be used for identifying the LwM2M Server. * @return shortServerId */ @Nullable