diff --git a/ce/docs/AiModelExportData.md b/ce/docs/AiModelExportData.md index 3d68e845..0d632210 100644 --- a/ce/docs/AiModelExportData.md +++ b/ce/docs/AiModelExportData.md @@ -96,8 +96,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -201,11 +201,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -341,26 +341,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -391,41 +391,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -442,17 +442,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -461,46 +464,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -509,7 +509,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -518,7 +518,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/AlarmCalculatedFieldConfiguration.md b/ce/docs/AlarmCalculatedFieldConfiguration.md index bac9af96..fd6f3fa1 100644 --- a/ce/docs/AlarmCalculatedFieldConfiguration.md +++ b/ce/docs/AlarmCalculatedFieldConfiguration.md @@ -10,8 +10,8 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| | **arguments** | **Map\** | | | -| **createRules** | **Map\** | | | -| **clearRule** | **AlarmRuleDefinition** | | [optional] | +| **createRules** | **Map\** | | | +| **clearRule** | **AlarmRule** | | [optional] | | **propagate** | **Boolean** | | [optional] | | **propagateToOwner** | **Boolean** | | [optional] | | **propagateToTenant** | **Boolean** | | [optional] | @@ -39,11 +39,11 @@ | limit | Integer | | [optional] | | timeWindow | Long | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### Output @@ -85,26 +85,26 @@ | type | ArgumentType | | [optional] | | scope | AttributeScope | | [optional] | -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AttributeScope (enum) `CLIENT_SCOPE` | `SERVER_SCOPE` | `SHARED_SCOPE` @@ -123,19 +123,19 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | #### TimeSeriesOutputStrategy | Name | Type | Description | Notes | @@ -177,27 +177,27 @@ | direction | EntitySearchDirection | | | | relationType | String | | | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -217,17 +217,20 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -236,46 +239,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -284,7 +284,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -293,7 +293,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/AlarmRuleCondition.md b/ce/docs/AlarmCondition.md similarity index 78% rename from ce/docs/AlarmRuleCondition.md rename to ce/docs/AlarmCondition.md index 92d6b2ad..39765535 100644 --- a/ce/docs/AlarmRuleCondition.md +++ b/ce/docs/AlarmCondition.md @@ -1,32 +1,32 @@ -# AlarmRuleCondition +# AlarmCondition -`org.thingsboard.client.model.AlarmRuleCondition` +`org.thingsboard.client.model.AlarmCondition` ## Properties | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| | **expression** | **AlarmConditionExpression** | | | -| **schedule** | **AlarmConditionValueAlarmRuleSchedule** | | [optional] | +| **schedule** | **AlarmConditionValueAlarmSchedule** | | [optional] | | **type** | **String** | | | ## Subtypes -#### AlarmRuleDurationCondition *(type=`DURATION`)* +#### DurationAlarmCondition *(type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(type=`REPEATING`)* +#### RepeatingAlarmCondition *(type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(type=`SIMPLE`)* +#### SimpleAlarmCondition *(type=`SIMPLE`)* *(no additional properties)* ## Referenced Types @@ -39,19 +39,19 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -68,39 +68,42 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -109,46 +112,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -157,7 +157,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -166,7 +166,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/AlarmConditionExpression.md b/ce/docs/AlarmConditionExpression.md index 8f52fdc5..383fe608 100644 --- a/ce/docs/AlarmConditionExpression.md +++ b/ce/docs/AlarmConditionExpression.md @@ -16,8 +16,8 @@ #### SimpleAlarmConditionExpression *(type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(type=`TBEL`)* | Name | Type | Description | Notes | @@ -26,17 +26,20 @@ ## Referenced Types -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -45,38 +48,35 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -85,7 +85,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -94,7 +94,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean @@ -103,15 +103,15 @@ | staticValue | Boolean | | [optional] | | dynamicValueArgument | String | | [optional] | +#### TimeUnit (enum) +`NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` + #### AlarmConditionValueLong | Name | Type | Description | Notes | |------|------|-------------|-------| | staticValue | Long | | [optional] | | dynamicValueArgument | String | | [optional] | -#### TimeUnit (enum) -`NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` - --- ### Conventions diff --git a/ce/docs/AlarmRuleConditionFilter.md b/ce/docs/AlarmConditionFilter.md similarity index 84% rename from ce/docs/AlarmRuleConditionFilter.md rename to ce/docs/AlarmConditionFilter.md index 3b385623..09bd221d 100644 --- a/ce/docs/AlarmRuleConditionFilter.md +++ b/ce/docs/AlarmConditionFilter.md @@ -1,22 +1,25 @@ -# AlarmRuleConditionFilter +# AlarmConditionFilter -`org.thingsboard.client.model.AlarmRuleConditionFilter` +`org.thingsboard.client.model.AlarmConditionFilter` ## Properties | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| | **argument** | **String** | | | -| **operation** | **ComplexOperation** | | [optional] | -| **predicates** | **List\** | | | | **valueType** | **EntityKeyValueType** | | | +| **operation** | **AlarmRuleComplexOperation** | | [optional] | +| **predicates** | **List\** | | | ## Referenced Types -#### ComplexOperation (enum) +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + +#### AlarmRuleComplexOperation (enum) `AND` | `OR` #### AlarmRuleKeyFilterPredicate @@ -27,38 +30,35 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -67,7 +67,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -76,7 +76,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean @@ -85,15 +85,15 @@ | staticValue | Boolean | | [optional] | | dynamicValueArgument | String | | [optional] | +#### TimeUnit (enum) +`NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` + #### AlarmConditionValueLong | Name | Type | Description | Notes | |------|------|-------------|-------| | staticValue | Long | | [optional] | | dynamicValueArgument | String | | [optional] | -#### TimeUnit (enum) -`NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` - --- ### Conventions diff --git a/ce/docs/AlarmConditionValueAlarmRuleSchedule.md b/ce/docs/AlarmConditionValueAlarmSchedule.md similarity index 67% rename from ce/docs/AlarmConditionValueAlarmRuleSchedule.md rename to ce/docs/AlarmConditionValueAlarmSchedule.md index 5461b4c4..a61bd2b6 100644 --- a/ce/docs/AlarmConditionValueAlarmRuleSchedule.md +++ b/ce/docs/AlarmConditionValueAlarmSchedule.md @@ -1,48 +1,48 @@ -# AlarmConditionValueAlarmRuleSchedule +# AlarmConditionValueAlarmSchedule -`org.thingsboard.client.model.AlarmConditionValueAlarmRuleSchedule` +`org.thingsboard.client.model.AlarmConditionValueAlarmSchedule` ## Properties | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| +| **staticValue** | **AlarmSchedule** | | [optional] | | **dynamicValueArgument** | **String** | | [optional] | -| **staticValue** | **AlarmRuleSchedule** | | [optional] | ## Referenced Types -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | --- diff --git a/ce/docs/AlarmRule.md b/ce/docs/AlarmRule.md new file mode 100644 index 00000000..8790b878 --- /dev/null +++ b/ce/docs/AlarmRule.md @@ -0,0 +1,196 @@ + +# AlarmRule + +`org.thingsboard.client.model.AlarmRule` + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +| **condition** | **AlarmCondition** | | | +| **alarmDetails** | **String** | | [optional] | +| **dashboardId** | **DashboardId** | | [optional] | + + + +## Referenced Types + +> **EntityId types** (`AdminSettingsId`, `AiModelId`, `AlarmId`, `ApiKeyId`, `ApiUsageStateId`, `AssetId`, `AssetProfileId`, `CalculatedFieldId`, `CustomerId`, `DashboardId`, `DeviceId`, `DeviceProfileId`, `DomainId`, `EdgeId`, `EntityViewId`, `JobId`, `MobileAppBundleId`, `MobileAppId`, `NotificationId`, `NotificationRequestId`, `NotificationRuleId`, `NotificationTargetId`, `NotificationTemplateId`, `OAuth2ClientId`, `OtaPackageId`, `QueueId`, `QueueStatsId`, `RpcId`, `RuleChainId`, `RuleNodeId`, `TbResourceId`, `TenantId`, `TenantProfileId`, `UserId`, `WidgetTypeId`, `WidgetsBundleId`, etc.): `{entityType: EntityType, id: UUID}` — all EntityId subtypes share this structure. + +#### AlarmCondition +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| expression | AlarmConditionExpression | | | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | +| type | String | | | + +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| unit | TimeUnit | | | +| value | AlarmConditionValueLong | | | + +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| count | AlarmConditionValueInteger | | | + +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* + +#### AlarmConditionExpression +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| type | String | | | + +#### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | + +#### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| expression | String | | | + +#### AlarmConditionValueAlarmSchedule +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | +| dynamicValueArgument | String | | [optional] | + +#### AlarmSchedule +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| type | String | | | + +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* + +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| timezone | String | | [optional] | +| items | List | | [optional] | + +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| timezone | String | | [optional] | +| daysOfWeek | Set | | [optional] | +| startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | + +#### TimeUnit (enum) +`NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` + +#### AlarmConditionValueLong +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| staticValue | Long | | [optional] | +| dynamicValueArgument | String | | [optional] | + +#### AlarmConditionValueInteger +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| staticValue | Integer | | [optional] | +| dynamicValueArgument | String | | [optional] | + +#### EntityType (enum) +`TENANT` | `CUSTOMER` | `USER` | `DASHBOARD` | `ASSET` | `DEVICE` | `ALARM` | `RULE_CHAIN` | `RULE_NODE` | `ENTITY_VIEW` | … (36 values total) + +#### AlarmConditionFilter +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| argument | String | | | +| valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | + +#### AlarmRuleComplexOperation (enum) +`AND` | `OR` + +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + +#### AlarmRuleKeyFilterPredicate +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| type | String | | | + +#### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| operation | AlarmRuleBooleanOperation | | | +| value | AlarmConditionValueBoolean | | | + +#### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | [optional] | + +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | + +#### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| operation | AlarmRuleNumericOperation | | | +| value | AlarmConditionValueDouble | | | + +#### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| operation | AlarmRuleStringOperation | | | +| value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | + +#### CustomTimeScheduleItem +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| enabled | Boolean | | [optional] | +| dayOfWeek | Integer | | [optional] | +| startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | + +#### AlarmRuleStringOperation (enum) +`EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` + +#### AlarmConditionValueString +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| staticValue | String | | [optional] | +| dynamicValueArgument | String | | [optional] | + +#### AlarmRuleNumericOperation (enum) +`EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` + +#### AlarmConditionValueDouble +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| staticValue | Double | | [optional] | +| dynamicValueArgument | String | | [optional] | + +#### AlarmRuleBooleanOperation (enum) +`EQUAL` | `NOT_EQUAL` + +#### AlarmConditionValueBoolean +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| staticValue | Boolean | | [optional] | +| dynamicValueArgument | String | | [optional] | + +--- + +### Conventions + +- **Package:** `org.thingsboard.client.model` +- **Getter pattern:** `get()` — e.g., `getId()`, `getName()` +- **Setter pattern:** `set(value)` — e.g., `setId(value)`, `setName(value)` +- **Null fields:** Getters return `null` for unset optional fields; they do not throw exceptions + diff --git a/ce/docs/AlarmRuleBooleanFilterPredicate.md b/ce/docs/AlarmRuleBooleanFilterPredicate.md index 98c7f0da..d93ab5c7 100644 --- a/ce/docs/AlarmRuleBooleanFilterPredicate.md +++ b/ce/docs/AlarmRuleBooleanFilterPredicate.md @@ -9,7 +9,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **operation** | **BooleanOperation** | | | +| **operation** | **AlarmRuleBooleanOperation** | | | | **value** | **AlarmConditionValueBoolean** | | | @@ -21,7 +21,7 @@ |------|------|-------------|-------| | type | String | | | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/AlarmRuleBooleanOperation.md b/ce/docs/AlarmRuleBooleanOperation.md new file mode 100644 index 00000000..dd9e8e87 --- /dev/null +++ b/ce/docs/AlarmRuleBooleanOperation.md @@ -0,0 +1,23 @@ + +# AlarmRuleBooleanOperation + +`org.thingsboard.client.model.AlarmRuleBooleanOperation` + +## Enum Values + + +* `EQUAL` (value: `"EQUAL"`) + +* `NOT_EQUAL` (value: `"NOT_EQUAL"`) + + + +--- + +### Conventions + +- **Package:** `org.thingsboard.client.model` +- **Getter pattern:** `get()` — e.g., `getId()`, `getName()` +- **Setter pattern:** `set(value)` — e.g., `setId(value)`, `setName(value)` +- **Null fields:** Getters return `null` for unset optional fields; they do not throw exceptions + diff --git a/ce/docs/AlarmRuleComplexFilterPredicate.md b/ce/docs/AlarmRuleComplexFilterPredicate.md index 8e995c80..528c4b6f 100644 --- a/ce/docs/AlarmRuleComplexFilterPredicate.md +++ b/ce/docs/AlarmRuleComplexFilterPredicate.md @@ -9,7 +9,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **operation** | **ComplexOperation** | | [optional] | +| **operation** | **AlarmRuleComplexOperation** | | [optional] | | **predicates** | **List\** | | [optional] | @@ -21,7 +21,7 @@ |------|------|-------------|-------| | type | String | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` --- diff --git a/ce/docs/AlarmRuleComplexOperation.md b/ce/docs/AlarmRuleComplexOperation.md new file mode 100644 index 00000000..17056306 --- /dev/null +++ b/ce/docs/AlarmRuleComplexOperation.md @@ -0,0 +1,23 @@ + +# AlarmRuleComplexOperation + +`org.thingsboard.client.model.AlarmRuleComplexOperation` + +## Enum Values + + +* `AND` (value: `"AND"`) + +* `OR` (value: `"OR"`) + + + +--- + +### Conventions + +- **Package:** `org.thingsboard.client.model` +- **Getter pattern:** `get()` — e.g., `getId()`, `getName()` +- **Setter pattern:** `set(value)` — e.g., `setId(value)`, `setName(value)` +- **Null fields:** Getters return `null` for unset optional fields; they do not throw exceptions + diff --git a/ce/docs/AlarmRuleDefinition.md b/ce/docs/AlarmRuleDefinition.md index 8bea1644..c2da60d6 100644 --- a/ce/docs/AlarmRuleDefinition.md +++ b/ce/docs/AlarmRuleDefinition.md @@ -7,9 +7,17 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **alarmDetails** | **String** | | [optional] | -| **condition** | **AlarmRuleCondition** | | | -| **dashboardId** | **DashboardId** | | [optional] | +| **id** | **CalculatedFieldId** | JSON object with the Alarm Rule Id. Referencing non-existing Alarm Rule Id will cause error. | [optional] | +| **createdTime** | **Long** | Timestamp of the alarm rule creation, in milliseconds | [optional] [readonly] | +| **tenantId** | **TenantId** | | [optional] | +| **entityId** | **EntityId** | | [optional] | +| **name** | **String** | User defined name of the alarm rule. | [optional] | +| **debugSettings** | **DebugSettings** | Debug settings object. | [optional] | +| **configurationVersion** | **Integer** | Version of alarm rule configuration. | [optional] | +| **_configuration** | **AlarmCalculatedFieldConfiguration** | | | +| **version** | **Long** | | [optional] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the alarm rule. May include: 'description' (string). | [optional] | +| **debugMode** | **Boolean** | | [optional] | @@ -17,26 +25,254 @@ > **EntityId types** (`AdminSettingsId`, `AiModelId`, `AlarmId`, `ApiKeyId`, `ApiUsageStateId`, `AssetId`, `AssetProfileId`, `CalculatedFieldId`, `CustomerId`, `DashboardId`, `DeviceId`, `DeviceProfileId`, `DomainId`, `EdgeId`, `EntityViewId`, `JobId`, `MobileAppBundleId`, `MobileAppId`, `NotificationId`, `NotificationRequestId`, `NotificationRuleId`, `NotificationTargetId`, `NotificationTemplateId`, `OAuth2ClientId`, `OtaPackageId`, `QueueId`, `QueueStatsId`, `RpcId`, `RuleChainId`, `RuleNodeId`, `TbResourceId`, `TenantId`, `TenantProfileId`, `UserId`, `WidgetTypeId`, `WidgetsBundleId`, etc.): `{entityType: EntityType, id: UUID}` — all EntityId subtypes share this structure. -#### AlarmRuleCondition +#### DebugSettings +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| failuresEnabled | Boolean | Debug failures. | [optional] | +| allEnabled | Boolean | Debug All. Used as a trigger for updating debugAllUntil. | [optional] | +| allEnabledUntil | Long | Timestamp of the end time for the processing debug events. | [optional] | + +#### EntityType (enum) +`TENANT` | `CUSTOMER` | `USER` | `DASHBOARD` | `ASSET` | `DEVICE` | `ALARM` | `RULE_CHAIN` | `RULE_NODE` | `ENTITY_VIEW` | … (36 values total) + +#### CalculatedFieldConfiguration +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| output | Output | | [optional] | +| type | String | | | + +#### AlarmCalculatedFieldConfiguration *(extends CalculatedFieldConfiguration, type=`ALARM`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| arguments | Map | | | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | +| propagate | Boolean | | [optional] | +| propagateToOwner | Boolean | | [optional] | +| propagateToTenant | Boolean | | [optional] | +| propagateRelationTypes | List | | [optional] | + +#### EntityAggregationCalculatedFieldConfiguration *(extends CalculatedFieldConfiguration, type=`ENTITY_AGGREGATION`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| arguments | Map | | | +| metrics | Map | | | +| interval | AggInterval | | | +| watermark | Watermark | | [optional] | +| produceIntermediateResult | Boolean | | [optional] | + +#### GeofencingCalculatedFieldConfiguration *(extends CalculatedFieldConfiguration, type=`GEOFENCING`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| entityCoordinates | EntityCoordinates | | | +| zoneGroups | Map | | | +| scheduledUpdateEnabled | Boolean | | [optional] | +| scheduledUpdateInterval | Integer | | [optional] | + +#### PropagationCalculatedFieldConfiguration *(extends CalculatedFieldConfiguration, type=`PROPAGATION`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| arguments | Map | | | +| expression | String | | [optional] | +| relation | RelationPathLevel | | | +| applyExpressionToResolvedArguments | Boolean | | [optional] | + +#### RelatedEntitiesAggregationCalculatedFieldConfiguration *(extends CalculatedFieldConfiguration, type=`RELATED_ENTITIES_AGGREGATION`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| relation | RelationPathLevel | | | +| arguments | Map | | | +| deduplicationIntervalInSec | Long | | [optional] | +| metrics | Map | | | +| useLatestTs | Boolean | | [optional] | +| scheduledUpdateInterval | Integer | | [optional] | +| scheduledUpdateEnabled | Boolean | | [optional] | + +#### ScriptCalculatedFieldConfiguration *(extends CalculatedFieldConfiguration, type=`SCRIPT`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| arguments | Map | | | +| expression | String | | [optional] | + +#### SimpleCalculatedFieldConfiguration *(extends CalculatedFieldConfiguration, type=`SIMPLE`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| arguments | Map | | | +| expression | String | | [optional] | +| useLatestTs | Boolean | | [optional] | + +#### Argument +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| refEntityId | EntityId | | [optional] | +| refDynamicSourceConfiguration | CfArgumentDynamicSourceConfiguration | | [optional] | +| refEntityKey | ReferencedEntityKey | | [optional] | +| defaultValue | String | | [optional] | +| limit | Integer | | [optional] | +| timeWindow | Long | | [optional] | + +#### AlarmRule +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| condition | AlarmCondition | | | +| alarmDetails | String | | [optional] | +| dashboardId | DashboardId | | [optional] | + +#### Output +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| decimalsByDefault | Integer | | [optional] | +| name | String | | [optional] | +| scope | AttributeScope | | [optional] | +| strategy | Object | | [optional] | +| type | String | | | + +#### AttributesOutput *(extends Output, type=`ATTRIBUTES`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| strategy | AttributesOutputStrategy | | [optional] | + +#### TimeSeriesOutput *(extends Output, type=`TIME_SERIES`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| strategy | TimeSeriesOutputStrategy | | [optional] | + +#### CfArgumentDynamicSourceConfiguration +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| type | String | | | + +#### CurrentOwnerDynamicSourceConfiguration *(extends CfArgumentDynamicSourceConfiguration, type=`CURRENT_OWNER`)* +*See CfArgumentDynamicSourceConfiguration for properties.* + +#### RelationPathQueryDynamicSourceConfiguration *(extends CfArgumentDynamicSourceConfiguration, type=`RELATION_PATH_QUERY`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| levels | List | | [optional] | + +#### ReferencedEntityKey +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| key | String | | [optional] | +| type | ArgumentType | | [optional] | +| scope | AttributeScope | | [optional] | + +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* + +#### AttributeScope (enum) +`CLIENT_SCOPE` | `SERVER_SCOPE` | `SHARED_SCOPE` + +#### EntityCoordinates +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| latitudeKeyName | String | | | +| longitudeKeyName | String | | | + +#### ZoneGroupConfiguration +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| refEntityId | EntityId | | [optional] | +| refDynamicSourceConfiguration | CfArgumentDynamicSourceConfiguration | | [optional] | +| perimeterKeyName | String | | | +| reportStrategy | GeofencingReportStrategy | | | +| createRelationsWithMatchedZones | Boolean | | [optional] | +| relationType | String | | [optional] | +| direction | EntitySearchDirection | | [optional] | + +#### RelationPathLevel +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| direction | EntitySearchDirection | | | +| relationType | String | | | + +#### AggMetric +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| function | AggFunction | | [optional] | +| filter | String | | [optional] | +| input | AggInput | | [optional] | +| defaultValue | Double | | [optional] | + +#### AggInterval +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| type | String | | | + +#### CustomInterval *(extends AggInterval, type=`CUSTOM`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| tz | String | | | +| offsetSec | Long | | [optional] | +| durationSec | Long | | | + +#### DayInterval *(extends AggInterval, type=`DAY`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| tz | String | | | +| offsetSec | Long | | [optional] | + +#### HourInterval *(extends AggInterval, type=`HOUR`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| tz | String | | | +| offsetSec | Long | | [optional] | + +#### MonthInterval *(extends AggInterval, type=`MONTH`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| tz | String | | | +| offsetSec | Long | | [optional] | + +#### QuarterInterval *(extends AggInterval, type=`QUARTER`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| tz | String | | | +| offsetSec | Long | | [optional] | + +#### WeekInterval *(extends AggInterval, type=`WEEK`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| tz | String | | | +| offsetSec | Long | | [optional] | + +#### WeekSunSatInterval *(extends AggInterval, type=`WEEK_SUN_SAT`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| tz | String | | | +| offsetSec | Long | | [optional] | + +#### YearInterval *(extends AggInterval, type=`YEAR`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| tz | String | | | +| offsetSec | Long | | [optional] | + +#### Watermark +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| duration | Long | | [optional] | + +#### ArgumentType (enum) +`TS_LATEST` | `ATTRIBUTE` | `TS_ROLLING` #### AlarmConditionExpression | Name | Type | Description | Notes | @@ -46,41 +282,99 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### TimeSeriesOutputStrategy | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### TimeSeriesImmediateOutputStrategy *(extends TimeSeriesOutputStrategy, type=`IMMEDIATE`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| ttl | Long | | [optional] | +| saveTimeSeries | Boolean | | [optional] | +| saveLatest | Boolean | | [optional] | +| sendWsUpdate | Boolean | | [optional] | +| processCfs | Boolean | | [optional] | + +#### TimeSeriesRuleChainOutputStrategy *(extends TimeSeriesOutputStrategy, type=`RULE_CHAIN`)* +*See TimeSeriesOutputStrategy for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### AttributesOutputStrategy +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| type | String | | | + +#### AttributesImmediateOutputStrategy *(extends AttributesOutputStrategy, type=`IMMEDIATE`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| sendAttributesUpdatedNotification | Boolean | | [optional] | +| updateAttributesOnlyOnValueChange | Boolean | | [optional] | +| saveAttribute | Boolean | | [optional] | +| sendWsUpdate | Boolean | | [optional] | +| processCfs | Boolean | | [optional] | + +#### AttributesRuleChainOutputStrategy *(extends AttributesOutputStrategy, type=`RULE_CHAIN`)* +*See AttributesOutputStrategy for properties.* + +#### GeofencingReportStrategy (enum) +`REPORT_TRANSITION_EVENTS_ONLY` | `REPORT_PRESENCE_STATUS_ONLY` | `REPORT_TRANSITION_EVENTS_AND_PRESENCE_STATUS` + +#### EntitySearchDirection (enum) +`FROM` | `TO` + +#### AggFunction (enum) +`MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` + +#### AggInput +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| type | String | | | + +#### AggFunctionInput *(extends AggInput, type=`function`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| function | String | | [optional] | + +#### AggKeyInput *(extends AggInput, type=`key`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| key | String | | [optional] | + +#### AlarmSchedule +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| type | String | | | + +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* + +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -97,20 +391,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### EntityType (enum) -`TENANT` | `CUSTOMER` | `USER` | `DASHBOARD` | `ASSET` | `DEVICE` | `ALARM` | `RULE_CHAIN` | `RULE_NODE` | `ENTITY_VIEW` | … (36 values total) - -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -119,46 +413,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -167,7 +458,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -176,7 +467,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/AlarmRuleDefinitionInfo.md b/ce/docs/AlarmRuleDefinitionInfo.md index 8f6caae6..627c89ef 100644 --- a/ce/docs/AlarmRuleDefinitionInfo.md +++ b/ce/docs/AlarmRuleDefinitionInfo.md @@ -46,8 +46,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -112,11 +112,11 @@ | limit | Integer | | [optional] | | timeWindow | Long | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### Output @@ -158,26 +158,26 @@ | type | ArgumentType | | [optional] | | scope | AttributeScope | | [optional] | -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AttributeScope (enum) `CLIENT_SCOPE` | `SERVER_SCOPE` | `SHARED_SCOPE` @@ -283,19 +283,19 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | #### TimeSeriesOutputStrategy | Name | Type | Description | Notes | @@ -355,27 +355,27 @@ |------|------|-------------|-------| | key | String | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -392,17 +392,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -411,46 +414,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -459,7 +459,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -468,7 +468,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/AlarmRuleKeyFilterPredicate.md b/ce/docs/AlarmRuleKeyFilterPredicate.md index 07a96cd8..893efb05 100644 --- a/ce/docs/AlarmRuleKeyFilterPredicate.md +++ b/ce/docs/AlarmRuleKeyFilterPredicate.md @@ -18,37 +18,37 @@ Filter predicate for alarm rule key-based filtering #### AlarmRuleBooleanFilterPredicate *(type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(type=`NO_DATA`)* +#### NoDataFilterPredicate *(type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | ## Referenced Types -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean @@ -57,19 +57,19 @@ Filter predicate for alarm rule key-based filtering | staticValue | Boolean | | [optional] | | dynamicValueArgument | String | | [optional] | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### TimeUnit (enum) +`NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` + #### AlarmConditionValueLong | Name | Type | Description | Notes | |------|------|-------------|-------| | staticValue | Long | | [optional] | | dynamicValueArgument | String | | [optional] | -#### TimeUnit (enum) -`NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` - -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -78,7 +78,7 @@ Filter predicate for alarm rule key-based filtering | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString diff --git a/ce/docs/AlarmRuleNumericFilterPredicate.md b/ce/docs/AlarmRuleNumericFilterPredicate.md index b00d105c..dff16331 100644 --- a/ce/docs/AlarmRuleNumericFilterPredicate.md +++ b/ce/docs/AlarmRuleNumericFilterPredicate.md @@ -9,7 +9,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **operation** | **NumericOperation** | | | +| **operation** | **AlarmRuleNumericOperation** | | | | **value** | **AlarmConditionValueDouble** | | | @@ -21,7 +21,7 @@ |------|------|-------------|-------| | type | String | | | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble diff --git a/ce/docs/AlarmRuleNumericOperation.md b/ce/docs/AlarmRuleNumericOperation.md new file mode 100644 index 00000000..6fbed0dc --- /dev/null +++ b/ce/docs/AlarmRuleNumericOperation.md @@ -0,0 +1,31 @@ + +# AlarmRuleNumericOperation + +`org.thingsboard.client.model.AlarmRuleNumericOperation` + +## Enum Values + + +* `EQUAL` (value: `"EQUAL"`) + +* `NOT_EQUAL` (value: `"NOT_EQUAL"`) + +* `GREATER` (value: `"GREATER"`) + +* `LESS` (value: `"LESS"`) + +* `GREATER_OR_EQUAL` (value: `"GREATER_OR_EQUAL"`) + +* `LESS_OR_EQUAL` (value: `"LESS_OR_EQUAL"`) + + + +--- + +### Conventions + +- **Package:** `org.thingsboard.client.model` +- **Getter pattern:** `get()` — e.g., `getId()`, `getName()` +- **Setter pattern:** `set(value)` — e.g., `setId(value)`, `setName(value)` +- **Null fields:** Getters return `null` for unset optional fields; they do not throw exceptions + diff --git a/ce/docs/AlarmRuleStringFilterPredicate.md b/ce/docs/AlarmRuleStringFilterPredicate.md index cfc2dbb4..9058cafc 100644 --- a/ce/docs/AlarmRuleStringFilterPredicate.md +++ b/ce/docs/AlarmRuleStringFilterPredicate.md @@ -9,9 +9,9 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **ignoreCase** | **Boolean** | | [optional] | -| **operation** | **StringOperation** | | | +| **operation** | **AlarmRuleStringOperation** | | | | **value** | **AlarmConditionValueString** | | | +| **ignoreCase** | **Boolean** | | [optional] | @@ -22,7 +22,7 @@ |------|------|-------------|-------| | type | String | | | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString diff --git a/ce/docs/AlarmRuleStringOperation.md b/ce/docs/AlarmRuleStringOperation.md new file mode 100644 index 00000000..1e24542e --- /dev/null +++ b/ce/docs/AlarmRuleStringOperation.md @@ -0,0 +1,35 @@ + +# AlarmRuleStringOperation + +`org.thingsboard.client.model.AlarmRuleStringOperation` + +## Enum Values + + +* `EQUAL` (value: `"EQUAL"`) + +* `NOT_EQUAL` (value: `"NOT_EQUAL"`) + +* `STARTS_WITH` (value: `"STARTS_WITH"`) + +* `ENDS_WITH` (value: `"ENDS_WITH"`) + +* `CONTAINS` (value: `"CONTAINS"`) + +* `NOT_CONTAINS` (value: `"NOT_CONTAINS"`) + +* `IN` (value: `"IN"`) + +* `NOT_IN` (value: `"NOT_IN"`) + + + +--- + +### Conventions + +- **Package:** `org.thingsboard.client.model` +- **Getter pattern:** `get()` — e.g., `getId()`, `getName()` +- **Setter pattern:** `set(value)` — e.g., `setId(value)`, `setName(value)` +- **Null fields:** Getters return `null` for unset optional fields; they do not throw exceptions + diff --git a/ce/docs/AlarmRuleSchedule.md b/ce/docs/AlarmSchedule.md similarity index 76% rename from ce/docs/AlarmRuleSchedule.md rename to ce/docs/AlarmSchedule.md index 7f017f0f..4e3e1e41 100644 --- a/ce/docs/AlarmRuleSchedule.md +++ b/ce/docs/AlarmSchedule.md @@ -1,7 +1,7 @@ -# AlarmRuleSchedule +# AlarmSchedule -`org.thingsboard.client.model.AlarmRuleSchedule` +`org.thingsboard.client.model.AlarmSchedule` ## Properties @@ -13,32 +13,32 @@ ## Subtypes -#### AlarmRuleAnyTimeSchedule *(type=`ANY_TIME`)* +#### AnyTimeSchedule *(type=`ANY_TIME`)* *(no additional properties)* -#### AlarmRuleCustomTimeSchedule *(type=`CUSTOM`)* +#### CustomTimeSchedule *(type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | ## Referenced Types -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | --- diff --git a/ce/docs/AlarmRuleAnyTimeSchedule.md b/ce/docs/AnyTimeSchedule.md similarity index 80% rename from ce/docs/AlarmRuleAnyTimeSchedule.md rename to ce/docs/AnyTimeSchedule.md index bc50fe7c..f0e7e30a 100644 --- a/ce/docs/AlarmRuleAnyTimeSchedule.md +++ b/ce/docs/AnyTimeSchedule.md @@ -1,9 +1,9 @@ -# AlarmRuleAnyTimeSchedule +# AnyTimeSchedule -`org.thingsboard.client.model.AlarmRuleAnyTimeSchedule` +`org.thingsboard.client.model.AnyTimeSchedule` -**Extends:** **AlarmRuleSchedule** +**Extends:** **AlarmSchedule** ## Properties @@ -14,7 +14,7 @@ ## Referenced Types -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | diff --git a/ce/docs/Asset.md b/ce/docs/Asset.md index b95e6539..06cdf435 100644 --- a/ce/docs/Asset.md +++ b/ce/docs/Asset.md @@ -9,6 +9,7 @@ |------------ | ------------- | ------------- | -------------| | **id** | **AssetId** | JSON object with the asset Id. Specify this field to update the asset. Referencing non-existing asset Id will cause error. Omit this field to create new asset. | [optional] | | **createdTime** | **Long** | Timestamp of the asset creation, in milliseconds | [optional] [readonly] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the asset. May include: 'description' (string). | [optional] | | **tenantId** | **TenantId** | JSON object with Tenant Id. | [optional] [readonly] | | **customerId** | **CustomerId** | JSON object with Customer Id. Use 'assignAssetToCustomer' to change the Customer Id. | [optional] [readonly] | | **name** | **String** | Unique Asset Name in scope of Tenant | | @@ -16,7 +17,6 @@ | **label** | **String** | Label that may be used in widgets | [optional] | | **assetProfileId** | **AssetProfileId** | JSON object with Asset Profile Id. | [optional] | | **version** | **Long** | | [optional] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the asset. May include: 'description' (string). | [optional] | diff --git a/ce/docs/AssetExportData.md b/ce/docs/AssetExportData.md index d2b25bff..69fc1860 100644 --- a/ce/docs/AssetExportData.md +++ b/ce/docs/AssetExportData.md @@ -96,8 +96,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -201,11 +201,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -341,26 +341,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -391,41 +391,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -442,17 +442,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -461,46 +464,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -509,7 +509,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -518,7 +518,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/AssetInfo.md b/ce/docs/AssetInfo.md index 751e8f31..3e1fe3b1 100644 --- a/ce/docs/AssetInfo.md +++ b/ce/docs/AssetInfo.md @@ -9,6 +9,7 @@ |------------ | ------------- | ------------- | -------------| | **id** | **AssetId** | JSON object with the asset Id. Specify this field to update the asset. Referencing non-existing asset Id will cause error. Omit this field to create new asset. | [optional] | | **createdTime** | **Long** | Timestamp of the asset creation, in milliseconds | [optional] [readonly] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the asset. May include: 'description' (string). | [optional] | | **tenantId** | **TenantId** | JSON object with Tenant Id. | [optional] [readonly] | | **customerId** | **CustomerId** | JSON object with Customer Id. Use 'assignAssetToCustomer' to change the Customer Id. | [optional] [readonly] | | **name** | **String** | Unique Asset Name in scope of Tenant | | @@ -19,7 +20,6 @@ | **customerTitle** | **String** | Title of the Customer that owns the asset. | [optional] [readonly] | | **customerIsPublic** | **Boolean** | Indicates special 'Public' Customer that is auto-generated to use the assets on public dashboards. | [optional] [readonly] | | **assetProfileName** | **String** | Name of the corresponding Asset Profile. | [optional] [readonly] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the asset. May include: 'description' (string). | [optional] | diff --git a/ce/docs/AssetProfileExportData.md b/ce/docs/AssetProfileExportData.md index 773c9e48..db96a947 100644 --- a/ce/docs/AssetProfileExportData.md +++ b/ce/docs/AssetProfileExportData.md @@ -96,8 +96,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -201,11 +201,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -341,26 +341,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -391,41 +391,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -442,17 +442,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -461,46 +464,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -509,7 +509,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -518,7 +518,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/CalculatedField.md b/ce/docs/CalculatedField.md index d3a09480..eb90306d 100644 --- a/ce/docs/CalculatedField.md +++ b/ce/docs/CalculatedField.md @@ -46,8 +46,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -154,11 +154,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -294,26 +294,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -344,41 +344,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -395,17 +395,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -414,46 +417,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -462,7 +462,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -471,7 +471,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/CalculatedFieldConfiguration.md b/ce/docs/CalculatedFieldConfiguration.md index 39e50d5c..ec37e4c5 100644 --- a/ce/docs/CalculatedFieldConfiguration.md +++ b/ce/docs/CalculatedFieldConfiguration.md @@ -18,8 +18,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -107,11 +107,11 @@ | limit | Integer | | [optional] | | timeWindow | Long | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### AggMetric @@ -227,26 +227,26 @@ | type | ArgumentType | | [optional] | | scope | AttributeScope | | [optional] | -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -320,41 +320,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -371,17 +371,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -390,46 +393,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -438,7 +438,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -447,7 +447,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/CalculatedFieldInfo.md b/ce/docs/CalculatedFieldInfo.md index c3809091..4511cfea 100644 --- a/ce/docs/CalculatedFieldInfo.md +++ b/ce/docs/CalculatedFieldInfo.md @@ -47,8 +47,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -155,11 +155,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -295,26 +295,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -345,41 +345,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -396,17 +396,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -415,46 +418,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -463,7 +463,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -472,7 +472,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/ComponentDescriptor.md b/ce/docs/ComponentDescriptor.md index 3a95f4a4..06a91ee9 100644 --- a/ce/docs/ComponentDescriptor.md +++ b/ce/docs/ComponentDescriptor.md @@ -14,10 +14,10 @@ | **clusteringMode** | **ComponentClusteringMode** | Clustering mode of the RuleNode. This mode represents the ability to start Rule Node in multiple microservices. | [optional] [readonly] | | **name** | **String** | Name of the Rule Node. Taken from the @RuleNode annotation. | [optional] [readonly] | | **clazz** | **String** | Full name of the Java class that implements the Rule Engine Node interface. | [optional] [readonly] | +| **configurationDescriptor** | **com.fasterxml.jackson.databind.JsonNode** | | [optional] | | **configurationVersion** | **Integer** | Rule node configuration version. By default, this value is 0. If the rule node is a versioned node, this value might be greater than 0. | [optional] [readonly] | | **actions** | **String** | Rule Node Actions. Deprecated. Always null. | [optional] [readonly] | | **hasQueueName** | **Boolean** | Indicates that the RuleNode supports queue name configuration. | [optional] [readonly] | -| **configurationDescriptor** | **com.fasterxml.jackson.databind.JsonNode** | | [optional] | diff --git a/ce/docs/AlarmRuleCustomTimeSchedule.md b/ce/docs/CustomTimeSchedule.md similarity index 76% rename from ce/docs/AlarmRuleCustomTimeSchedule.md rename to ce/docs/CustomTimeSchedule.md index 9249291e..1a973a98 100644 --- a/ce/docs/AlarmRuleCustomTimeSchedule.md +++ b/ce/docs/CustomTimeSchedule.md @@ -1,33 +1,33 @@ -# AlarmRuleCustomTimeSchedule +# CustomTimeSchedule -`org.thingsboard.client.model.AlarmRuleCustomTimeSchedule` +`org.thingsboard.client.model.CustomTimeSchedule` -**Extends:** **AlarmRuleSchedule** +**Extends:** **AlarmSchedule** ## Properties | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **items** | **List\** | | [optional] | | **timezone** | **String** | | [optional] | +| **items** | **List\** | | [optional] | ## Referenced Types -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | --- diff --git a/ce/docs/AlarmRuleCustomTimeScheduleItem.md b/ce/docs/CustomTimeScheduleItem.md similarity index 86% rename from ce/docs/AlarmRuleCustomTimeScheduleItem.md rename to ce/docs/CustomTimeScheduleItem.md index b7b49a92..54b09d0c 100644 --- a/ce/docs/AlarmRuleCustomTimeScheduleItem.md +++ b/ce/docs/CustomTimeScheduleItem.md @@ -1,16 +1,16 @@ -# AlarmRuleCustomTimeScheduleItem +# CustomTimeScheduleItem -`org.thingsboard.client.model.AlarmRuleCustomTimeScheduleItem` +`org.thingsboard.client.model.CustomTimeScheduleItem` ## Properties | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **dayOfWeek** | **Integer** | | [optional] | | **enabled** | **Boolean** | | [optional] | -| **endsOn** | **Long** | | [optional] | +| **dayOfWeek** | **Integer** | | [optional] | | **startsOn** | **Long** | | [optional] | +| **endsOn** | **Long** | | [optional] | diff --git a/ce/docs/Customer.md b/ce/docs/Customer.md index 9fdd61be..9dbd1ef2 100644 --- a/ce/docs/Customer.md +++ b/ce/docs/Customer.md @@ -9,6 +9,7 @@ |------------ | ------------- | ------------- | -------------| | **id** | **CustomerId** | JSON object with the customer Id. Specify this field to update the customer. Referencing non-existing customer Id will cause error. Omit this field to create new customer. | [optional] | | **createdTime** | **Long** | Timestamp of the customer creation, in milliseconds | [optional] [readonly] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the customer. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar), 'isPublic' (boolean, whether this is a public customer). | [optional] | | **country** | **String** | Country | [optional] | | **state** | **String** | State | [optional] | | **city** | **String** | City | [optional] | @@ -20,7 +21,6 @@ | **title** | **String** | Title of the customer | | | **tenantId** | **TenantId** | JSON object with Tenant Id | [optional] | | **version** | **Long** | | [optional] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the customer. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar), 'isPublic' (boolean, whether this is a public customer). | [optional] | | **name** | **String** | Name of the customer. Read-only, duplicated from title for backward compatibility | [optional] [readonly] | diff --git a/ce/docs/CustomerExportData.md b/ce/docs/CustomerExportData.md index aab8f61e..78449f80 100644 --- a/ce/docs/CustomerExportData.md +++ b/ce/docs/CustomerExportData.md @@ -96,8 +96,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -201,11 +201,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -341,26 +341,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -391,41 +391,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -442,17 +442,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -461,46 +464,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -509,7 +509,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -518,7 +518,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/DashboardExportData.md b/ce/docs/DashboardExportData.md index c5c8885d..5d089ba6 100644 --- a/ce/docs/DashboardExportData.md +++ b/ce/docs/DashboardExportData.md @@ -96,8 +96,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -201,11 +201,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -341,26 +341,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -391,41 +391,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -442,17 +442,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -461,46 +464,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -509,7 +509,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -518,7 +518,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/Device.md b/ce/docs/Device.md index c1f08358..d6d6cc3a 100644 --- a/ce/docs/Device.md +++ b/ce/docs/Device.md @@ -9,17 +9,17 @@ |------------ | ------------- | ------------- | -------------| | **id** | **DeviceId** | JSON object with the Device Id. Specify this field to update the Device. Referencing non-existing Device Id will cause error. Omit this field to create new Device. | [optional] | | **createdTime** | **Long** | Timestamp of the device creation, in milliseconds | [optional] [readonly] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device). | [optional] | | **tenantId** | **TenantId** | JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id. | [optional] [readonly] | | **customerId** | **CustomerId** | JSON object with Customer Id. Use 'assignDeviceToCustomer' to change the Customer Id. | [optional] [readonly] | | **name** | **String** | Unique Device Name in scope of Tenant | | | **type** | **String** | Device Profile Name | [optional] | | **label** | **String** | Label that may be used in widgets | [optional] | | **deviceProfileId** | **DeviceProfileId** | JSON object with Device Profile Id. If not provided, the type will be used to determine the profile. If neither deviceProfileId nor type is specified, the default device profile will be used. | [optional] | +| **deviceData** | **DeviceData** | JSON object with content specific to type of transport in the device profile. | [optional] | | **firmwareId** | **OtaPackageId** | JSON object with Ota Package Id. | [optional] | | **softwareId** | **OtaPackageId** | JSON object with Ota Package Id. | [optional] | | **version** | **Long** | | [optional] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device). | [optional] | -| **deviceData** | **DeviceData** | JSON object with content specific to type of transport in the device profile. | [optional] | diff --git a/ce/docs/DeviceExportData.md b/ce/docs/DeviceExportData.md index cb92de29..4e75e2a0 100644 --- a/ce/docs/DeviceExportData.md +++ b/ce/docs/DeviceExportData.md @@ -116,8 +116,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -221,11 +221,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -361,26 +361,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -411,41 +411,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -462,17 +462,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -481,46 +484,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -529,7 +529,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -538,7 +538,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/DeviceInfo.md b/ce/docs/DeviceInfo.md index bfab6421..2e0faec3 100644 --- a/ce/docs/DeviceInfo.md +++ b/ce/docs/DeviceInfo.md @@ -9,12 +9,14 @@ |------------ | ------------- | ------------- | -------------| | **id** | **DeviceId** | JSON object with the Device Id. Specify this field to update the Device. Referencing non-existing Device Id will cause error. Omit this field to create new Device. | [optional] | | **createdTime** | **Long** | Timestamp of the device creation, in milliseconds | [optional] [readonly] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device). | [optional] | | **tenantId** | **TenantId** | JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id. | [optional] [readonly] | | **customerId** | **CustomerId** | JSON object with Customer Id. Use 'assignDeviceToCustomer' to change the Customer Id. | [optional] [readonly] | | **name** | **String** | Unique Device Name in scope of Tenant | | | **type** | **String** | Device Profile Name | [optional] | | **label** | **String** | Label that may be used in widgets | [optional] | | **deviceProfileId** | **DeviceProfileId** | JSON object with Device Profile Id. If not provided, the type will be used to determine the profile. If neither deviceProfileId nor type is specified, the default device profile will be used. | [optional] | +| **deviceData** | **DeviceData** | JSON object with content specific to type of transport in the device profile. | [optional] | | **firmwareId** | **OtaPackageId** | JSON object with Ota Package Id. | [optional] | | **softwareId** | **OtaPackageId** | JSON object with Ota Package Id. | [optional] | | **version** | **Long** | | [optional] | @@ -22,8 +24,6 @@ | **customerIsPublic** | **Boolean** | Indicates special 'Public' Customer that is auto-generated to use the devices on public dashboards. | [optional] [readonly] | | **deviceProfileName** | **String** | Name of the corresponding Device Profile. | [optional] [readonly] | | **active** | **Boolean** | Device active flag. | [optional] [readonly] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device). | [optional] | -| **deviceData** | **DeviceData** | JSON object with content specific to type of transport in the device profile. | [optional] | diff --git a/ce/docs/DeviceProfile.md b/ce/docs/DeviceProfile.md index f598b398..e91d7242 100644 --- a/ce/docs/DeviceProfile.md +++ b/ce/docs/DeviceProfile.md @@ -21,13 +21,13 @@ A JSON value representing the device profile. | **defaultRuleChainId** | **RuleChainId** | Reference to the rule chain. If present, the specified rule chain will be used to process all messages related to device, including telemetry, attribute updates, etc. Otherwise, the root rule chain will be used to process those messages. | [optional] | | **defaultDashboardId** | **DashboardId** | Reference to the dashboard. Used in the mobile application to open the default dashboard when user navigates to device details. | [optional] | | **defaultQueueName** | **String** | Rule engine queue name. If present, the specified queue will be used to store all unprocessed messages related to device, including telemetry, attribute updates, etc. Otherwise, the 'Main' queue will be used to store those messages. | [optional] | +| **profileData** | **DeviceProfileData** | Complex JSON object that includes addition device profile configuration (transport, alarm rules, etc). | [optional] | | **provisionDeviceKey** | **String** | Unique provisioning key used by 'Device Provisioning' feature. | [optional] | | **firmwareId** | **OtaPackageId** | Reference to the firmware OTA package. If present, the specified package will be used as default device firmware. | [optional] | | **softwareId** | **OtaPackageId** | Reference to the software OTA package. If present, the specified package will be used as default device software. | [optional] | | **defaultEdgeRuleChainId** | **RuleChainId** | Reference to the edge rule chain. If present, the specified edge rule chain will be used on the edge to process all messages related to device, including telemetry, attribute updates, etc. Otherwise, the edge root rule chain will be used to process those messages. | [optional] | | **version** | **Long** | | [optional] | | **_default** | **Boolean** | Used to mark the default profile. Default profile is used when the device profile is not specified during device creation. | [optional] | -| **profileData** | **DeviceProfileData** | Complex JSON object that includes addition device profile configuration (transport, alarm rules, etc). | [optional] | diff --git a/ce/docs/DeviceProfileExportData.md b/ce/docs/DeviceProfileExportData.md index e1dd4f1c..c862b5a8 100644 --- a/ce/docs/DeviceProfileExportData.md +++ b/ce/docs/DeviceProfileExportData.md @@ -96,8 +96,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -201,11 +201,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -341,26 +341,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -391,41 +391,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -442,17 +442,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -461,46 +464,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -509,7 +509,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -518,7 +518,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/AlarmRuleDurationCondition.md b/ce/docs/DurationAlarmCondition.md similarity index 78% rename from ce/docs/AlarmRuleDurationCondition.md rename to ce/docs/DurationAlarmCondition.md index 9157ba27..2ac6405b 100644 --- a/ce/docs/AlarmRuleDurationCondition.md +++ b/ce/docs/DurationAlarmCondition.md @@ -1,9 +1,9 @@ -# AlarmRuleDurationCondition +# DurationAlarmCondition -`org.thingsboard.client.model.AlarmRuleDurationCondition` +`org.thingsboard.client.model.DurationAlarmCondition` -**Extends:** **AlarmRuleCondition** +**Extends:** **AlarmCondition** ## Properties @@ -16,11 +16,11 @@ ## Referenced Types -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | #### TimeUnit (enum) @@ -40,53 +40,56 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -95,46 +98,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -143,7 +143,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -152,7 +152,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/Edge.md b/ce/docs/Edge.md index f3f2abe5..520b58bc 100644 --- a/ce/docs/Edge.md +++ b/ce/docs/Edge.md @@ -11,6 +11,7 @@ A JSON value representing the edge. |------------ | ------------- | ------------- | -------------| | **id** | **EdgeId** | JSON object with the Edge Id. Specify this field to update the Edge. Referencing non-existing Edge Id will cause error. Omit this field to create new Edge. | [optional] | | **createdTime** | **Long** | Timestamp of the edge creation, in milliseconds | [optional] [readonly] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the edge. May include: 'description' (string). | [optional] | | **tenantId** | **TenantId** | JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id. | [optional] [readonly] | | **customerId** | **CustomerId** | JSON object with Customer Id. Use 'assignEdgeToCustomer' to change the Customer Id. | [optional] [readonly] | | **rootRuleChainId** | **RuleChainId** | JSON object with Root Rule Chain Id. Use 'setEdgeRootRuleChain' to change the Root Rule Chain Id. | [optional] [readonly] | @@ -20,7 +21,6 @@ A JSON value representing the edge. | **routingKey** | **String** | Edge routing key ('username') to authorize on cloud | | | **secret** | **String** | Edge secret ('password') to authorize on cloud | | | **version** | **Long** | | [optional] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the edge. May include: 'description' (string). | [optional] | diff --git a/ce/docs/EdgeInfo.md b/ce/docs/EdgeInfo.md index 94773b35..d921f26c 100644 --- a/ce/docs/EdgeInfo.md +++ b/ce/docs/EdgeInfo.md @@ -9,6 +9,7 @@ |------------ | ------------- | ------------- | -------------| | **id** | **EdgeId** | JSON object with the Edge Id. Specify this field to update the Edge. Referencing non-existing Edge Id will cause error. Omit this field to create new Edge. | [optional] | | **createdTime** | **Long** | Timestamp of the edge creation, in milliseconds | [optional] [readonly] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the edge. May include: 'description' (string). | [optional] | | **tenantId** | **TenantId** | JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id. | [optional] [readonly] | | **customerId** | **CustomerId** | JSON object with Customer Id. Use 'assignEdgeToCustomer' to change the Customer Id. | [optional] [readonly] | | **rootRuleChainId** | **RuleChainId** | JSON object with Root Rule Chain Id. Use 'setEdgeRootRuleChain' to change the Root Rule Chain Id. | [optional] [readonly] | @@ -20,7 +21,6 @@ | **version** | **Long** | | [optional] | | **customerTitle** | **String** | | [optional] | | **customerIsPublic** | **Boolean** | | [optional] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the edge. May include: 'description' (string). | [optional] | diff --git a/ce/docs/EntityDataDiff.md b/ce/docs/EntityDataDiff.md index b00ae309..2c00b6e0 100644 --- a/ce/docs/EntityDataDiff.md +++ b/ce/docs/EntityDataDiff.md @@ -151,8 +151,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -261,6 +261,7 @@ |------|------|-------------|-------| | id | RuleNodeId | JSON object with the Rule Node Id. Specify this field to update the Rule Node. Referencing non-existing Rule Node Id will cause error. Omit this field to create new rule node. | [optional] | | createdTime | Long | Timestamp of the rule node creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the rule node. May include: 'layoutX' (number, X coordinate for visualization), 'layoutY' (number, Y coordinate for visualization), 'description' (string). | [optional] | | ruleChainId | RuleChainId | JSON object with the Rule Chain Id. | [optional] [readonly] | | type | String | Full Java Class Name of the rule node implementation. | [optional] | | name | String | User defined name of the rule node. Used on UI and for logging. | [optional] | @@ -270,7 +271,6 @@ | configurationVersion | Integer | Version of rule node configuration. | [optional] | | _configuration | com.fasterxml.jackson.databind.JsonNode | JSON with the rule node configuration. Structure depends on the rule node implementation. | [optional] | | externalId | RuleNodeId | | [optional] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the rule node. May include: 'layoutX' (number, X coordinate for visualization), 'layoutY' (number, Y coordinate for visualization), 'description' (string). | [optional] | | debugMode | Boolean | | [optional] | #### NodeConnectionInfo @@ -333,11 +333,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -473,26 +473,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -523,41 +523,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -574,17 +574,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -593,46 +596,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -641,7 +641,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -650,7 +650,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/EntityExportData.md b/ce/docs/EntityExportData.md index 0e648234..12a8e3be 100644 --- a/ce/docs/EntityExportData.md +++ b/ce/docs/EntityExportData.md @@ -171,8 +171,8 @@ Base export container for ThingsBoard entities | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -240,6 +240,7 @@ Base export container for ThingsBoard entities |------|------|-------------|-------| | id | RuleNodeId | JSON object with the Rule Node Id. Specify this field to update the Rule Node. Referencing non-existing Rule Node Id will cause error. Omit this field to create new rule node. | [optional] | | createdTime | Long | Timestamp of the rule node creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the rule node. May include: 'layoutX' (number, X coordinate for visualization), 'layoutY' (number, Y coordinate for visualization), 'description' (string). | [optional] | | ruleChainId | RuleChainId | JSON object with the Rule Chain Id. | [optional] [readonly] | | type | String | Full Java Class Name of the rule node implementation. | [optional] | | name | String | User defined name of the rule node. Used on UI and for logging. | [optional] | @@ -249,7 +250,6 @@ Base export container for ThingsBoard entities | configurationVersion | Integer | Version of rule node configuration. | [optional] | | _configuration | com.fasterxml.jackson.databind.JsonNode | JSON with the rule node configuration. Structure depends on the rule node implementation. | [optional] | | externalId | RuleNodeId | | [optional] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the rule node. May include: 'layoutX' (number, X coordinate for visualization), 'layoutY' (number, Y coordinate for visualization), 'description' (string). | [optional] | | debugMode | Boolean | | [optional] | #### NodeConnectionInfo @@ -331,11 +331,11 @@ Base export container for ThingsBoard entities | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -471,26 +471,26 @@ Base export container for ThingsBoard entities #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -521,41 +521,41 @@ Base export container for ThingsBoard entities #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -572,17 +572,20 @@ Base export container for ThingsBoard entities | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -591,46 +594,43 @@ Base export container for ThingsBoard entities #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -639,7 +639,7 @@ Base export container for ThingsBoard entities | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -648,7 +648,7 @@ Base export container for ThingsBoard entities | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/EntityRelationInfo.md b/ce/docs/EntityRelationInfo.md index dd7d72ff..eba0e1a5 100644 --- a/ce/docs/EntityRelationInfo.md +++ b/ce/docs/EntityRelationInfo.md @@ -12,9 +12,9 @@ | **type** | **String** | String value of relation type. | | | **typeGroup** | **RelationTypeGroup** | Represents the type group of the relation. | | | **version** | **Long** | | [optional] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the relation. | [optional] | | **fromName** | **String** | Name of the entity for [from] direction. | [optional] [readonly] | | **toName** | **String** | Name of the entity for [to] direction. | [optional] [readonly] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the relation. | [optional] | diff --git a/ce/docs/EntityView.md b/ce/docs/EntityView.md index e395abd2..9cd98730 100644 --- a/ce/docs/EntityView.md +++ b/ce/docs/EntityView.md @@ -11,6 +11,7 @@ A JSON object representing the entity view. |------------ | ------------- | ------------- | -------------| | **id** | **EntityViewId** | JSON object with the Entity View Id. Specify this field to update the Entity View. Referencing non-existing Entity View Id will cause error. Omit this field to create new Entity View. | [optional] | | **createdTime** | **Long** | Timestamp of the Entity View creation, in milliseconds | [optional] [readonly] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the entity view. May include: 'description' (string). | [optional] | | **entityId** | **EntityId** | JSON object with the referenced Entity Id (Device or Asset). | | | **tenantId** | **TenantId** | JSON object with Tenant Id. | [optional] [readonly] | | **customerId** | **CustomerId** | JSON object with Customer Id. Use 'assignEntityViewToCustomer' to change the Customer Id. | [optional] [readonly] | @@ -20,7 +21,6 @@ A JSON object representing the entity view. | **startTimeMs** | **Long** | Represents the start time of the interval that is used to limit access to target device telemetry. Customer will not be able to see entity telemetry that is outside the specified interval; | [optional] | | **endTimeMs** | **Long** | Represents the end time of the interval that is used to limit access to target device telemetry. Customer will not be able to see entity telemetry that is outside the specified interval; | [optional] | | **version** | **Long** | | [optional] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the entity view. May include: 'description' (string). | [optional] | diff --git a/ce/docs/EntityViewExportData.md b/ce/docs/EntityViewExportData.md index de40d7fe..391f5a6e 100644 --- a/ce/docs/EntityViewExportData.md +++ b/ce/docs/EntityViewExportData.md @@ -96,8 +96,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -201,11 +201,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -341,26 +341,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -391,41 +391,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -442,17 +442,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -461,46 +464,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -509,7 +509,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -518,7 +518,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/EntityViewInfo.md b/ce/docs/EntityViewInfo.md index ff5eec32..1ba0f28e 100644 --- a/ce/docs/EntityViewInfo.md +++ b/ce/docs/EntityViewInfo.md @@ -9,6 +9,7 @@ |------------ | ------------- | ------------- | -------------| | **id** | **EntityViewId** | JSON object with the Entity View Id. Specify this field to update the Entity View. Referencing non-existing Entity View Id will cause error. Omit this field to create new Entity View. | [optional] | | **createdTime** | **Long** | Timestamp of the Entity View creation, in milliseconds | [optional] [readonly] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the entity view. May include: 'description' (string). | [optional] | | **entityId** | **EntityId** | JSON object with the referenced Entity Id (Device or Asset). | | | **tenantId** | **TenantId** | JSON object with Tenant Id. | [optional] [readonly] | | **customerId** | **CustomerId** | JSON object with Customer Id. Use 'assignEntityViewToCustomer' to change the Customer Id. | [optional] [readonly] | @@ -20,7 +21,6 @@ | **version** | **Long** | | [optional] | | **customerTitle** | **String** | Title of the Customer that owns the entity view. | [optional] [readonly] | | **customerIsPublic** | **Boolean** | Indicates special 'Public' Customer that is auto-generated to use the entity view on public dashboards. | [optional] [readonly] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the entity view. May include: 'description' (string). | [optional] | diff --git a/ce/docs/AlarmRuleNoDataFilterPredicate.md b/ce/docs/NoDataFilterPredicate.md similarity index 91% rename from ce/docs/AlarmRuleNoDataFilterPredicate.md rename to ce/docs/NoDataFilterPredicate.md index cd14aadb..dd55136e 100644 --- a/ce/docs/AlarmRuleNoDataFilterPredicate.md +++ b/ce/docs/NoDataFilterPredicate.md @@ -1,7 +1,7 @@ -# AlarmRuleNoDataFilterPredicate +# NoDataFilterPredicate -`org.thingsboard.client.model.AlarmRuleNoDataFilterPredicate` +`org.thingsboard.client.model.NoDataFilterPredicate` **Extends:** **AlarmRuleKeyFilterPredicate** @@ -9,8 +9,8 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **duration** | **AlarmConditionValueLong** | | | | **unit** | **TimeUnit** | | | +| **duration** | **AlarmConditionValueLong** | | | @@ -21,15 +21,15 @@ |------|------|-------------|-------| | type | String | | | +#### TimeUnit (enum) +`NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` + #### AlarmConditionValueLong | Name | Type | Description | Notes | |------|------|-------------|-------| | staticValue | Long | | [optional] | | dynamicValueArgument | String | | [optional] | -#### TimeUnit (enum) -`NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` - --- ### Conventions diff --git a/ce/docs/NotificationRuleExportData.md b/ce/docs/NotificationRuleExportData.md index f87322f3..0f04d9fc 100644 --- a/ce/docs/NotificationRuleExportData.md +++ b/ce/docs/NotificationRuleExportData.md @@ -96,8 +96,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -201,11 +201,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -341,26 +341,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -391,41 +391,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -442,17 +442,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -461,46 +464,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -509,7 +509,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -518,7 +518,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/NotificationTargetExportData.md b/ce/docs/NotificationTargetExportData.md index aa6e3d3d..2986d3ff 100644 --- a/ce/docs/NotificationTargetExportData.md +++ b/ce/docs/NotificationTargetExportData.md @@ -96,8 +96,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -201,11 +201,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -341,26 +341,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -391,41 +391,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -442,17 +442,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -461,46 +464,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -509,7 +509,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -518,7 +518,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/NotificationTemplateExportData.md b/ce/docs/NotificationTemplateExportData.md index 2524124c..b34e4e82 100644 --- a/ce/docs/NotificationTemplateExportData.md +++ b/ce/docs/NotificationTemplateExportData.md @@ -96,8 +96,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -201,11 +201,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -341,26 +341,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -391,41 +391,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -442,17 +442,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -461,46 +464,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -509,7 +509,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -518,7 +518,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/OAuth2ClientRegistrationTemplate.md b/ce/docs/OAuth2ClientRegistrationTemplate.md index 5a9080e0..4ba9a9f0 100644 --- a/ce/docs/OAuth2ClientRegistrationTemplate.md +++ b/ce/docs/OAuth2ClientRegistrationTemplate.md @@ -9,6 +9,7 @@ |------------ | ------------- | ------------- | -------------| | **id** | **OAuth2ClientRegistrationTemplateId** | | [optional] | | **createdTime** | **Long** | Entity creation timestamp in milliseconds since Unix epoch | [optional] [readonly] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | | [optional] | | **providerId** | **String** | OAuth2 provider identifier (e.g. its name) | | | **mapperConfig** | **OAuth2MapperConfig** | Default config for mapping OAuth2 log in response to platform entities | [optional] | | **authorizationUri** | **String** | Default authorization URI of the OAuth2 provider | [optional] | @@ -22,7 +23,6 @@ | **loginButtonIcon** | **String** | Default log in button icon for OAuth2 provider | [optional] | | **loginButtonLabel** | **String** | Default OAuth2 provider label | [optional] | | **helpLink** | **String** | Help link for OAuth2 provider | [optional] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | | [optional] | | **name** | **String** | | [optional] | diff --git a/ce/docs/OtaPackage.md b/ce/docs/OtaPackage.md index 5da7b52b..e020115e 100644 --- a/ce/docs/OtaPackage.md +++ b/ce/docs/OtaPackage.md @@ -9,6 +9,7 @@ |------------ | ------------- | ------------- | -------------| | **id** | **OtaPackageId** | JSON object with the ota package Id. Specify existing ota package Id to update the ota package. Referencing non-existing ota package id will cause error. Omit this field to create new ota package. | [optional] | | **createdTime** | **Long** | Timestamp of the ota package creation, in milliseconds | [optional] [readonly] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | OTA Package description. | [optional] | | **tenantId** | **TenantId** | JSON object with Tenant Id. Tenant Id of the ota package can't be changed. | [optional] [readonly] | | **deviceProfileId** | **DeviceProfileId** | JSON object with Device Profile Id. Device Profile Id of the ota package can't be changed. | [optional] | | **type** | **OtaPackageType** | OTA Package type. | [optional] | @@ -22,7 +23,6 @@ | **checksumAlgorithm** | **ChecksumAlgorithm** | OTA Package checksum algorithm. | [optional] [readonly] | | **checksum** | **String** | OTA Package checksum. | [optional] [readonly] | | **dataSize** | **Long** | OTA Package data size. | [optional] [readonly] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | OTA Package description. | [optional] | | **data** | **byte[]** | | [optional] | | **name** | **String** | | [optional] [readonly] | diff --git a/ce/docs/OtaPackageExportData.md b/ce/docs/OtaPackageExportData.md index 0454d9f0..6805512d 100644 --- a/ce/docs/OtaPackageExportData.md +++ b/ce/docs/OtaPackageExportData.md @@ -96,8 +96,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -201,11 +201,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -341,26 +341,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -391,41 +391,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -442,17 +442,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -461,46 +464,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -509,7 +509,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -518,7 +518,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/OtaPackageInfo.md b/ce/docs/OtaPackageInfo.md index 09025746..d8131457 100644 --- a/ce/docs/OtaPackageInfo.md +++ b/ce/docs/OtaPackageInfo.md @@ -9,6 +9,7 @@ |------------ | ------------- | ------------- | -------------| | **id** | **OtaPackageId** | JSON object with the ota package Id. Specify existing ota package Id to update the ota package. Referencing non-existing ota package id will cause error. Omit this field to create new ota package. | [optional] | | **createdTime** | **Long** | Timestamp of the ota package creation, in milliseconds | [optional] [readonly] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | OTA Package description. | [optional] | | **tenantId** | **TenantId** | JSON object with Tenant Id. Tenant Id of the ota package can't be changed. | [optional] [readonly] | | **deviceProfileId** | **DeviceProfileId** | JSON object with Device Profile Id. Device Profile Id of the ota package can't be changed. | [optional] | | **type** | **OtaPackageType** | OTA Package type. | [optional] | @@ -22,7 +23,6 @@ | **checksumAlgorithm** | **ChecksumAlgorithm** | OTA Package checksum algorithm. | [optional] [readonly] | | **checksum** | **String** | OTA Package checksum. | [optional] [readonly] | | **dataSize** | **Long** | OTA Package data size. | [optional] [readonly] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | OTA Package description. | [optional] | | **name** | **String** | | [optional] [readonly] | diff --git a/ce/docs/PageDataAlarmRuleDefinition.md b/ce/docs/PageDataAlarmRuleDefinition.md index da0f67d2..d8f43a14 100644 --- a/ce/docs/PageDataAlarmRuleDefinition.md +++ b/ce/docs/PageDataAlarmRuleDefinition.md @@ -21,30 +21,266 @@ #### AlarmRuleDefinition | Name | Type | Description | Notes | |------|------|-------------|-------| +| id | CalculatedFieldId | JSON object with the Alarm Rule Id. Referencing non-existing Alarm Rule Id will cause error. | [optional] | +| createdTime | Long | Timestamp of the alarm rule creation, in milliseconds | [optional] [readonly] | +| tenantId | TenantId | | [optional] | +| entityId | EntityId | | [optional] | +| name | String | User defined name of the alarm rule. | [optional] | +| debugSettings | DebugSettings | Debug settings object. | [optional] | +| configurationVersion | Integer | Version of alarm rule configuration. | [optional] | +| _configuration | AlarmCalculatedFieldConfiguration | | | +| version | Long | | [optional] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the alarm rule. May include: 'description' (string). | [optional] | +| debugMode | Boolean | | [optional] | + +#### DebugSettings +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| failuresEnabled | Boolean | Debug failures. | [optional] | +| allEnabled | Boolean | Debug All. Used as a trigger for updating debugAllUntil. | [optional] | +| allEnabledUntil | Long | Timestamp of the end time for the processing debug events. | [optional] | + +#### EntityType (enum) +`TENANT` | `CUSTOMER` | `USER` | `DASHBOARD` | `ASSET` | `DEVICE` | `ALARM` | `RULE_CHAIN` | `RULE_NODE` | `ENTITY_VIEW` | … (36 values total) + +#### CalculatedFieldConfiguration +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| output | Output | | [optional] | +| type | String | | | + +#### AlarmCalculatedFieldConfiguration *(extends CalculatedFieldConfiguration, type=`ALARM`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| arguments | Map | | | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | +| propagate | Boolean | | [optional] | +| propagateToOwner | Boolean | | [optional] | +| propagateToTenant | Boolean | | [optional] | +| propagateRelationTypes | List | | [optional] | + +#### EntityAggregationCalculatedFieldConfiguration *(extends CalculatedFieldConfiguration, type=`ENTITY_AGGREGATION`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| arguments | Map | | | +| metrics | Map | | | +| interval | AggInterval | | | +| watermark | Watermark | | [optional] | +| produceIntermediateResult | Boolean | | [optional] | + +#### GeofencingCalculatedFieldConfiguration *(extends CalculatedFieldConfiguration, type=`GEOFENCING`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| entityCoordinates | EntityCoordinates | | | +| zoneGroups | Map | | | +| scheduledUpdateEnabled | Boolean | | [optional] | +| scheduledUpdateInterval | Integer | | [optional] | + +#### PropagationCalculatedFieldConfiguration *(extends CalculatedFieldConfiguration, type=`PROPAGATION`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| arguments | Map | | | +| expression | String | | [optional] | +| relation | RelationPathLevel | | | +| applyExpressionToResolvedArguments | Boolean | | [optional] | + +#### RelatedEntitiesAggregationCalculatedFieldConfiguration *(extends CalculatedFieldConfiguration, type=`RELATED_ENTITIES_AGGREGATION`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| relation | RelationPathLevel | | | +| arguments | Map | | | +| deduplicationIntervalInSec | Long | | [optional] | +| metrics | Map | | | +| useLatestTs | Boolean | | [optional] | +| scheduledUpdateInterval | Integer | | [optional] | +| scheduledUpdateEnabled | Boolean | | [optional] | + +#### ScriptCalculatedFieldConfiguration *(extends CalculatedFieldConfiguration, type=`SCRIPT`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| arguments | Map | | | +| expression | String | | [optional] | + +#### SimpleCalculatedFieldConfiguration *(extends CalculatedFieldConfiguration, type=`SIMPLE`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| arguments | Map | | | +| expression | String | | [optional] | +| useLatestTs | Boolean | | [optional] | + +#### Argument +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| refEntityId | EntityId | | [optional] | +| refDynamicSourceConfiguration | CfArgumentDynamicSourceConfiguration | | [optional] | +| refEntityKey | ReferencedEntityKey | | [optional] | +| defaultValue | String | | [optional] | +| limit | Integer | | [optional] | +| timeWindow | Long | | [optional] | + +#### AlarmRule +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | -#### AlarmRuleCondition +#### Output +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| decimalsByDefault | Integer | | [optional] | +| name | String | | [optional] | +| scope | AttributeScope | | [optional] | +| strategy | Object | | [optional] | +| type | String | | | + +#### AttributesOutput *(extends Output, type=`ATTRIBUTES`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| strategy | AttributesOutputStrategy | | [optional] | + +#### TimeSeriesOutput *(extends Output, type=`TIME_SERIES`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| strategy | TimeSeriesOutputStrategy | | [optional] | + +#### CfArgumentDynamicSourceConfiguration +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| type | String | | | + +#### CurrentOwnerDynamicSourceConfiguration *(extends CfArgumentDynamicSourceConfiguration, type=`CURRENT_OWNER`)* +*See CfArgumentDynamicSourceConfiguration for properties.* + +#### RelationPathQueryDynamicSourceConfiguration *(extends CfArgumentDynamicSourceConfiguration, type=`RELATION_PATH_QUERY`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| levels | List | | [optional] | + +#### ReferencedEntityKey +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| key | String | | [optional] | +| type | ArgumentType | | [optional] | +| scope | AttributeScope | | [optional] | + +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* + +#### AttributeScope (enum) +`CLIENT_SCOPE` | `SERVER_SCOPE` | `SHARED_SCOPE` + +#### EntityCoordinates +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| latitudeKeyName | String | | | +| longitudeKeyName | String | | | + +#### ZoneGroupConfiguration +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| refEntityId | EntityId | | [optional] | +| refDynamicSourceConfiguration | CfArgumentDynamicSourceConfiguration | | [optional] | +| perimeterKeyName | String | | | +| reportStrategy | GeofencingReportStrategy | | | +| createRelationsWithMatchedZones | Boolean | | [optional] | +| relationType | String | | [optional] | +| direction | EntitySearchDirection | | [optional] | + +#### RelationPathLevel +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| direction | EntitySearchDirection | | | +| relationType | String | | | + +#### AggMetric +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| function | AggFunction | | [optional] | +| filter | String | | [optional] | +| input | AggInput | | [optional] | +| defaultValue | Double | | [optional] | + +#### AggInterval +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| type | String | | | + +#### CustomInterval *(extends AggInterval, type=`CUSTOM`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| tz | String | | | +| offsetSec | Long | | [optional] | +| durationSec | Long | | | + +#### DayInterval *(extends AggInterval, type=`DAY`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| tz | String | | | +| offsetSec | Long | | [optional] | + +#### HourInterval *(extends AggInterval, type=`HOUR`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| tz | String | | | +| offsetSec | Long | | [optional] | + +#### MonthInterval *(extends AggInterval, type=`MONTH`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| tz | String | | | +| offsetSec | Long | | [optional] | + +#### QuarterInterval *(extends AggInterval, type=`QUARTER`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| tz | String | | | +| offsetSec | Long | | [optional] | + +#### WeekInterval *(extends AggInterval, type=`WEEK`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| tz | String | | | +| offsetSec | Long | | [optional] | + +#### WeekSunSatInterval *(extends AggInterval, type=`WEEK_SUN_SAT`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| tz | String | | | +| offsetSec | Long | | [optional] | + +#### YearInterval *(extends AggInterval, type=`YEAR`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| tz | String | | | +| offsetSec | Long | | [optional] | + +#### Watermark +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| duration | Long | | [optional] | + +#### ArgumentType (enum) +`TS_LATEST` | `ATTRIBUTE` | `TS_ROLLING` #### AlarmConditionExpression | Name | Type | Description | Notes | @@ -54,41 +290,99 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### TimeSeriesOutputStrategy | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### TimeSeriesImmediateOutputStrategy *(extends TimeSeriesOutputStrategy, type=`IMMEDIATE`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| ttl | Long | | [optional] | +| saveTimeSeries | Boolean | | [optional] | +| saveLatest | Boolean | | [optional] | +| sendWsUpdate | Boolean | | [optional] | +| processCfs | Boolean | | [optional] | + +#### TimeSeriesRuleChainOutputStrategy *(extends TimeSeriesOutputStrategy, type=`RULE_CHAIN`)* +*See TimeSeriesOutputStrategy for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### AttributesOutputStrategy +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| type | String | | | + +#### AttributesImmediateOutputStrategy *(extends AttributesOutputStrategy, type=`IMMEDIATE`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| sendAttributesUpdatedNotification | Boolean | | [optional] | +| updateAttributesOnlyOnValueChange | Boolean | | [optional] | +| saveAttribute | Boolean | | [optional] | +| sendWsUpdate | Boolean | | [optional] | +| processCfs | Boolean | | [optional] | + +#### AttributesRuleChainOutputStrategy *(extends AttributesOutputStrategy, type=`RULE_CHAIN`)* +*See AttributesOutputStrategy for properties.* + +#### GeofencingReportStrategy (enum) +`REPORT_TRANSITION_EVENTS_ONLY` | `REPORT_PRESENCE_STATUS_ONLY` | `REPORT_TRANSITION_EVENTS_AND_PRESENCE_STATUS` + +#### EntitySearchDirection (enum) +`FROM` | `TO` + +#### AggFunction (enum) +`MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` + +#### AggInput +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| type | String | | | + +#### AggFunctionInput *(extends AggInput, type=`function`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| function | String | | [optional] | + +#### AggKeyInput *(extends AggInput, type=`key`)* +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| key | String | | [optional] | + +#### AlarmSchedule +| Name | Type | Description | Notes | +|------|------|-------------|-------| +| type | String | | | + +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* + +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -105,20 +399,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### EntityType (enum) -`TENANT` | `CUSTOMER` | `USER` | `DASHBOARD` | `ASSET` | `DEVICE` | `ALARM` | `RULE_CHAIN` | `RULE_NODE` | `ENTITY_VIEW` | … (36 values total) - -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -127,46 +421,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -175,7 +466,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -184,7 +475,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/PageDataAlarmRuleDefinitionInfo.md b/ce/docs/PageDataAlarmRuleDefinitionInfo.md index f4652a10..496d54e1 100644 --- a/ce/docs/PageDataAlarmRuleDefinitionInfo.md +++ b/ce/docs/PageDataAlarmRuleDefinitionInfo.md @@ -54,8 +54,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -120,11 +120,11 @@ | limit | Integer | | [optional] | | timeWindow | Long | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### Output @@ -166,26 +166,26 @@ | type | ArgumentType | | [optional] | | scope | AttributeScope | | [optional] | -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AttributeScope (enum) `CLIENT_SCOPE` | `SERVER_SCOPE` | `SHARED_SCOPE` @@ -291,19 +291,19 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | #### TimeSeriesOutputStrategy | Name | Type | Description | Notes | @@ -363,27 +363,27 @@ |------|------|-------------|-------| | key | String | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -400,17 +400,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -419,46 +422,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -467,7 +467,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -476,7 +476,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/PageDataAsset.md b/ce/docs/PageDataAsset.md index 70d15ad3..79d686f2 100644 --- a/ce/docs/PageDataAsset.md +++ b/ce/docs/PageDataAsset.md @@ -23,6 +23,7 @@ |------|------|-------------|-------| | id | AssetId | JSON object with the asset Id. Specify this field to update the asset. Referencing non-existing asset Id will cause error. Omit this field to create new asset. | [optional] | | createdTime | Long | Timestamp of the asset creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the asset. May include: 'description' (string). | [optional] | | tenantId | TenantId | JSON object with Tenant Id. | [optional] [readonly] | | customerId | CustomerId | JSON object with Customer Id. Use 'assignAssetToCustomer' to change the Customer Id. | [optional] [readonly] | | name | String | Unique Asset Name in scope of Tenant | | @@ -30,7 +31,6 @@ | label | String | Label that may be used in widgets | [optional] | | assetProfileId | AssetProfileId | JSON object with Asset Profile Id. | [optional] | | version | Long | | [optional] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the asset. May include: 'description' (string). | [optional] | #### EntityType (enum) `TENANT` | `CUSTOMER` | `USER` | `DASHBOARD` | `ASSET` | `DEVICE` | `ALARM` | `RULE_CHAIN` | `RULE_NODE` | `ENTITY_VIEW` | … (36 values total) diff --git a/ce/docs/PageDataAssetInfo.md b/ce/docs/PageDataAssetInfo.md index b469d769..5f5ff273 100644 --- a/ce/docs/PageDataAssetInfo.md +++ b/ce/docs/PageDataAssetInfo.md @@ -23,6 +23,7 @@ |------|------|-------------|-------| | id | AssetId | JSON object with the asset Id. Specify this field to update the asset. Referencing non-existing asset Id will cause error. Omit this field to create new asset. | [optional] | | createdTime | Long | Timestamp of the asset creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the asset. May include: 'description' (string). | [optional] | | tenantId | TenantId | JSON object with Tenant Id. | [optional] [readonly] | | customerId | CustomerId | JSON object with Customer Id. Use 'assignAssetToCustomer' to change the Customer Id. | [optional] [readonly] | | name | String | Unique Asset Name in scope of Tenant | | @@ -33,7 +34,6 @@ | customerTitle | String | Title of the Customer that owns the asset. | [optional] [readonly] | | customerIsPublic | Boolean | Indicates special 'Public' Customer that is auto-generated to use the assets on public dashboards. | [optional] [readonly] | | assetProfileName | String | Name of the corresponding Asset Profile. | [optional] [readonly] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the asset. May include: 'description' (string). | [optional] | #### EntityType (enum) `TENANT` | `CUSTOMER` | `USER` | `DASHBOARD` | `ASSET` | `DEVICE` | `ALARM` | `RULE_CHAIN` | `RULE_NODE` | `ENTITY_VIEW` | … (36 values total) diff --git a/ce/docs/PageDataCalculatedField.md b/ce/docs/PageDataCalculatedField.md index d67ec9d5..5f5dfbdc 100644 --- a/ce/docs/PageDataCalculatedField.md +++ b/ce/docs/PageDataCalculatedField.md @@ -54,8 +54,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -162,11 +162,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -302,26 +302,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -352,41 +352,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -403,17 +403,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -422,46 +425,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -470,7 +470,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -479,7 +479,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/PageDataCalculatedFieldInfo.md b/ce/docs/PageDataCalculatedFieldInfo.md index 7b49712c..23080c7e 100644 --- a/ce/docs/PageDataCalculatedFieldInfo.md +++ b/ce/docs/PageDataCalculatedFieldInfo.md @@ -55,8 +55,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -163,11 +163,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -303,26 +303,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -353,41 +353,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -404,17 +404,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -423,46 +426,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -471,7 +471,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -480,7 +480,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/PageDataCustomer.md b/ce/docs/PageDataCustomer.md index f74d3497..9336569d 100644 --- a/ce/docs/PageDataCustomer.md +++ b/ce/docs/PageDataCustomer.md @@ -23,6 +23,7 @@ |------|------|-------------|-------| | id | CustomerId | JSON object with the customer Id. Specify this field to update the customer. Referencing non-existing customer Id will cause error. Omit this field to create new customer. | [optional] | | createdTime | Long | Timestamp of the customer creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the customer. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar), 'isPublic' (boolean, whether this is a public customer). | [optional] | | country | String | Country | [optional] | | state | String | State | [optional] | | city | String | City | [optional] | @@ -34,7 +35,6 @@ | title | String | Title of the customer | | | tenantId | TenantId | JSON object with Tenant Id | [optional] | | version | Long | | [optional] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the customer. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar), 'isPublic' (boolean, whether this is a public customer). | [optional] | | name | String | Name of the customer. Read-only, duplicated from title for backward compatibility | [optional] [readonly] | #### EntityType (enum) diff --git a/ce/docs/PageDataDevice.md b/ce/docs/PageDataDevice.md index 8056eda8..deefd4c2 100644 --- a/ce/docs/PageDataDevice.md +++ b/ce/docs/PageDataDevice.md @@ -23,17 +23,17 @@ |------|------|-------------|-------| | id | DeviceId | JSON object with the Device Id. Specify this field to update the Device. Referencing non-existing Device Id will cause error. Omit this field to create new Device. | [optional] | | createdTime | Long | Timestamp of the device creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device). | [optional] | | tenantId | TenantId | JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id. | [optional] [readonly] | | customerId | CustomerId | JSON object with Customer Id. Use 'assignDeviceToCustomer' to change the Customer Id. | [optional] [readonly] | | name | String | Unique Device Name in scope of Tenant | | | type | String | Device Profile Name | [optional] | | label | String | Label that may be used in widgets | [optional] | | deviceProfileId | DeviceProfileId | JSON object with Device Profile Id. If not provided, the type will be used to determine the profile. If neither deviceProfileId nor type is specified, the default device profile will be used. | [optional] | +| deviceData | DeviceData | JSON object with content specific to type of transport in the device profile. | [optional] | | firmwareId | OtaPackageId | JSON object with Ota Package Id. | [optional] | | softwareId | OtaPackageId | JSON object with Ota Package Id. | [optional] | | version | Long | | [optional] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device). | [optional] | -| deviceData | DeviceData | JSON object with content specific to type of transport in the device profile. | [optional] | #### DeviceData | Name | Type | Description | Notes | diff --git a/ce/docs/PageDataDeviceInfo.md b/ce/docs/PageDataDeviceInfo.md index dab45399..6156c155 100644 --- a/ce/docs/PageDataDeviceInfo.md +++ b/ce/docs/PageDataDeviceInfo.md @@ -23,12 +23,14 @@ |------|------|-------------|-------| | id | DeviceId | JSON object with the Device Id. Specify this field to update the Device. Referencing non-existing Device Id will cause error. Omit this field to create new Device. | [optional] | | createdTime | Long | Timestamp of the device creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device). | [optional] | | tenantId | TenantId | JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id. | [optional] [readonly] | | customerId | CustomerId | JSON object with Customer Id. Use 'assignDeviceToCustomer' to change the Customer Id. | [optional] [readonly] | | name | String | Unique Device Name in scope of Tenant | | | type | String | Device Profile Name | [optional] | | label | String | Label that may be used in widgets | [optional] | | deviceProfileId | DeviceProfileId | JSON object with Device Profile Id. If not provided, the type will be used to determine the profile. If neither deviceProfileId nor type is specified, the default device profile will be used. | [optional] | +| deviceData | DeviceData | JSON object with content specific to type of transport in the device profile. | [optional] | | firmwareId | OtaPackageId | JSON object with Ota Package Id. | [optional] | | softwareId | OtaPackageId | JSON object with Ota Package Id. | [optional] | | version | Long | | [optional] | @@ -36,8 +38,6 @@ | customerIsPublic | Boolean | Indicates special 'Public' Customer that is auto-generated to use the devices on public dashboards. | [optional] [readonly] | | deviceProfileName | String | Name of the corresponding Device Profile. | [optional] [readonly] | | active | Boolean | Device active flag. | [optional] [readonly] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device). | [optional] | -| deviceData | DeviceData | JSON object with content specific to type of transport in the device profile. | [optional] | #### DeviceData | Name | Type | Description | Notes | diff --git a/ce/docs/PageDataDeviceProfile.md b/ce/docs/PageDataDeviceProfile.md index 8c7589b3..2a0b6fe8 100644 --- a/ce/docs/PageDataDeviceProfile.md +++ b/ce/docs/PageDataDeviceProfile.md @@ -33,13 +33,13 @@ | defaultRuleChainId | RuleChainId | Reference to the rule chain. If present, the specified rule chain will be used to process all messages related to device, including telemetry, attribute updates, etc. Otherwise, the root rule chain will be used to process those messages. | [optional] | | defaultDashboardId | DashboardId | Reference to the dashboard. Used in the mobile application to open the default dashboard when user navigates to device details. | [optional] | | defaultQueueName | String | Rule engine queue name. If present, the specified queue will be used to store all unprocessed messages related to device, including telemetry, attribute updates, etc. Otherwise, the 'Main' queue will be used to store those messages. | [optional] | +| profileData | DeviceProfileData | Complex JSON object that includes addition device profile configuration (transport, alarm rules, etc). | [optional] | | provisionDeviceKey | String | Unique provisioning key used by 'Device Provisioning' feature. | [optional] | | firmwareId | OtaPackageId | Reference to the firmware OTA package. If present, the specified package will be used as default device firmware. | [optional] | | softwareId | OtaPackageId | Reference to the software OTA package. If present, the specified package will be used as default device software. | [optional] | | defaultEdgeRuleChainId | RuleChainId | Reference to the edge rule chain. If present, the specified edge rule chain will be used on the edge to process all messages related to device, including telemetry, attribute updates, etc. Otherwise, the edge root rule chain will be used to process those messages. | [optional] | | version | Long | | [optional] | | _default | Boolean | Used to mark the default profile. Default profile is used when the device profile is not specified during device creation. | [optional] | -| profileData | DeviceProfileData | Complex JSON object that includes addition device profile configuration (transport, alarm rules, etc). | [optional] | #### DeviceProfileType (enum) `DEFAULT` diff --git a/ce/docs/PageDataEdge.md b/ce/docs/PageDataEdge.md index 20b2e5ab..bcfde62c 100644 --- a/ce/docs/PageDataEdge.md +++ b/ce/docs/PageDataEdge.md @@ -23,6 +23,7 @@ |------|------|-------------|-------| | id | EdgeId | JSON object with the Edge Id. Specify this field to update the Edge. Referencing non-existing Edge Id will cause error. Omit this field to create new Edge. | [optional] | | createdTime | Long | Timestamp of the edge creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the edge. May include: 'description' (string). | [optional] | | tenantId | TenantId | JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id. | [optional] [readonly] | | customerId | CustomerId | JSON object with Customer Id. Use 'assignEdgeToCustomer' to change the Customer Id. | [optional] [readonly] | | rootRuleChainId | RuleChainId | JSON object with Root Rule Chain Id. Use 'setEdgeRootRuleChain' to change the Root Rule Chain Id. | [optional] [readonly] | @@ -32,7 +33,6 @@ | routingKey | String | Edge routing key ('username') to authorize on cloud | | | secret | String | Edge secret ('password') to authorize on cloud | | | version | Long | | [optional] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the edge. May include: 'description' (string). | [optional] | #### EntityType (enum) `TENANT` | `CUSTOMER` | `USER` | `DASHBOARD` | `ASSET` | `DEVICE` | `ALARM` | `RULE_CHAIN` | `RULE_NODE` | `ENTITY_VIEW` | … (36 values total) diff --git a/ce/docs/PageDataEdgeInfo.md b/ce/docs/PageDataEdgeInfo.md index 070779dd..3a26c71d 100644 --- a/ce/docs/PageDataEdgeInfo.md +++ b/ce/docs/PageDataEdgeInfo.md @@ -23,6 +23,7 @@ |------|------|-------------|-------| | id | EdgeId | JSON object with the Edge Id. Specify this field to update the Edge. Referencing non-existing Edge Id will cause error. Omit this field to create new Edge. | [optional] | | createdTime | Long | Timestamp of the edge creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the edge. May include: 'description' (string). | [optional] | | tenantId | TenantId | JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id. | [optional] [readonly] | | customerId | CustomerId | JSON object with Customer Id. Use 'assignEdgeToCustomer' to change the Customer Id. | [optional] [readonly] | | rootRuleChainId | RuleChainId | JSON object with Root Rule Chain Id. Use 'setEdgeRootRuleChain' to change the Root Rule Chain Id. | [optional] [readonly] | @@ -34,7 +35,6 @@ | version | Long | | [optional] | | customerTitle | String | | [optional] | | customerIsPublic | Boolean | | [optional] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the edge. May include: 'description' (string). | [optional] | #### EntityType (enum) `TENANT` | `CUSTOMER` | `USER` | `DASHBOARD` | `ASSET` | `DEVICE` | `ALARM` | `RULE_CHAIN` | `RULE_NODE` | `ENTITY_VIEW` | … (36 values total) diff --git a/ce/docs/PageDataEntityView.md b/ce/docs/PageDataEntityView.md index 9fe0c0e3..f4357eff 100644 --- a/ce/docs/PageDataEntityView.md +++ b/ce/docs/PageDataEntityView.md @@ -23,6 +23,7 @@ |------|------|-------------|-------| | id | EntityViewId | JSON object with the Entity View Id. Specify this field to update the Entity View. Referencing non-existing Entity View Id will cause error. Omit this field to create new Entity View. | [optional] | | createdTime | Long | Timestamp of the Entity View creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the entity view. May include: 'description' (string). | [optional] | | entityId | EntityId | JSON object with the referenced Entity Id (Device or Asset). | | | tenantId | TenantId | JSON object with Tenant Id. | [optional] [readonly] | | customerId | CustomerId | JSON object with Customer Id. Use 'assignEntityViewToCustomer' to change the Customer Id. | [optional] [readonly] | @@ -32,7 +33,6 @@ | startTimeMs | Long | Represents the start time of the interval that is used to limit access to target device telemetry. Customer will not be able to see entity telemetry that is outside the specified interval; | [optional] | | endTimeMs | Long | Represents the end time of the interval that is used to limit access to target device telemetry. Customer will not be able to see entity telemetry that is outside the specified interval; | [optional] | | version | Long | | [optional] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the entity view. May include: 'description' (string). | [optional] | #### TelemetryEntityView | Name | Type | Description | Notes | diff --git a/ce/docs/PageDataEntityViewInfo.md b/ce/docs/PageDataEntityViewInfo.md index ae6d612c..74ebbcc0 100644 --- a/ce/docs/PageDataEntityViewInfo.md +++ b/ce/docs/PageDataEntityViewInfo.md @@ -23,6 +23,7 @@ |------|------|-------------|-------| | id | EntityViewId | JSON object with the Entity View Id. Specify this field to update the Entity View. Referencing non-existing Entity View Id will cause error. Omit this field to create new Entity View. | [optional] | | createdTime | Long | Timestamp of the Entity View creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the entity view. May include: 'description' (string). | [optional] | | entityId | EntityId | JSON object with the referenced Entity Id (Device or Asset). | | | tenantId | TenantId | JSON object with Tenant Id. | [optional] [readonly] | | customerId | CustomerId | JSON object with Customer Id. Use 'assignEntityViewToCustomer' to change the Customer Id. | [optional] [readonly] | @@ -34,7 +35,6 @@ | version | Long | | [optional] | | customerTitle | String | Title of the Customer that owns the entity view. | [optional] [readonly] | | customerIsPublic | Boolean | Indicates special 'Public' Customer that is auto-generated to use the entity view on public dashboards. | [optional] [readonly] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the entity view. May include: 'description' (string). | [optional] | #### TelemetryEntityView | Name | Type | Description | Notes | diff --git a/ce/docs/PageDataOtaPackageInfo.md b/ce/docs/PageDataOtaPackageInfo.md index d335f760..f4fc8875 100644 --- a/ce/docs/PageDataOtaPackageInfo.md +++ b/ce/docs/PageDataOtaPackageInfo.md @@ -23,6 +23,7 @@ |------|------|-------------|-------| | id | OtaPackageId | JSON object with the ota package Id. Specify existing ota package Id to update the ota package. Referencing non-existing ota package id will cause error. Omit this field to create new ota package. | [optional] | | createdTime | Long | Timestamp of the ota package creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | OTA Package description. | [optional] | | tenantId | TenantId | JSON object with Tenant Id. Tenant Id of the ota package can't be changed. | [optional] [readonly] | | deviceProfileId | DeviceProfileId | JSON object with Device Profile Id. Device Profile Id of the ota package can't be changed. | [optional] | | type | OtaPackageType | OTA Package type. | [optional] | @@ -36,7 +37,6 @@ | checksumAlgorithm | ChecksumAlgorithm | OTA Package checksum algorithm. | [optional] [readonly] | | checksum | String | OTA Package checksum. | [optional] [readonly] | | dataSize | Long | OTA Package data size. | [optional] [readonly] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | OTA Package description. | [optional] | | name | String | | [optional] [readonly] | #### OtaPackageType (enum) diff --git a/ce/docs/PageDataQueue.md b/ce/docs/PageDataQueue.md index 4ca6edc6..5f9ca551 100644 --- a/ce/docs/PageDataQueue.md +++ b/ce/docs/PageDataQueue.md @@ -23,6 +23,7 @@ |------|------|-------------|-------| | id | QueueId | | [optional] | | createdTime | Long | Entity creation timestamp in milliseconds since Unix epoch | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | | [optional] | | tenantId | TenantId | | [optional] | | name | String | | [optional] | | topic | String | | [optional] | @@ -32,7 +33,6 @@ | packProcessingTimeout | Long | | [optional] | | submitStrategy | SubmitStrategy | | [optional] | | processingStrategy | ProcessingStrategy | | [optional] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | | [optional] | #### SubmitStrategy | Name | Type | Description | Notes | diff --git a/ce/docs/PageDataRuleChain.md b/ce/docs/PageDataRuleChain.md index fa685449..970227b3 100644 --- a/ce/docs/PageDataRuleChain.md +++ b/ce/docs/PageDataRuleChain.md @@ -23,15 +23,15 @@ |------|------|-------------|-------| | id | RuleChainId | JSON object with the Rule Chain Id. Specify this field to update the Rule Chain. Referencing non-existing Rule Chain Id will cause error. Omit this field to create new rule chain. | [optional] | | createdTime | Long | Timestamp of the rule chain creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | | [optional] | | tenantId | TenantId | JSON object with Tenant Id. | [readonly] | | name | String | Rule Chain name | | | type | RuleChainType | Rule Chain type. 'EDGE' rule chains are processing messages on the edge devices only. | [optional] | | firstRuleNodeId | RuleNodeId | JSON object with Rule Chain Id. Pointer to the first rule node that should receive all messages pushed to this rule chain. | [optional] | | root | Boolean | Indicates root rule chain. The root rule chain process messages from all devices and entities by default. User may configure default rule chain per device profile. | [optional] | | debugMode | Boolean | Reserved for future usage. | [optional] | -| version | Long | | [optional] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | | [optional] | | _configuration | com.fasterxml.jackson.databind.JsonNode | | [optional] | +| version | Long | | [optional] | #### RuleChainType (enum) `CORE` | `EDGE` diff --git a/ce/docs/PageDataTenant.md b/ce/docs/PageDataTenant.md index e08d4821..7930c20a 100644 --- a/ce/docs/PageDataTenant.md +++ b/ce/docs/PageDataTenant.md @@ -23,6 +23,7 @@ |------|------|-------------|-------| | id | TenantId | JSON object with the tenant Id. Specify this field to update the tenant. Referencing non-existing tenant Id will cause error. Omit this field to create new tenant. | [optional] | | createdTime | Long | Timestamp of the tenant creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar). | [optional] | | country | String | Country | [optional] | | state | String | State | [optional] | | city | String | City | [optional] | @@ -35,7 +36,6 @@ | region | String | Geo region of the tenant | [optional] | | tenantProfileId | TenantProfileId | JSON object with Tenant Profile Id | [optional] | | version | Long | | [optional] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar). | [optional] | | name | String | Name of the tenant. Read-only, duplicated from title for backward compatibility | [optional] [readonly] | #### EntityType (enum) diff --git a/ce/docs/PageDataTenantInfo.md b/ce/docs/PageDataTenantInfo.md index 291d127b..ba264b51 100644 --- a/ce/docs/PageDataTenantInfo.md +++ b/ce/docs/PageDataTenantInfo.md @@ -23,6 +23,7 @@ |------|------|-------------|-------| | id | TenantId | JSON object with the tenant Id. Specify this field to update the tenant. Referencing non-existing tenant Id will cause error. Omit this field to create new tenant. | [optional] | | createdTime | Long | Timestamp of the tenant creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar). | [optional] | | country | String | Country | [optional] | | state | String | State | [optional] | | city | String | City | [optional] | @@ -36,7 +37,6 @@ | tenantProfileId | TenantProfileId | JSON object with Tenant Profile Id | [optional] | | version | Long | | [optional] | | tenantProfileName | String | Tenant Profile name | [optional] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar). | [optional] | | name | String | Name of the tenant. Read-only, duplicated from title for backward compatibility | [optional] [readonly] | #### EntityType (enum) diff --git a/ce/docs/PageDataUser.md b/ce/docs/PageDataUser.md index 480e047a..a15c3d55 100644 --- a/ce/docs/PageDataUser.md +++ b/ce/docs/PageDataUser.md @@ -23,6 +23,7 @@ |------|------|-------------|-------| | id | UserId | JSON object with the User Id. Specify this field to update the device. Referencing non-existing User Id will cause error. Omit this field to create new customer. | [optional] | | createdTime | Long | Timestamp of the user creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the user. May include: 'defaultDashboardId' (string, UUID of the default dashboard), 'defaultDashboardFullscreen' (boolean), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean), 'lang' (string, user locale, e.g. 'en_US'), 'authProviderName' (string, name of the authentication provider). | [optional] | | tenantId | TenantId | JSON object with the Tenant Id. | [optional] | | customerId | CustomerId | JSON object with the Customer Id. | [optional] | | email | String | Email of the user | | @@ -31,7 +32,6 @@ | lastName | String | Last name of the user | [optional] | | phone | String | Phone number of the user | [optional] | | version | Long | | [optional] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the user. May include: 'defaultDashboardId' (string, UUID of the default dashboard), 'defaultDashboardFullscreen' (boolean), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean), 'lang' (string, user locale, e.g. 'en_US'), 'authProviderName' (string, name of the authentication provider). | [optional] | | name | String | Duplicates the email of the user, readonly | [optional] [readonly] | #### Authority (enum) diff --git a/ce/docs/Queue.md b/ce/docs/Queue.md index aa1a604f..7827129f 100644 --- a/ce/docs/Queue.md +++ b/ce/docs/Queue.md @@ -11,6 +11,7 @@ A JSON value representing the queue. |------------ | ------------- | ------------- | -------------| | **id** | **QueueId** | | [optional] | | **createdTime** | **Long** | Entity creation timestamp in milliseconds since Unix epoch | [optional] [readonly] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | | [optional] | | **tenantId** | **TenantId** | | [optional] | | **name** | **String** | | [optional] | | **topic** | **String** | | [optional] | @@ -20,7 +21,6 @@ A JSON value representing the queue. | **packProcessingTimeout** | **Long** | | [optional] | | **submitStrategy** | **SubmitStrategy** | | [optional] | | **processingStrategy** | **ProcessingStrategy** | | [optional] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | | [optional] | diff --git a/ce/docs/AlarmRuleRepeatingCondition.md b/ce/docs/RepeatingAlarmCondition.md similarity index 78% rename from ce/docs/AlarmRuleRepeatingCondition.md rename to ce/docs/RepeatingAlarmCondition.md index e97c1ac2..1ef4a882 100644 --- a/ce/docs/AlarmRuleRepeatingCondition.md +++ b/ce/docs/RepeatingAlarmCondition.md @@ -1,9 +1,9 @@ -# AlarmRuleRepeatingCondition +# RepeatingAlarmCondition -`org.thingsboard.client.model.AlarmRuleRepeatingCondition` +`org.thingsboard.client.model.RepeatingAlarmCondition` -**Extends:** **AlarmRuleCondition** +**Extends:** **AlarmCondition** ## Properties @@ -15,11 +15,11 @@ ## Referenced Types -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | #### AlarmConditionValueInteger @@ -36,53 +36,56 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -91,46 +94,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -139,7 +139,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -148,7 +148,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean @@ -157,15 +157,15 @@ | staticValue | Boolean | | [optional] | | dynamicValueArgument | String | | [optional] | +#### TimeUnit (enum) +`NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` + #### AlarmConditionValueLong | Name | Type | Description | Notes | |------|------|-------------|-------| | staticValue | Long | | [optional] | | dynamicValueArgument | String | | [optional] | -#### TimeUnit (enum) -`NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` - --- ### Conventions diff --git a/ce/docs/RuleChain.md b/ce/docs/RuleChain.md index 6977880c..ba8ceddd 100644 --- a/ce/docs/RuleChain.md +++ b/ce/docs/RuleChain.md @@ -11,15 +11,15 @@ A JSON value representing the rule chain. |------------ | ------------- | ------------- | -------------| | **id** | **RuleChainId** | JSON object with the Rule Chain Id. Specify this field to update the Rule Chain. Referencing non-existing Rule Chain Id will cause error. Omit this field to create new rule chain. | [optional] | | **createdTime** | **Long** | Timestamp of the rule chain creation, in milliseconds | [optional] [readonly] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | | [optional] | | **tenantId** | **TenantId** | JSON object with Tenant Id. | [readonly] | | **name** | **String** | Rule Chain name | | | **type** | **RuleChainType** | Rule Chain type. 'EDGE' rule chains are processing messages on the edge devices only. | [optional] | | **firstRuleNodeId** | **RuleNodeId** | JSON object with Rule Chain Id. Pointer to the first rule node that should receive all messages pushed to this rule chain. | [optional] | | **root** | **Boolean** | Indicates root rule chain. The root rule chain process messages from all devices and entities by default. User may configure default rule chain per device profile. | [optional] | | **debugMode** | **Boolean** | Reserved for future usage. | [optional] | -| **version** | **Long** | | [optional] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | | [optional] | | **_configuration** | **com.fasterxml.jackson.databind.JsonNode** | | [optional] | +| **version** | **Long** | | [optional] | diff --git a/ce/docs/RuleChainData.md b/ce/docs/RuleChainData.md index 065d406d..b90d8831 100644 --- a/ce/docs/RuleChainData.md +++ b/ce/docs/RuleChainData.md @@ -23,15 +23,15 @@ A JSON value representing the rule chains. |------|------|-------------|-------| | id | RuleChainId | JSON object with the Rule Chain Id. Specify this field to update the Rule Chain. Referencing non-existing Rule Chain Id will cause error. Omit this field to create new rule chain. | [optional] | | createdTime | Long | Timestamp of the rule chain creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | | [optional] | | tenantId | TenantId | JSON object with Tenant Id. | [readonly] | | name | String | Rule Chain name | | | type | RuleChainType | Rule Chain type. 'EDGE' rule chains are processing messages on the edge devices only. | [optional] | | firstRuleNodeId | RuleNodeId | JSON object with Rule Chain Id. Pointer to the first rule node that should receive all messages pushed to this rule chain. | [optional] | | root | Boolean | Indicates root rule chain. The root rule chain process messages from all devices and entities by default. User may configure default rule chain per device profile. | [optional] | | debugMode | Boolean | Reserved for future usage. | [optional] | -| version | Long | | [optional] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | | [optional] | | _configuration | com.fasterxml.jackson.databind.JsonNode | | [optional] | +| version | Long | | [optional] | #### RuleChainMetaData | Name | Type | Description | Notes | @@ -52,6 +52,7 @@ A JSON value representing the rule chains. |------|------|-------------|-------| | id | RuleNodeId | JSON object with the Rule Node Id. Specify this field to update the Rule Node. Referencing non-existing Rule Node Id will cause error. Omit this field to create new rule node. | [optional] | | createdTime | Long | Timestamp of the rule node creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the rule node. May include: 'layoutX' (number, X coordinate for visualization), 'layoutY' (number, Y coordinate for visualization), 'description' (string). | [optional] | | ruleChainId | RuleChainId | JSON object with the Rule Chain Id. | [optional] [readonly] | | type | String | Full Java Class Name of the rule node implementation. | [optional] | | name | String | User defined name of the rule node. Used on UI and for logging. | [optional] | @@ -61,7 +62,6 @@ A JSON value representing the rule chains. | configurationVersion | Integer | Version of rule node configuration. | [optional] | | _configuration | com.fasterxml.jackson.databind.JsonNode | JSON with the rule node configuration. Structure depends on the rule node implementation. | [optional] | | externalId | RuleNodeId | | [optional] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the rule node. May include: 'layoutX' (number, X coordinate for visualization), 'layoutY' (number, Y coordinate for visualization), 'description' (string). | [optional] | | debugMode | Boolean | | [optional] | #### NodeConnectionInfo diff --git a/ce/docs/RuleChainExportData.md b/ce/docs/RuleChainExportData.md index 979ee0d1..1a592354 100644 --- a/ce/docs/RuleChainExportData.md +++ b/ce/docs/RuleChainExportData.md @@ -90,6 +90,7 @@ |------|------|-------------|-------| | id | RuleNodeId | JSON object with the Rule Node Id. Specify this field to update the Rule Node. Referencing non-existing Rule Node Id will cause error. Omit this field to create new rule node. | [optional] | | createdTime | Long | Timestamp of the rule node creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the rule node. May include: 'layoutX' (number, X coordinate for visualization), 'layoutY' (number, Y coordinate for visualization), 'description' (string). | [optional] | | ruleChainId | RuleChainId | JSON object with the Rule Chain Id. | [optional] [readonly] | | type | String | Full Java Class Name of the rule node implementation. | [optional] | | name | String | User defined name of the rule node. Used on UI and for logging. | [optional] | @@ -99,7 +100,6 @@ | configurationVersion | Integer | Version of rule node configuration. | [optional] | | _configuration | com.fasterxml.jackson.databind.JsonNode | JSON with the rule node configuration. Structure depends on the rule node implementation. | [optional] | | externalId | RuleNodeId | | [optional] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the rule node. May include: 'layoutX' (number, X coordinate for visualization), 'layoutY' (number, Y coordinate for visualization), 'description' (string). | [optional] | | debugMode | Boolean | | [optional] | #### NodeConnectionInfo @@ -155,8 +155,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -260,11 +260,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -400,26 +400,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -450,41 +450,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -501,17 +501,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -520,46 +523,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -568,7 +568,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -577,7 +577,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/RuleChainMetaData.md b/ce/docs/RuleChainMetaData.md index 3acfa879..d436010c 100644 --- a/ce/docs/RuleChainMetaData.md +++ b/ce/docs/RuleChainMetaData.md @@ -28,6 +28,7 @@ A JSON value representing the rule chain metadata. |------|------|-------------|-------| | id | RuleNodeId | JSON object with the Rule Node Id. Specify this field to update the Rule Node. Referencing non-existing Rule Node Id will cause error. Omit this field to create new rule node. | [optional] | | createdTime | Long | Timestamp of the rule node creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the rule node. May include: 'layoutX' (number, X coordinate for visualization), 'layoutY' (number, Y coordinate for visualization), 'description' (string). | [optional] | | ruleChainId | RuleChainId | JSON object with the Rule Chain Id. | [optional] [readonly] | | type | String | Full Java Class Name of the rule node implementation. | [optional] | | name | String | User defined name of the rule node. Used on UI and for logging. | [optional] | @@ -37,7 +38,6 @@ A JSON value representing the rule chain metadata. | configurationVersion | Integer | Version of rule node configuration. | [optional] | | _configuration | com.fasterxml.jackson.databind.JsonNode | JSON with the rule node configuration. Structure depends on the rule node implementation. | [optional] | | externalId | RuleNodeId | | [optional] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the rule node. May include: 'layoutX' (number, X coordinate for visualization), 'layoutY' (number, Y coordinate for visualization), 'description' (string). | [optional] | | debugMode | Boolean | | [optional] | #### NodeConnectionInfo diff --git a/ce/docs/RuleNode.md b/ce/docs/RuleNode.md index a1197be2..e8d7db7c 100644 --- a/ce/docs/RuleNode.md +++ b/ce/docs/RuleNode.md @@ -9,6 +9,7 @@ |------------ | ------------- | ------------- | -------------| | **id** | **RuleNodeId** | JSON object with the Rule Node Id. Specify this field to update the Rule Node. Referencing non-existing Rule Node Id will cause error. Omit this field to create new rule node. | [optional] | | **createdTime** | **Long** | Timestamp of the rule node creation, in milliseconds | [optional] [readonly] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the rule node. May include: 'layoutX' (number, X coordinate for visualization), 'layoutY' (number, Y coordinate for visualization), 'description' (string). | [optional] | | **ruleChainId** | **RuleChainId** | JSON object with the Rule Chain Id. | [optional] [readonly] | | **type** | **String** | Full Java Class Name of the rule node implementation. | [optional] | | **name** | **String** | User defined name of the rule node. Used on UI and for logging. | [optional] | @@ -18,7 +19,6 @@ | **configurationVersion** | **Integer** | Version of rule node configuration. | [optional] | | **_configuration** | **com.fasterxml.jackson.databind.JsonNode** | JSON with the rule node configuration. Structure depends on the rule node implementation. | [optional] | | **externalId** | **RuleNodeId** | | [optional] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the rule node. May include: 'layoutX' (number, X coordinate for visualization), 'layoutY' (number, Y coordinate for visualization), 'description' (string). | [optional] | | **debugMode** | **Boolean** | | [optional] | diff --git a/ce/docs/SaveDeviceWithCredentialsRequest.md b/ce/docs/SaveDeviceWithCredentialsRequest.md index 9b01442a..1bbd0674 100644 --- a/ce/docs/SaveDeviceWithCredentialsRequest.md +++ b/ce/docs/SaveDeviceWithCredentialsRequest.md @@ -23,17 +23,17 @@ The JSON object with device and credentials. See method description above for ex |------|------|-------------|-------| | id | DeviceId | JSON object with the Device Id. Specify this field to update the Device. Referencing non-existing Device Id will cause error. Omit this field to create new Device. | [optional] | | createdTime | Long | Timestamp of the device creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device). | [optional] | | tenantId | TenantId | JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id. | [optional] [readonly] | | customerId | CustomerId | JSON object with Customer Id. Use 'assignDeviceToCustomer' to change the Customer Id. | [optional] [readonly] | | name | String | Unique Device Name in scope of Tenant | | | type | String | Device Profile Name | [optional] | | label | String | Label that may be used in widgets | [optional] | | deviceProfileId | DeviceProfileId | JSON object with Device Profile Id. If not provided, the type will be used to determine the profile. If neither deviceProfileId nor type is specified, the default device profile will be used. | [optional] | +| deviceData | DeviceData | JSON object with content specific to type of transport in the device profile. | [optional] | | firmwareId | OtaPackageId | JSON object with Ota Package Id. | [optional] | | softwareId | OtaPackageId | JSON object with Ota Package Id. | [optional] | | version | Long | | [optional] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device). | [optional] | -| deviceData | DeviceData | JSON object with content specific to type of transport in the device profile. | [optional] | #### DeviceCredentials | Name | Type | Description | Notes | diff --git a/ce/docs/SaveOtaPackageInfoRequest.md b/ce/docs/SaveOtaPackageInfoRequest.md index eb88cd03..1fcf030d 100644 --- a/ce/docs/SaveOtaPackageInfoRequest.md +++ b/ce/docs/SaveOtaPackageInfoRequest.md @@ -11,6 +11,7 @@ A JSON value representing the OTA Package. |------------ | ------------- | ------------- | -------------| | **id** | **OtaPackageId** | JSON object with the ota package Id. Specify existing ota package Id to update the ota package. Referencing non-existing ota package id will cause error. Omit this field to create new ota package. | [optional] | | **createdTime** | **Long** | Timestamp of the ota package creation, in milliseconds | [optional] [readonly] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | OTA Package description. | [optional] | | **tenantId** | **TenantId** | JSON object with Tenant Id. Tenant Id of the ota package can't be changed. | [optional] [readonly] | | **deviceProfileId** | **DeviceProfileId** | JSON object with Device Profile Id. Device Profile Id of the ota package can't be changed. | [optional] | | **type** | **OtaPackageType** | OTA Package type. | [optional] | @@ -25,7 +26,6 @@ A JSON value representing the OTA Package. | **checksum** | **String** | OTA Package checksum. | [optional] [readonly] | | **dataSize** | **Long** | OTA Package data size. | [optional] [readonly] | | **usesUrl** | **Boolean** | Indicates OTA Package uses url. Should be 'true' if uses url or 'false' if will be used data. | [optional] [readonly] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | OTA Package description. | [optional] | | **name** | **String** | | [optional] [readonly] | diff --git a/ce/docs/AlarmRuleSimpleCondition.md b/ce/docs/SimpleAlarmCondition.md similarity index 78% rename from ce/docs/AlarmRuleSimpleCondition.md rename to ce/docs/SimpleAlarmCondition.md index 91b822cb..a1d713b2 100644 --- a/ce/docs/AlarmRuleSimpleCondition.md +++ b/ce/docs/SimpleAlarmCondition.md @@ -1,9 +1,9 @@ -# AlarmRuleSimpleCondition +# SimpleAlarmCondition -`org.thingsboard.client.model.AlarmRuleSimpleCondition` +`org.thingsboard.client.model.SimpleAlarmCondition` -**Extends:** **AlarmRuleCondition** +**Extends:** **AlarmCondition** ## Properties @@ -14,11 +14,11 @@ ## Referenced Types -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | #### AlarmConditionExpression @@ -29,53 +29,56 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -84,46 +87,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -132,7 +132,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -141,7 +141,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean @@ -150,15 +150,15 @@ | staticValue | Boolean | | [optional] | | dynamicValueArgument | String | | [optional] | +#### TimeUnit (enum) +`NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` + #### AlarmConditionValueLong | Name | Type | Description | Notes | |------|------|-------------|-------| | staticValue | Long | | [optional] | | dynamicValueArgument | String | | [optional] | -#### TimeUnit (enum) -`NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` - --- ### Conventions diff --git a/ce/docs/SimpleAlarmConditionExpression.md b/ce/docs/SimpleAlarmConditionExpression.md index 8c450201..3f59cb1a 100644 --- a/ce/docs/SimpleAlarmConditionExpression.md +++ b/ce/docs/SimpleAlarmConditionExpression.md @@ -9,8 +9,8 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -| **filters** | **List\** | | | -| **operation** | **ComplexOperation** | | [optional] | +| **filters** | **List\** | | | +| **operation** | **AlarmRuleComplexOperation** | | [optional] | @@ -21,17 +21,20 @@ |------|------|-------------|-------| | type | String | | | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -40,38 +43,35 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -80,7 +80,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -89,7 +89,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean @@ -98,15 +98,15 @@ | staticValue | Boolean | | [optional] | | dynamicValueArgument | String | | [optional] | +#### TimeUnit (enum) +`NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` + #### AlarmConditionValueLong | Name | Type | Description | Notes | |------|------|-------------|-------| | staticValue | Long | | [optional] | | dynamicValueArgument | String | | [optional] | -#### TimeUnit (enum) -`NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` - --- ### Conventions diff --git a/ce/docs/AlarmRuleSpecificTimeSchedule.md b/ce/docs/SpecificTimeSchedule.md similarity index 83% rename from ce/docs/AlarmRuleSpecificTimeSchedule.md rename to ce/docs/SpecificTimeSchedule.md index c54e4d20..534762f1 100644 --- a/ce/docs/AlarmRuleSpecificTimeSchedule.md +++ b/ce/docs/SpecificTimeSchedule.md @@ -1,24 +1,24 @@ -# AlarmRuleSpecificTimeSchedule +# SpecificTimeSchedule -`org.thingsboard.client.model.AlarmRuleSpecificTimeSchedule` +`org.thingsboard.client.model.SpecificTimeSchedule` -**Extends:** **AlarmRuleSchedule** +**Extends:** **AlarmSchedule** ## Properties | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| +| **timezone** | **String** | | [optional] | | **daysOfWeek** | **Set\** | | [optional] | -| **endsOn** | **Long** | | [optional] | | **startsOn** | **Long** | | [optional] | -| **timezone** | **String** | | [optional] | +| **endsOn** | **Long** | | [optional] | ## Referenced Types -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | diff --git a/ce/docs/TbResourceExportData.md b/ce/docs/TbResourceExportData.md index b57fd714..d00726f7 100644 --- a/ce/docs/TbResourceExportData.md +++ b/ce/docs/TbResourceExportData.md @@ -96,8 +96,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -201,11 +201,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -341,26 +341,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -391,41 +391,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -442,17 +442,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -461,46 +464,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -509,7 +509,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -518,7 +518,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/Tenant.md b/ce/docs/Tenant.md index 84b3f7db..62731c8f 100644 --- a/ce/docs/Tenant.md +++ b/ce/docs/Tenant.md @@ -11,6 +11,7 @@ A JSON value representing the tenant. |------------ | ------------- | ------------- | -------------| | **id** | **TenantId** | JSON object with the tenant Id. Specify this field to update the tenant. Referencing non-existing tenant Id will cause error. Omit this field to create new tenant. | [optional] | | **createdTime** | **Long** | Timestamp of the tenant creation, in milliseconds | [optional] [readonly] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar). | [optional] | | **country** | **String** | Country | [optional] | | **state** | **String** | State | [optional] | | **city** | **String** | City | [optional] | @@ -23,7 +24,6 @@ A JSON value representing the tenant. | **region** | **String** | Geo region of the tenant | [optional] | | **tenantProfileId** | **TenantProfileId** | JSON object with Tenant Profile Id | [optional] | | **version** | **Long** | | [optional] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar). | [optional] | | **name** | **String** | Name of the tenant. Read-only, duplicated from title for backward compatibility | [optional] [readonly] | diff --git a/ce/docs/TenantInfo.md b/ce/docs/TenantInfo.md index 908a9cd1..41658936 100644 --- a/ce/docs/TenantInfo.md +++ b/ce/docs/TenantInfo.md @@ -9,6 +9,7 @@ |------------ | ------------- | ------------- | -------------| | **id** | **TenantId** | JSON object with the tenant Id. Specify this field to update the tenant. Referencing non-existing tenant Id will cause error. Omit this field to create new tenant. | [optional] | | **createdTime** | **Long** | Timestamp of the tenant creation, in milliseconds | [optional] [readonly] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar). | [optional] | | **country** | **String** | Country | [optional] | | **state** | **String** | State | [optional] | | **city** | **String** | City | [optional] | @@ -22,7 +23,6 @@ | **tenantProfileId** | **TenantProfileId** | JSON object with Tenant Profile Id | [optional] | | **version** | **Long** | | [optional] | | **tenantProfileName** | **String** | Tenant Profile name | [optional] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar). | [optional] | | **name** | **String** | Name of the tenant. Read-only, duplicated from title for backward compatibility | [optional] [readonly] | diff --git a/ce/docs/User.md b/ce/docs/User.md index b9ac9bb1..d03fa4eb 100644 --- a/ce/docs/User.md +++ b/ce/docs/User.md @@ -11,6 +11,7 @@ A JSON value representing the User. |------------ | ------------- | ------------- | -------------| | **id** | **UserId** | JSON object with the User Id. Specify this field to update the device. Referencing non-existing User Id will cause error. Omit this field to create new customer. | [optional] | | **createdTime** | **Long** | Timestamp of the user creation, in milliseconds | [optional] [readonly] | +| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the user. May include: 'defaultDashboardId' (string, UUID of the default dashboard), 'defaultDashboardFullscreen' (boolean), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean), 'lang' (string, user locale, e.g. 'en_US'), 'authProviderName' (string, name of the authentication provider). | [optional] | | **tenantId** | **TenantId** | JSON object with the Tenant Id. | [optional] | | **customerId** | **CustomerId** | JSON object with the Customer Id. | [optional] | | **email** | **String** | Email of the user | | @@ -19,7 +20,6 @@ A JSON value representing the User. | **lastName** | **String** | Last name of the user | [optional] | | **phone** | **String** | Phone number of the user | [optional] | | **version** | **Long** | | [optional] | -| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the user. May include: 'defaultDashboardId' (string, UUID of the default dashboard), 'defaultDashboardFullscreen' (boolean), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean), 'lang' (string, user locale, e.g. 'en_US'), 'authProviderName' (string, name of the authentication provider). | [optional] | | **name** | **String** | Duplicates the email of the user, readonly | [optional] [readonly] | diff --git a/ce/docs/UserMobileInfo.md b/ce/docs/UserMobileInfo.md index 4854f89c..3f550849 100644 --- a/ce/docs/UserMobileInfo.md +++ b/ce/docs/UserMobileInfo.md @@ -24,6 +24,7 @@ |------|------|-------------|-------| | id | UserId | JSON object with the User Id. Specify this field to update the device. Referencing non-existing User Id will cause error. Omit this field to create new customer. | [optional] | | createdTime | Long | Timestamp of the user creation, in milliseconds | [optional] [readonly] | +| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the user. May include: 'defaultDashboardId' (string, UUID of the default dashboard), 'defaultDashboardFullscreen' (boolean), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean), 'lang' (string, user locale, e.g. 'en_US'), 'authProviderName' (string, name of the authentication provider). | [optional] | | tenantId | TenantId | JSON object with the Tenant Id. | [optional] | | customerId | CustomerId | JSON object with the Customer Id. | [optional] | | email | String | Email of the user | | @@ -32,7 +33,6 @@ | lastName | String | Last name of the user | [optional] | | phone | String | Phone number of the user | [optional] | | version | Long | | [optional] | -| additionalInfo | com.fasterxml.jackson.databind.JsonNode | Additional parameters of the user. May include: 'defaultDashboardId' (string, UUID of the default dashboard), 'defaultDashboardFullscreen' (boolean), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean), 'lang' (string, user locale, e.g. 'en_US'), 'authProviderName' (string, name of the authentication provider). | [optional] | | name | String | Duplicates the email of the user, readonly | [optional] [readonly] | #### StoreInfo diff --git a/ce/docs/WidgetTypeExportData.md b/ce/docs/WidgetTypeExportData.md index a5d00dfd..0b02a0ab 100644 --- a/ce/docs/WidgetTypeExportData.md +++ b/ce/docs/WidgetTypeExportData.md @@ -96,8 +96,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -201,11 +201,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -341,26 +341,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -391,41 +391,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -442,17 +442,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -461,46 +464,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -509,7 +509,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -518,7 +518,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/docs/WidgetsBundleExportData.md b/ce/docs/WidgetsBundleExportData.md index ff9de28f..165f59db 100644 --- a/ce/docs/WidgetsBundleExportData.md +++ b/ce/docs/WidgetsBundleExportData.md @@ -98,8 +98,8 @@ | Name | Type | Description | Notes | |------|------|-------------|-------| | arguments | Map | | | -| createRules | Map | | | -| clearRule | AlarmRuleDefinition | | [optional] | +| createRules | Map | | | +| clearRule | AlarmRule | | [optional] | | propagate | Boolean | | [optional] | | propagateToOwner | Boolean | | [optional] | | propagateToTenant | Boolean | | [optional] | @@ -203,11 +203,11 @@ | relationType | String | | [optional] | | direction | EntitySearchDirection | | [optional] | -#### AlarmRuleDefinition +#### AlarmRule | Name | Type | Description | Notes | |------|------|-------------|-------| +| condition | AlarmCondition | | | | alarmDetails | String | | [optional] | -| condition | AlarmRuleCondition | | | | dashboardId | DashboardId | | [optional] | #### RelationPathLevel @@ -343,26 +343,26 @@ #### EntitySearchDirection (enum) `FROM` | `TO` -#### AlarmRuleCondition +#### AlarmCondition | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | AlarmConditionExpression | | | -| schedule | AlarmConditionValueAlarmRuleSchedule | | [optional] | +| schedule | AlarmConditionValueAlarmSchedule | | [optional] | | type | String | | | -#### AlarmRuleDurationCondition *(extends AlarmRuleCondition, type=`DURATION`)* +#### DurationAlarmCondition *(extends AlarmCondition, type=`DURATION`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | unit | TimeUnit | | | | value | AlarmConditionValueLong | | | -#### AlarmRuleRepeatingCondition *(extends AlarmRuleCondition, type=`REPEATING`)* +#### RepeatingAlarmCondition *(extends AlarmCondition, type=`REPEATING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | count | AlarmConditionValueInteger | | | -#### AlarmRuleSimpleCondition *(extends AlarmRuleCondition, type=`SIMPLE`)* -*See AlarmRuleCondition for properties.* +#### SimpleAlarmCondition *(extends AlarmCondition, type=`SIMPLE`)* +*See AlarmCondition for properties.* #### AggFunction (enum) `MIN` | `MAX` | `SUM` | `AVG` | `COUNT` | `COUNT_UNIQUE` @@ -393,41 +393,41 @@ #### SimpleAlarmConditionExpression *(extends AlarmConditionExpression, type=`SIMPLE`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| filters | List | | | -| operation | ComplexOperation | | [optional] | +| filters | List | | | +| operation | AlarmRuleComplexOperation | | [optional] | #### TbelAlarmConditionExpression *(extends AlarmConditionExpression, type=`TBEL`)* | Name | Type | Description | Notes | |------|------|-------------|-------| | expression | String | | | -#### AlarmConditionValueAlarmRuleSchedule +#### AlarmConditionValueAlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| +| staticValue | AlarmSchedule | | [optional] | | dynamicValueArgument | String | | [optional] | -| staticValue | AlarmRuleSchedule | | [optional] | -#### AlarmRuleSchedule +#### AlarmSchedule | Name | Type | Description | Notes | |------|------|-------------|-------| | type | String | | | -#### AlarmRuleAnyTimeSchedule *(extends AlarmRuleSchedule, type=`ANY_TIME`)* -*See AlarmRuleSchedule for properties.* +#### AnyTimeSchedule *(extends AlarmSchedule, type=`ANY_TIME`)* +*See AlarmSchedule for properties.* -#### AlarmRuleCustomTimeSchedule *(extends AlarmRuleSchedule, type=`CUSTOM`)* +#### CustomTimeSchedule *(extends AlarmSchedule, type=`CUSTOM`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| items | List | | [optional] | | timezone | String | | [optional] | +| items | List | | [optional] | -#### AlarmRuleSpecificTimeSchedule *(extends AlarmRuleSchedule, type=`SPECIFIC_TIME`)* +#### SpecificTimeSchedule *(extends AlarmSchedule, type=`SPECIFIC_TIME`)* | Name | Type | Description | Notes | |------|------|-------------|-------| +| timezone | String | | [optional] | | daysOfWeek | Set | | [optional] | -| endsOn | Long | | [optional] | | startsOn | Long | | [optional] | -| timezone | String | | [optional] | +| endsOn | Long | | [optional] | #### TimeUnit (enum) `NANOSECONDS` | `MICROSECONDS` | `MILLISECONDS` | `SECONDS` | `MINUTES` | `HOURS` | `DAYS` @@ -444,17 +444,20 @@ | staticValue | Integer | | [optional] | | dynamicValueArgument | String | | [optional] | -#### AlarmRuleConditionFilter +#### AlarmConditionFilter | Name | Type | Description | Notes | |------|------|-------------|-------| | argument | String | | | -| operation | ComplexOperation | | [optional] | -| predicates | List | | | | valueType | EntityKeyValueType | | | +| operation | AlarmRuleComplexOperation | | [optional] | +| predicates | List | | | -#### ComplexOperation (enum) +#### AlarmRuleComplexOperation (enum) `AND` | `OR` +#### EntityKeyValueType (enum) +`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` + #### AlarmRuleKeyFilterPredicate | Name | Type | Description | Notes | |------|------|-------------|-------| @@ -463,46 +466,43 @@ #### AlarmRuleBooleanFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`BOOLEAN`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | BooleanOperation | | | +| operation | AlarmRuleBooleanOperation | | | | value | AlarmConditionValueBoolean | | | #### AlarmRuleComplexFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`COMPLEX`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | ComplexOperation | | [optional] | +| operation | AlarmRuleComplexOperation | | [optional] | | predicates | List | | [optional] | -#### AlarmRuleNoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* +#### NoDataFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NO_DATA`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| duration | AlarmConditionValueLong | | | | unit | TimeUnit | | | +| duration | AlarmConditionValueLong | | | #### AlarmRuleNumericFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`NUMERIC`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| operation | NumericOperation | | | +| operation | AlarmRuleNumericOperation | | | | value | AlarmConditionValueDouble | | | #### AlarmRuleStringFilterPredicate *(extends AlarmRuleKeyFilterPredicate, type=`STRING`)* | Name | Type | Description | Notes | |------|------|-------------|-------| -| ignoreCase | Boolean | | [optional] | -| operation | StringOperation | | | +| operation | AlarmRuleStringOperation | | | | value | AlarmConditionValueString | | | +| ignoreCase | Boolean | | [optional] | -#### EntityKeyValueType (enum) -`STRING` | `NUMERIC` | `BOOLEAN` | `DATE_TIME` - -#### AlarmRuleCustomTimeScheduleItem +#### CustomTimeScheduleItem | Name | Type | Description | Notes | |------|------|-------------|-------| -| dayOfWeek | Integer | | [optional] | | enabled | Boolean | | [optional] | -| endsOn | Long | | [optional] | +| dayOfWeek | Integer | | [optional] | | startsOn | Long | | [optional] | +| endsOn | Long | | [optional] | -#### StringOperation (enum) +#### AlarmRuleStringOperation (enum) `EQUAL` | `NOT_EQUAL` | `STARTS_WITH` | `ENDS_WITH` | `CONTAINS` | `NOT_CONTAINS` | `IN` | `NOT_IN` #### AlarmConditionValueString @@ -511,7 +511,7 @@ | staticValue | String | | [optional] | | dynamicValueArgument | String | | [optional] | -#### NumericOperation (enum) +#### AlarmRuleNumericOperation (enum) `EQUAL` | `NOT_EQUAL` | `GREATER` | `LESS` | `GREATER_OR_EQUAL` | `LESS_OR_EQUAL` #### AlarmConditionValueDouble @@ -520,7 +520,7 @@ | staticValue | Double | | [optional] | | dynamicValueArgument | String | | [optional] | -#### BooleanOperation (enum) +#### AlarmRuleBooleanOperation (enum) `EQUAL` | `NOT_EQUAL` #### AlarmConditionValueBoolean diff --git a/ce/spec/openapi.json b/ce/spec/openapi.json index 1fe21345..05ff39ba 100644 --- a/ce/spec/openapi.json +++ b/ce/spec/openapi.json @@ -82367,12 +82367,12 @@ "createRules": { "type": "object", "additionalProperties": { - "$ref": "#/components/schemas/AlarmRuleDefinition" + "$ref": "#/components/schemas/AlarmRule" }, "minProperties": 1 }, "clearRule": { - "$ref": "#/components/schemas/AlarmRuleDefinition" + "$ref": "#/components/schemas/AlarmRule" }, "propagate": { "type": "boolean" @@ -82577,6 +82577,32 @@ "OTHER" ] }, + "AlarmCondition": { + "type": "object", + "discriminator": { + "propertyName": "type", + "mapping": { + "SIMPLE": "#/components/schemas/SimpleAlarmCondition", + "DURATION": "#/components/schemas/DurationAlarmCondition", + "REPEATING": "#/components/schemas/RepeatingAlarmCondition" + } + }, + "properties": { + "expression": { + "$ref": "#/components/schemas/AlarmConditionExpression" + }, + "schedule": { + "$ref": "#/components/schemas/AlarmConditionValueAlarmSchedule" + }, + "type": { + "type": "string" + } + }, + "required": [ + "expression", + "type" + ] + }, "AlarmConditionExpression": { "discriminator": { "propertyName": "type", @@ -82594,14 +82620,41 @@ "type" ] }, - "AlarmConditionValueAlarmRuleSchedule": { + "AlarmConditionFilter": { "type": "object", "properties": { - "dynamicValueArgument": { - "type": "string" + "argument": { + "type": "string", + "minLength": 1 + }, + "valueType": { + "$ref": "#/components/schemas/EntityKeyValueType" + }, + "operation": { + "$ref": "#/components/schemas/AlarmRuleComplexOperation" }, + "predicates": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AlarmRuleKeyFilterPredicate" + }, + "minItems": 1 + } + }, + "required": [ + "argument", + "predicates", + "valueType" + ] + }, + "AlarmConditionValueAlarmSchedule": { + "type": "object", + "properties": { "staticValue": { - "$ref": "#/components/schemas/AlarmRuleSchedule" + "$ref": "#/components/schemas/AlarmSchedule" + }, + "dynamicValueArgument": { + "type": "string" } } }, @@ -83171,11 +83224,21 @@ "notifyOn" ] }, - "AlarmRuleAnyTimeSchedule": { - "allOf": [ - { - "$ref": "#/components/schemas/AlarmRuleSchedule" + "AlarmRule": { + "type": "object", + "properties": { + "condition": { + "$ref": "#/components/schemas/AlarmCondition" + }, + "alarmDetails": { + "type": "string" + }, + "dashboardId": { + "$ref": "#/components/schemas/DashboardId" } + }, + "required": [ + "condition" ] }, "AlarmRuleBooleanFilterPredicate": { @@ -83187,7 +83250,7 @@ "type": "object", "properties": { "operation": { - "$ref": "#/components/schemas/BooleanOperation" + "$ref": "#/components/schemas/AlarmRuleBooleanOperation" }, "value": { "$ref": "#/components/schemas/AlarmConditionValueBoolean" @@ -83200,6 +83263,13 @@ "value" ] }, + "AlarmRuleBooleanOperation": { + "type": "string", + "enum": [ + "EQUAL", + "NOT_EQUAL" + ] + }, "AlarmRuleComplexFilterPredicate": { "allOf": [ { @@ -83209,7 +83279,7 @@ "type": "object", "properties": { "operation": { - "$ref": "#/components/schemas/ComplexOperation" + "$ref": "#/components/schemas/AlarmRuleComplexOperation" }, "predicates": { "type": "array", @@ -83221,115 +83291,69 @@ } ] }, - "AlarmRuleCondition": { - "type": "object", - "discriminator": { - "propertyName": "type", - "mapping": { - "SIMPLE": "#/components/schemas/AlarmRuleSimpleCondition", - "DURATION": "#/components/schemas/AlarmRuleDurationCondition", - "REPEATING": "#/components/schemas/AlarmRuleRepeatingCondition" - } - }, - "properties": { - "expression": { - "$ref": "#/components/schemas/AlarmConditionExpression" - }, - "schedule": { - "$ref": "#/components/schemas/AlarmConditionValueAlarmRuleSchedule" - }, - "type": { - "type": "string" - } - }, - "required": [ - "expression", - "type" + "AlarmRuleComplexOperation": { + "type": "string", + "enum": [ + "AND", + "OR" ] }, - "AlarmRuleConditionFilter": { + "AlarmRuleDefinition": { "type": "object", "properties": { - "argument": { - "type": "string", - "minLength": 1 + "id": { + "$ref": "#/components/schemas/CalculatedFieldId", + "description": "JSON object with the Alarm Rule Id. Referencing non-existing Alarm Rule Id will cause error." }, - "operation": { - "$ref": "#/components/schemas/ComplexOperation" + "createdTime": { + "type": "integer", + "format": "int64", + "description": "Timestamp of the alarm rule creation, in milliseconds", + "example": 1609459200000, + "readOnly": true }, - "predicates": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AlarmRuleKeyFilterPredicate" - }, - "minItems": 1 + "tenantId": { + "$ref": "#/components/schemas/TenantId" }, - "valueType": { - "$ref": "#/components/schemas/EntityKeyValueType" - } - }, - "required": [ - "argument", - "predicates", - "valueType" - ] - }, - "AlarmRuleCustomTimeSchedule": { - "allOf": [ - { - "$ref": "#/components/schemas/AlarmRuleSchedule" + "entityId": { + "$ref": "#/components/schemas/EntityId" }, - { - "type": "object", - "properties": { - "items": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AlarmRuleCustomTimeScheduleItem" - } - }, - "timezone": { - "type": "string" - } - } - } - ] - }, - "AlarmRuleCustomTimeScheduleItem": { - "type": "object", - "properties": { - "dayOfWeek": { - "type": "integer", - "format": "int32" + "name": { + "type": "string", + "description": "User defined name of the alarm rule." }, - "enabled": { - "type": "boolean" + "debugSettings": { + "$ref": "#/components/schemas/DebugSettings", + "description": "Debug settings object." }, - "endsOn": { + "configurationVersion": { "type": "integer", - "format": "int64" + "format": "int32", + "description": "Version of alarm rule configuration.", + "example": 0 }, - "startsOn": { + "configuration": { + "$ref": "#/components/schemas/AlarmCalculatedFieldConfiguration" + }, + "version": { "type": "integer", "format": "int64" - } - } - }, - "AlarmRuleDefinition": { - "type": "object", - "properties": { - "alarmDetails": { - "type": "string" }, - "condition": { - "$ref": "#/components/schemas/AlarmRuleCondition" + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode", + "description": "Additional parameters of the alarm rule. May include: 'description' (string).", + "example": { + "description": "High temperature alarm rule" + } }, - "dashboardId": { - "$ref": "#/components/schemas/DashboardId" + "debugMode": { + "type": "boolean", + "deprecated": true, + "writeOnly": true } }, "required": [ - "condition" + "configuration" ] }, "AlarmRuleDefinitionInfo": { @@ -83393,28 +83417,6 @@ "configuration" ] }, - "AlarmRuleDurationCondition": { - "allOf": [ - { - "$ref": "#/components/schemas/AlarmRuleCondition" - }, - { - "type": "object", - "properties": { - "unit": { - "$ref": "#/components/schemas/TimeUnit" - }, - "value": { - "$ref": "#/components/schemas/AlarmConditionValueLong" - } - } - } - ], - "required": [ - "unit", - "value" - ] - }, "AlarmRuleKeyFilterPredicate": { "description": "Filter predicate for alarm rule key-based filtering", "discriminator": { @@ -83423,7 +83425,7 @@ "STRING": "#/components/schemas/AlarmRuleStringFilterPredicate", "NUMERIC": "#/components/schemas/AlarmRuleNumericFilterPredicate", "BOOLEAN": "#/components/schemas/AlarmRuleBooleanFilterPredicate", - "NO_DATA": "#/components/schemas/AlarmRuleNoDataFilterPredicate", + "NO_DATA": "#/components/schemas/NoDataFilterPredicate", "COMPLEX": "#/components/schemas/AlarmRuleComplexFilterPredicate" } }, @@ -83432,126 +83434,41 @@ "type": "string" } }, - "required": [ - "type" - ] - }, - "AlarmRuleNoDataFilterPredicate": { - "allOf": [ - { - "$ref": "#/components/schemas/AlarmRuleKeyFilterPredicate" - }, - { - "type": "object", - "properties": { - "duration": { - "$ref": "#/components/schemas/AlarmConditionValueLong" - }, - "unit": { - "$ref": "#/components/schemas/TimeUnit" - } - } - } - ], - "required": [ - "duration", - "unit" - ] - }, - "AlarmRuleNumericFilterPredicate": { - "allOf": [ - { - "$ref": "#/components/schemas/AlarmRuleKeyFilterPredicate" - }, - { - "type": "object", - "properties": { - "operation": { - "$ref": "#/components/schemas/NumericOperation" - }, - "value": { - "$ref": "#/components/schemas/AlarmConditionValueDouble" - } - } - } - ], - "required": [ - "operation", - "value" - ] - }, - "AlarmRuleRepeatingCondition": { - "allOf": [ - { - "$ref": "#/components/schemas/AlarmRuleCondition" - }, - { - "type": "object", - "properties": { - "count": { - "$ref": "#/components/schemas/AlarmConditionValueInteger" - } - } - } - ], - "required": [ - "count" - ] - }, - "AlarmRuleSchedule": { - "discriminator": { - "propertyName": "type", - "mapping": { - "ANY_TIME": "#/components/schemas/AlarmRuleAnyTimeSchedule", - "SPECIFIC_TIME": "#/components/schemas/AlarmRuleSpecificTimeSchedule", - "CUSTOM": "#/components/schemas/AlarmRuleCustomTimeSchedule" - } - }, - "properties": { - "type": { - "type": "string" - } - }, - "required": [ - "type" - ] - }, - "AlarmRuleSimpleCondition": { - "allOf": [ - { - "$ref": "#/components/schemas/AlarmRuleCondition" - } - ] - }, - "AlarmRuleSpecificTimeSchedule": { - "allOf": [ - { - "$ref": "#/components/schemas/AlarmRuleSchedule" - }, - { - "type": "object", - "properties": { - "daysOfWeek": { - "type": "array", - "items": { - "type": "integer", - "format": "int32" - }, - "uniqueItems": true - }, - "endsOn": { - "type": "integer", - "format": "int64" - }, - "startsOn": { - "type": "integer", - "format": "int64" + "required": [ + "type" + ] + }, + "AlarmRuleNumericFilterPredicate": { + "allOf": [ + { + "$ref": "#/components/schemas/AlarmRuleKeyFilterPredicate" + }, + { + "type": "object", + "properties": { + "operation": { + "$ref": "#/components/schemas/AlarmRuleNumericOperation" }, - "timezone": { - "type": "string" + "value": { + "$ref": "#/components/schemas/AlarmConditionValueDouble" } } } + ], + "required": [ + "operation", + "value" + ] + }, + "AlarmRuleNumericOperation": { + "type": "string", + "enum": [ + "EQUAL", + "NOT_EQUAL", + "GREATER", + "LESS", + "GREATER_OR_EQUAL", + "LESS_OR_EQUAL" ] }, "AlarmRuleStringFilterPredicate": { @@ -83562,14 +83479,14 @@ { "type": "object", "properties": { - "ignoreCase": { - "type": "boolean" - }, "operation": { - "$ref": "#/components/schemas/StringOperation" + "$ref": "#/components/schemas/AlarmRuleStringOperation" }, "value": { "$ref": "#/components/schemas/AlarmConditionValueString" + }, + "ignoreCase": { + "type": "boolean" } } } @@ -83579,6 +83496,37 @@ "value" ] }, + "AlarmRuleStringOperation": { + "type": "string", + "enum": [ + "EQUAL", + "NOT_EQUAL", + "STARTS_WITH", + "ENDS_WITH", + "CONTAINS", + "NOT_CONTAINS", + "IN", + "NOT_IN" + ] + }, + "AlarmSchedule": { + "discriminator": { + "propertyName": "type", + "mapping": { + "ANY_TIME": "#/components/schemas/AnyTimeSchedule", + "SPECIFIC_TIME": "#/components/schemas/SpecificTimeSchedule", + "CUSTOM": "#/components/schemas/CustomTimeSchedule" + } + }, + "properties": { + "type": { + "type": "string" + } + }, + "required": [ + "type" + ] + }, "AlarmSearchStatus": { "type": "string", "enum": [ @@ -83783,6 +83731,13 @@ "apiKey" ] }, + "AnyTimeSchedule": { + "allOf": [ + { + "$ref": "#/components/schemas/AlarmSchedule" + } + ] + }, "ApiFeature": { "type": "string", "enum": [ @@ -84043,6 +83998,13 @@ "example": 1609459200000, "readOnly": true }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode", + "description": "Additional parameters of the asset. May include: 'description' (string).", + "example": { + "description": "Building A asset" + } + }, "tenantId": { "$ref": "#/components/schemas/TenantId", "description": "JSON object with Tenant Id.", @@ -84075,13 +84037,6 @@ "version": { "type": "integer", "format": "int64" - }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the asset. May include: 'description' (string).", - "example": { - "description": "Building A asset" - } } }, "required": [ @@ -84120,6 +84075,13 @@ "example": 1609459200000, "readOnly": true }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode", + "description": "Additional parameters of the asset. May include: 'description' (string).", + "example": { + "description": "Building A asset" + } + }, "tenantId": { "$ref": "#/components/schemas/TenantId", "description": "JSON object with Tenant Id.", @@ -84167,13 +84129,6 @@ "type": "string", "description": "Name of the corresponding Asset Profile.", "readOnly": true - }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the asset. May include: 'description' (string).", - "example": { - "description": "Building A asset" - } } }, "required": [ @@ -85627,6 +85582,9 @@ "example": "com.mycompany.CustomRuleNode", "readOnly": true }, + "configurationDescriptor": { + "$ref": "#/components/schemas/JsonNode" + }, "configurationVersion": { "type": "integer", "format": "int32", @@ -85643,9 +85601,6 @@ "description": "Indicates that the RuleNode supports queue name configuration.", "example": true, "readOnly": true - }, - "configurationDescriptor": { - "$ref": "#/components/schemas/JsonNode" } } }, @@ -85760,6 +85715,47 @@ } ] }, + "CustomTimeSchedule": { + "allOf": [ + { + "$ref": "#/components/schemas/AlarmSchedule" + }, + { + "type": "object", + "properties": { + "timezone": { + "type": "string" + }, + "items": { + "type": "array", + "items": { + "$ref": "#/components/schemas/CustomTimeScheduleItem" + } + } + } + } + ] + }, + "CustomTimeScheduleItem": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean" + }, + "dayOfWeek": { + "type": "integer", + "format": "int32" + }, + "startsOn": { + "type": "integer", + "format": "int64" + }, + "endsOn": { + "type": "integer", + "format": "int64" + } + } + }, "Customer": { "type": "object", "properties": { @@ -85774,6 +85770,16 @@ "example": 1609459200000, "readOnly": true }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode", + "description": "Additional parameters of the customer. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar), 'isPublic' (boolean, whether this is a public customer).", + "example": { + "description": "Regional customer", + "homeDashboardId": "784f394c-42b6-435a-983c-b7beff2784f9", + "homeDashboardHideToolbar": false, + "isPublic": false + } + }, "country": { "type": "string", "description": "Country", @@ -85826,16 +85832,6 @@ "type": "integer", "format": "int64" }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the customer. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar), 'isPublic' (boolean, whether this is a public customer).", - "example": { - "description": "Regional customer", - "homeDashboardId": "784f394c-42b6-435a-983c-b7beff2784f9", - "homeDashboardHideToolbar": false, - "isPublic": false - } - }, "name": { "type": "string", "description": "Name of the customer. Read-only, duplicated from title for backward compatibility", @@ -86594,6 +86590,15 @@ "example": 1609459200000, "readOnly": true }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode", + "description": "Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device).", + "example": { + "gateway": false, + "description": "Temperature sensor", + "lastConnectedGateway": "784f394c-42b6-435a-983c-b7beff2784f9" + } + }, "tenantId": { "$ref": "#/components/schemas/TenantId", "description": "JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id.", @@ -86623,6 +86628,10 @@ "$ref": "#/components/schemas/DeviceProfileId", "description": "JSON object with Device Profile Id. If not provided, the type will be used to determine the profile. If neither deviceProfileId nor type is specified, the default device profile will be used." }, + "deviceData": { + "$ref": "#/components/schemas/DeviceData", + "description": "JSON object with content specific to type of transport in the device profile." + }, "firmwareId": { "$ref": "#/components/schemas/OtaPackageId", "description": "JSON object with Ota Package Id." @@ -86634,19 +86643,6 @@ "version": { "type": "integer", "format": "int64" - }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device).", - "example": { - "gateway": false, - "description": "Temperature sensor", - "lastConnectedGateway": "784f394c-42b6-435a-983c-b7beff2784f9" - } - }, - "deviceData": { - "$ref": "#/components/schemas/DeviceData", - "description": "JSON object with content specific to type of transport in the device profile." } }, "required": [ @@ -86868,6 +86864,15 @@ "example": 1609459200000, "readOnly": true }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode", + "description": "Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device).", + "example": { + "gateway": false, + "description": "Temperature sensor", + "lastConnectedGateway": "784f394c-42b6-435a-983c-b7beff2784f9" + } + }, "tenantId": { "$ref": "#/components/schemas/TenantId", "description": "JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id.", @@ -86897,6 +86902,10 @@ "$ref": "#/components/schemas/DeviceProfileId", "description": "JSON object with Device Profile Id. If not provided, the type will be used to determine the profile. If neither deviceProfileId nor type is specified, the default device profile will be used." }, + "deviceData": { + "$ref": "#/components/schemas/DeviceData", + "description": "JSON object with content specific to type of transport in the device profile." + }, "firmwareId": { "$ref": "#/components/schemas/OtaPackageId", "description": "JSON object with Ota Package Id." @@ -86928,19 +86937,6 @@ "type": "boolean", "description": "Device active flag.", "readOnly": true - }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device).", - "example": { - "gateway": false, - "description": "Temperature sensor", - "lastConnectedGateway": "784f394c-42b6-435a-983c-b7beff2784f9" - } - }, - "deviceData": { - "$ref": "#/components/schemas/DeviceData", - "description": "JSON object with content specific to type of transport in the device profile." } }, "required": [ @@ -87004,6 +87000,10 @@ "type": "string", "description": "Rule engine queue name. If present, the specified queue will be used to store all unprocessed messages related to device, including telemetry, attribute updates, etc. Otherwise, the 'Main' queue will be used to store those messages." }, + "profileData": { + "$ref": "#/components/schemas/DeviceProfileData", + "description": "Complex JSON object that includes addition device profile configuration (transport, alarm rules, etc)." + }, "provisionDeviceKey": { "type": "string", "description": "Unique provisioning key used by 'Device Provisioning' feature." @@ -87027,10 +87027,6 @@ "default": { "type": "boolean", "description": "Used to mark the default profile. Default profile is used when the device profile is not specified during device creation." - }, - "profileData": { - "$ref": "#/components/schemas/DeviceProfileData", - "description": "Complex JSON object that includes addition device profile configuration (transport, alarm rules, etc)." } } }, @@ -87489,6 +87485,28 @@ } ] }, + "DurationAlarmCondition": { + "allOf": [ + { + "$ref": "#/components/schemas/AlarmCondition" + }, + { + "type": "object", + "properties": { + "unit": { + "$ref": "#/components/schemas/TimeUnit" + }, + "value": { + "$ref": "#/components/schemas/AlarmConditionValueLong" + } + } + } + ], + "required": [ + "unit", + "value" + ] + }, "DynamicValueBoolean": { "type": "object", "properties": { @@ -87565,6 +87583,13 @@ "example": 1609459200000, "readOnly": true }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode", + "description": "Additional parameters of the edge. May include: 'description' (string).", + "example": { + "description": "Edge at location A" + } + }, "tenantId": { "$ref": "#/components/schemas/TenantId", "description": "JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id.", @@ -87606,13 +87631,6 @@ "version": { "type": "integer", "format": "int64" - }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the edge. May include: 'description' (string).", - "example": { - "description": "Edge at location A" - } } }, "required": [ @@ -87867,6 +87885,13 @@ "example": 1609459200000, "readOnly": true }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode", + "description": "Additional parameters of the edge. May include: 'description' (string).", + "example": { + "description": "Edge at location A" + } + }, "tenantId": { "$ref": "#/components/schemas/TenantId", "description": "JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id.", @@ -87914,13 +87939,6 @@ }, "customerIsPublic": { "type": "boolean" - }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the edge. May include: 'description' (string).", - "example": { - "description": "Edge at location A" - } } }, "required": [ @@ -88742,6 +88760,13 @@ "type": "integer", "format": "int64" }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode", + "description": "Additional parameters of the relation.", + "example": { + "description": "Power supply connection" + } + }, "fromName": { "type": "string", "description": "Name of the entity for [from] direction.", @@ -88753,13 +88778,6 @@ "description": "Name of the entity for [to] direction.", "example": "A4B72CCDFF35", "readOnly": true - }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the relation.", - "example": { - "description": "Power supply connection" - } } }, "required": [ @@ -88990,6 +89008,13 @@ "example": 1609459200000, "readOnly": true }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode", + "description": "Additional parameters of the entity view. May include: 'description' (string).", + "example": { + "description": "Temperature readings view" + } + }, "entityId": { "$ref": "#/components/schemas/EntityId", "description": "JSON object with the referenced Entity Id (Device or Asset)." @@ -89031,13 +89056,6 @@ "version": { "type": "integer", "format": "int64" - }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the entity view. May include: 'description' (string).", - "example": { - "description": "Temperature readings view" - } } }, "required": [ @@ -89078,6 +89096,13 @@ "example": 1609459200000, "readOnly": true }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode", + "description": "Additional parameters of the entity view. May include: 'description' (string).", + "example": { + "description": "Temperature readings view" + } + }, "entityId": { "$ref": "#/components/schemas/EntityId", "description": "JSON object with the referenced Entity Id (Device or Asset)." @@ -89129,13 +89154,6 @@ "type": "boolean", "description": "Indicates special 'Public' Customer that is auto-generated to use the entity view on public dashboards.", "readOnly": true - }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the entity view. May include: 'description' (string).", - "example": { - "description": "Temperature readings view" - } } }, "required": [ @@ -91174,6 +91192,28 @@ "targets" ] }, + "NoDataFilterPredicate": { + "allOf": [ + { + "$ref": "#/components/schemas/AlarmRuleKeyFilterPredicate" + }, + { + "type": "object", + "properties": { + "unit": { + "$ref": "#/components/schemas/TimeUnit" + }, + "duration": { + "$ref": "#/components/schemas/AlarmConditionValueLong" + } + } + } + ], + "required": [ + "duration", + "unit" + ] + }, "NoSecLwM2MBootstrapServerCredential": { "allOf": [ { @@ -92266,6 +92306,9 @@ "example": 1746028547220, "readOnly": true }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode" + }, "providerId": { "type": "string", "description": "OAuth2 provider identifier (e.g. its name)" @@ -92321,9 +92364,6 @@ "type": "string", "description": "Help link for OAuth2 provider" }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode" - }, "name": { "type": "string" } @@ -92661,6 +92701,11 @@ "example": 1609459200000, "readOnly": true }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode", + "description": "OTA Package description.", + "example": "Description for the OTA Package fw_1.0" + }, "tenantId": { "$ref": "#/components/schemas/TenantId", "description": "JSON object with Tenant Id. Tenant Id of the ota package can't be changed.", @@ -92733,11 +92778,6 @@ "example": 8, "readOnly": true }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode", - "description": "OTA Package description.", - "example": "Description for the OTA Package fw_1.0" - }, "data": { "type": "string", "format": "byte" @@ -92780,6 +92820,11 @@ "example": 1609459200000, "readOnly": true }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode", + "description": "OTA Package description.", + "example": "Description for the OTA Package fw_1.0" + }, "tenantId": { "$ref": "#/components/schemas/TenantId", "description": "JSON object with Tenant Id. Tenant Id of the ota package can't be changed.", @@ -92852,11 +92897,6 @@ "example": 8, "readOnly": true }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode", - "description": "OTA Package description.", - "example": "Description for the OTA Package fw_1.0" - }, "name": { "type": "string", "readOnly": true @@ -94959,6 +94999,9 @@ "example": 1746028547220, "readOnly": true }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode" + }, "tenantId": { "$ref": "#/components/schemas/TenantId" }, @@ -94988,9 +95031,6 @@ }, "processingStrategy": { "$ref": "#/components/schemas/ProcessingStrategy" - }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode" } } }, @@ -95386,6 +95426,24 @@ } } }, + "RepeatingAlarmCondition": { + "allOf": [ + { + "$ref": "#/components/schemas/AlarmCondition" + }, + { + "type": "object", + "properties": { + "count": { + "$ref": "#/components/schemas/AlarmConditionValueInteger" + } + } + } + ], + "required": [ + "count" + ] + }, "RepositoryAuthMethod": { "type": "string", "enum": [ @@ -95671,6 +95729,9 @@ "example": 1609459200000, "readOnly": true }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode" + }, "tenantId": { "$ref": "#/components/schemas/TenantId", "description": "JSON object with Tenant Id.", @@ -95698,15 +95759,12 @@ "type": "boolean", "description": "Reserved for future usage." }, + "configuration": { + "$ref": "#/components/schemas/JsonNode" + }, "version": { "type": "integer", "format": "int64" - }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode" - }, - "configuration": { - "$ref": "#/components/schemas/JsonNode" } }, "required": [ @@ -96083,6 +96141,15 @@ "example": 1609459200000, "readOnly": true }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode", + "description": "Additional parameters of the rule node. May include: 'layoutX' (number, X coordinate for visualization), 'layoutY' (number, Y coordinate for visualization), 'description' (string).", + "example": { + "layoutX": 320, + "layoutY": 160, + "description": "Filter temperature data" + } + }, "ruleChainId": { "$ref": "#/components/schemas/RuleChainId", "description": "JSON object with the Rule Chain Id. ", @@ -96125,15 +96192,6 @@ "externalId": { "$ref": "#/components/schemas/RuleNodeId" }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the rule node. May include: 'layoutX' (number, X coordinate for visualization), 'layoutY' (number, Y coordinate for visualization), 'description' (string).", - "example": { - "layoutX": 320, - "layoutY": 160, - "description": "Filter temperature data" - } - }, "debugMode": { "type": "boolean", "deprecated": true, @@ -96260,6 +96318,11 @@ "example": 1609459200000, "readOnly": true }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode", + "description": "OTA Package description.", + "example": "Description for the OTA Package fw_1.0" + }, "tenantId": { "$ref": "#/components/schemas/TenantId", "description": "JSON object with Tenant Id. Tenant Id of the ota package can't be changed.", @@ -96338,11 +96401,6 @@ "example": true, "readOnly": true }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode", - "description": "OTA Package description.", - "example": "Description for the OTA Package fw_1.0" - }, "name": { "type": "string", "readOnly": true @@ -96458,6 +96516,13 @@ } } }, + "SimpleAlarmCondition": { + "allOf": [ + { + "$ref": "#/components/schemas/AlarmCondition" + } + ] + }, "SimpleAlarmConditionExpression": { "allOf": [ { @@ -96469,12 +96534,12 @@ "filters": { "type": "array", "items": { - "$ref": "#/components/schemas/AlarmRuleConditionFilter" + "$ref": "#/components/schemas/AlarmConditionFilter" }, "minItems": 1 }, "operation": { - "$ref": "#/components/schemas/ComplexOperation" + "$ref": "#/components/schemas/AlarmRuleComplexOperation" } } } @@ -96946,6 +97011,37 @@ "V3" ] }, + "SpecificTimeSchedule": { + "allOf": [ + { + "$ref": "#/components/schemas/AlarmSchedule" + }, + { + "type": "object", + "properties": { + "timezone": { + "type": "string" + }, + "daysOfWeek": { + "type": "array", + "items": { + "type": "integer", + "format": "int32" + }, + "uniqueItems": true + }, + "startsOn": { + "type": "integer", + "format": "int64" + }, + "endsOn": { + "type": "integer", + "format": "int64" + } + } + } + ] + }, "StarredDashboardInfo": { "type": "object", "properties": { @@ -97672,6 +97768,15 @@ "example": 1609459200000, "readOnly": true }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode", + "description": "Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar).", + "example": { + "description": "Main tenant", + "homeDashboardId": "784f394c-42b6-435a-983c-b7beff2784f9", + "homeDashboardHideToolbar": true + } + }, "country": { "type": "string", "description": "Country", @@ -97729,15 +97834,6 @@ "type": "integer", "format": "int64" }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar).", - "example": { - "description": "Main tenant", - "homeDashboardId": "784f394c-42b6-435a-983c-b7beff2784f9", - "homeDashboardHideToolbar": true - } - }, "name": { "type": "string", "description": "Name of the tenant. Read-only, duplicated from title for backward compatibility", @@ -97802,6 +97898,15 @@ "example": 1609459200000, "readOnly": true }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode", + "description": "Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar).", + "example": { + "description": "Main tenant", + "homeDashboardId": "784f394c-42b6-435a-983c-b7beff2784f9", + "homeDashboardHideToolbar": true + } + }, "country": { "type": "string", "description": "Country", @@ -97864,15 +97969,6 @@ "description": "Tenant Profile name", "example": "Default" }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar).", - "example": { - "description": "Main tenant", - "homeDashboardId": "784f394c-42b6-435a-983c-b7beff2784f9", - "homeDashboardHideToolbar": true - } - }, "name": { "type": "string", "description": "Name of the tenant. Read-only, duplicated from title for backward compatibility", @@ -98611,6 +98707,17 @@ "example": 1609459200000, "readOnly": true }, + "additionalInfo": { + "$ref": "#/components/schemas/JsonNode", + "description": "Additional parameters of the user. May include: 'defaultDashboardId' (string, UUID of the default dashboard), 'defaultDashboardFullscreen' (boolean), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean), 'lang' (string, user locale, e.g. 'en_US'), 'authProviderName' (string, name of the authentication provider).", + "example": { + "defaultDashboardId": "784f394c-42b6-435a-983c-b7beff2784f9", + "defaultDashboardFullscreen": false, + "homeDashboardId": "784f394c-42b6-435a-983c-b7beff2784f9", + "homeDashboardHideToolbar": true, + "lang": "en_US" + } + }, "tenantId": { "$ref": "#/components/schemas/TenantId", "description": "JSON object with the Tenant Id." @@ -98648,17 +98755,6 @@ "type": "integer", "format": "int64" }, - "additionalInfo": { - "$ref": "#/components/schemas/JsonNode", - "description": "Additional parameters of the user. May include: 'defaultDashboardId' (string, UUID of the default dashboard), 'defaultDashboardFullscreen' (boolean), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean), 'lang' (string, user locale, e.g. 'en_US'), 'authProviderName' (string, name of the authentication provider).", - "example": { - "defaultDashboardId": "784f394c-42b6-435a-983c-b7beff2784f9", - "defaultDashboardFullscreen": false, - "homeDashboardId": "784f394c-42b6-435a-983c-b7beff2784f9", - "homeDashboardHideToolbar": true, - "lang": "en_US" - } - }, "name": { "type": "string", "description": "Duplicates the email of the user, readonly", diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmCalculatedFieldConfiguration.java b/ce/src/main/java/org/thingsboard/client/model/AlarmCalculatedFieldConfiguration.java index c841f05f..71c15769 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AlarmCalculatedFieldConfiguration.java +++ b/ce/src/main/java/org/thingsboard/client/model/AlarmCalculatedFieldConfiguration.java @@ -37,7 +37,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.thingsboard.client.model.AlarmRuleDefinition; +import org.thingsboard.client.model.AlarmRule; import org.thingsboard.client.model.Argument; import org.thingsboard.client.model.CalculatedFieldConfiguration; import org.thingsboard.client.model.Output; @@ -72,11 +72,11 @@ public class AlarmCalculatedFieldConfiguration extends CalculatedFieldConfigurat public static final String JSON_PROPERTY_CREATE_RULES = "createRules"; @Nonnull - private Map createRules = new HashMap<>(); + private Map createRules = new HashMap<>(); public static final String JSON_PROPERTY_CLEAR_RULE = "clearRule"; @Nullable - private AlarmRuleDefinition clearRule; + private AlarmRule clearRule; public static final String JSON_PROPERTY_PROPAGATE = "propagate"; @Nullable @@ -129,12 +129,12 @@ public void setArguments(@Nonnull Map arguments) { } - public AlarmCalculatedFieldConfiguration createRules(@Nonnull Map createRules) { + public AlarmCalculatedFieldConfiguration createRules(@Nonnull Map createRules) { this.createRules = createRules; return this; } - public AlarmCalculatedFieldConfiguration putCreateRulesItem(String key, AlarmRuleDefinition createRulesItem) { + public AlarmCalculatedFieldConfiguration putCreateRulesItem(String key, AlarmRule createRulesItem) { if (this.createRules == null) { this.createRules = new HashMap<>(); } @@ -149,19 +149,19 @@ public AlarmCalculatedFieldConfiguration putCreateRulesItem(String key, AlarmRul @Nonnull @JsonProperty(value = JSON_PROPERTY_CREATE_RULES, required = true) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public Map getCreateRules() { + public Map getCreateRules() { return createRules; } @JsonProperty(value = JSON_PROPERTY_CREATE_RULES, required = true) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setCreateRules(@Nonnull Map createRules) { + public void setCreateRules(@Nonnull Map createRules) { this.createRules = createRules; } - public AlarmCalculatedFieldConfiguration clearRule(@Nullable AlarmRuleDefinition clearRule) { + public AlarmCalculatedFieldConfiguration clearRule(@Nullable AlarmRule clearRule) { this.clearRule = clearRule; return this; } @@ -173,14 +173,14 @@ public AlarmCalculatedFieldConfiguration clearRule(@Nullable AlarmRuleDefinition @Nullable @JsonProperty(value = JSON_PROPERTY_CLEAR_RULE, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public AlarmRuleDefinition getClearRule() { + public AlarmRule getClearRule() { return clearRule; } @JsonProperty(value = JSON_PROPERTY_CLEAR_RULE, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setClearRule(@Nullable AlarmRuleDefinition clearRule) { + public void setClearRule(@Nullable AlarmRule clearRule) { this.clearRule = clearRule; } diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleCondition.java b/ce/src/main/java/org/thingsboard/client/model/AlarmCondition.java similarity index 78% rename from ce/src/main/java/org/thingsboard/client/model/AlarmRuleCondition.java rename to ce/src/main/java/org/thingsboard/client/model/AlarmCondition.java index 685599a5..3ad5f169 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleCondition.java +++ b/ce/src/main/java/org/thingsboard/client/model/AlarmCondition.java @@ -34,19 +34,19 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import org.thingsboard.client.model.AlarmConditionExpression; -import org.thingsboard.client.model.AlarmConditionValueAlarmRuleSchedule; +import org.thingsboard.client.model.AlarmConditionValueAlarmSchedule; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.thingsboard.client.JSON; import org.thingsboard.client.ApiClient; /** - * AlarmRuleCondition + * AlarmCondition */ @JsonPropertyOrder({ - AlarmRuleCondition.JSON_PROPERTY_EXPRESSION, - AlarmRuleCondition.JSON_PROPERTY_SCHEDULE, - AlarmRuleCondition.JSON_PROPERTY_TYPE + AlarmCondition.JSON_PROPERTY_EXPRESSION, + AlarmCondition.JSON_PROPERTY_SCHEDULE, + AlarmCondition.JSON_PROPERTY_TYPE }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @JsonIgnoreProperties( @@ -55,28 +55,28 @@ ) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = true) @JsonSubTypes({ - @JsonSubTypes.Type(value = AlarmRuleDurationCondition.class, name = "DURATION"), - @JsonSubTypes.Type(value = AlarmRuleRepeatingCondition.class, name = "REPEATING"), - @JsonSubTypes.Type(value = AlarmRuleSimpleCondition.class, name = "SIMPLE"), + @JsonSubTypes.Type(value = DurationAlarmCondition.class, name = "DURATION"), + @JsonSubTypes.Type(value = RepeatingAlarmCondition.class, name = "REPEATING"), + @JsonSubTypes.Type(value = SimpleAlarmCondition.class, name = "SIMPLE"), }) -public class AlarmRuleCondition { +public class AlarmCondition { public static final String JSON_PROPERTY_EXPRESSION = "expression"; @Nonnull private AlarmConditionExpression expression; public static final String JSON_PROPERTY_SCHEDULE = "schedule"; @Nullable - private AlarmConditionValueAlarmRuleSchedule schedule; + private AlarmConditionValueAlarmSchedule schedule; public static final String JSON_PROPERTY_TYPE = "type"; @Nonnull private String type; - public AlarmRuleCondition() { + public AlarmCondition() { } - public AlarmRuleCondition expression(@Nonnull AlarmConditionExpression expression) { + public AlarmCondition expression(@Nonnull AlarmConditionExpression expression) { this.expression = expression; return this; } @@ -100,7 +100,7 @@ public void setExpression(@Nonnull AlarmConditionExpression expression) { } - public AlarmRuleCondition schedule(@Nullable AlarmConditionValueAlarmRuleSchedule schedule) { + public AlarmCondition schedule(@Nullable AlarmConditionValueAlarmSchedule schedule) { this.schedule = schedule; return this; } @@ -112,19 +112,19 @@ public AlarmRuleCondition schedule(@Nullable AlarmConditionValueAlarmRuleSchedul @Nullable @JsonProperty(value = JSON_PROPERTY_SCHEDULE, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public AlarmConditionValueAlarmRuleSchedule getSchedule() { + public AlarmConditionValueAlarmSchedule getSchedule() { return schedule; } @JsonProperty(value = JSON_PROPERTY_SCHEDULE, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setSchedule(@Nullable AlarmConditionValueAlarmRuleSchedule schedule) { + public void setSchedule(@Nullable AlarmConditionValueAlarmSchedule schedule) { this.schedule = schedule; } - public AlarmRuleCondition type(@Nonnull String type) { + public AlarmCondition type(@Nonnull String type) { this.type = type; return this; } @@ -149,7 +149,7 @@ public void setType(@Nonnull String type) { /** - * Return true if this AlarmRuleCondition object is equal to o. + * Return true if this AlarmCondition object is equal to o. */ @Override public boolean equals(Object o) { @@ -159,10 +159,10 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - AlarmRuleCondition alarmRuleCondition = (AlarmRuleCondition) o; - return Objects.equals(this.expression, alarmRuleCondition.expression) && - Objects.equals(this.schedule, alarmRuleCondition.schedule) && - Objects.equals(this.type, alarmRuleCondition.type); + AlarmCondition alarmCondition = (AlarmCondition) o; + return Objects.equals(this.expression, alarmCondition.expression) && + Objects.equals(this.schedule, alarmCondition.schedule) && + Objects.equals(this.type, alarmCondition.type); } @Override @@ -173,7 +173,7 @@ public int hashCode() { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class AlarmRuleCondition {\n"); + sb.append("class AlarmCondition {\n"); sb.append(" expression: ").append(toIndentedString(expression)).append("\n"); sb.append(" schedule: ").append(toIndentedString(schedule)).append("\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); @@ -244,11 +244,11 @@ public String toUrlQueryString(String prefix) { static { // Initialize and register the discriminator mappings. Map> mappings = new HashMap>(); - mappings.put("DURATION", AlarmRuleDurationCondition.class); - mappings.put("REPEATING", AlarmRuleRepeatingCondition.class); - mappings.put("SIMPLE", AlarmRuleSimpleCondition.class); - mappings.put("AlarmRuleCondition", AlarmRuleCondition.class); - JSON.registerDiscriminator(AlarmRuleCondition.class, "type", mappings); + mappings.put("DURATION", DurationAlarmCondition.class); + mappings.put("REPEATING", RepeatingAlarmCondition.class); + mappings.put("SIMPLE", SimpleAlarmCondition.class); + mappings.put("AlarmCondition", AlarmCondition.class); + JSON.registerDiscriminator(AlarmCondition.class, "type", mappings); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleConditionFilter.java b/ce/src/main/java/org/thingsboard/client/model/AlarmConditionFilter.java similarity index 82% rename from ce/src/main/java/org/thingsboard/client/model/AlarmRuleConditionFilter.java rename to ce/src/main/java/org/thingsboard/client/model/AlarmConditionFilter.java index 6af9fc70..ea8f7316 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleConditionFilter.java +++ b/ce/src/main/java/org/thingsboard/client/model/AlarmConditionFilter.java @@ -32,44 +32,44 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.thingsboard.client.model.AlarmRuleComplexOperation; import org.thingsboard.client.model.AlarmRuleKeyFilterPredicate; -import org.thingsboard.client.model.ComplexOperation; import org.thingsboard.client.model.EntityKeyValueType; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.thingsboard.client.ApiClient; /** - * AlarmRuleConditionFilter + * AlarmConditionFilter */ @JsonPropertyOrder({ - AlarmRuleConditionFilter.JSON_PROPERTY_ARGUMENT, - AlarmRuleConditionFilter.JSON_PROPERTY_OPERATION, - AlarmRuleConditionFilter.JSON_PROPERTY_PREDICATES, - AlarmRuleConditionFilter.JSON_PROPERTY_VALUE_TYPE + AlarmConditionFilter.JSON_PROPERTY_ARGUMENT, + AlarmConditionFilter.JSON_PROPERTY_VALUE_TYPE, + AlarmConditionFilter.JSON_PROPERTY_OPERATION, + AlarmConditionFilter.JSON_PROPERTY_PREDICATES }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") -public class AlarmRuleConditionFilter { +public class AlarmConditionFilter { public static final String JSON_PROPERTY_ARGUMENT = "argument"; @Nonnull private String argument; + public static final String JSON_PROPERTY_VALUE_TYPE = "valueType"; + @Nonnull + private EntityKeyValueType valueType; + public static final String JSON_PROPERTY_OPERATION = "operation"; @Nullable - private ComplexOperation operation; + private AlarmRuleComplexOperation operation; public static final String JSON_PROPERTY_PREDICATES = "predicates"; @Nonnull private List predicates = new ArrayList<>(); - public static final String JSON_PROPERTY_VALUE_TYPE = "valueType"; - @Nonnull - private EntityKeyValueType valueType; - - public AlarmRuleConditionFilter() { + public AlarmConditionFilter() { } - public AlarmRuleConditionFilter argument(@Nonnull String argument) { + public AlarmConditionFilter argument(@Nonnull String argument) { this.argument = argument; return this; } @@ -93,7 +93,31 @@ public void setArgument(@Nonnull String argument) { } - public AlarmRuleConditionFilter operation(@Nullable ComplexOperation operation) { + public AlarmConditionFilter valueType(@Nonnull EntityKeyValueType valueType) { + this.valueType = valueType; + return this; + } + + /** + * Get valueType + * @return valueType + */ + @Nonnull + @JsonProperty(value = JSON_PROPERTY_VALUE_TYPE, required = true) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public EntityKeyValueType getValueType() { + return valueType; + } + + + @JsonProperty(value = JSON_PROPERTY_VALUE_TYPE, required = true) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setValueType(@Nonnull EntityKeyValueType valueType) { + this.valueType = valueType; + } + + + public AlarmConditionFilter operation(@Nullable AlarmRuleComplexOperation operation) { this.operation = operation; return this; } @@ -105,24 +129,24 @@ public AlarmRuleConditionFilter operation(@Nullable ComplexOperation operation) @Nullable @JsonProperty(value = JSON_PROPERTY_OPERATION, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public ComplexOperation getOperation() { + public AlarmRuleComplexOperation getOperation() { return operation; } @JsonProperty(value = JSON_PROPERTY_OPERATION, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setOperation(@Nullable ComplexOperation operation) { + public void setOperation(@Nullable AlarmRuleComplexOperation operation) { this.operation = operation; } - public AlarmRuleConditionFilter predicates(@Nonnull List predicates) { + public AlarmConditionFilter predicates(@Nonnull List predicates) { this.predicates = predicates; return this; } - public AlarmRuleConditionFilter addPredicatesItem(AlarmRuleKeyFilterPredicate predicatesItem) { + public AlarmConditionFilter addPredicatesItem(AlarmRuleKeyFilterPredicate predicatesItem) { if (this.predicates == null) { this.predicates = new ArrayList<>(); } @@ -149,32 +173,8 @@ public void setPredicates(@Nonnull List predicates) } - public AlarmRuleConditionFilter valueType(@Nonnull EntityKeyValueType valueType) { - this.valueType = valueType; - return this; - } - - /** - * Get valueType - * @return valueType - */ - @Nonnull - @JsonProperty(value = JSON_PROPERTY_VALUE_TYPE, required = true) - @JsonInclude(value = JsonInclude.Include.ALWAYS) - public EntityKeyValueType getValueType() { - return valueType; - } - - - @JsonProperty(value = JSON_PROPERTY_VALUE_TYPE, required = true) - @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setValueType(@Nonnull EntityKeyValueType valueType) { - this.valueType = valueType; - } - - /** - * Return true if this AlarmRuleConditionFilter object is equal to o. + * Return true if this AlarmConditionFilter object is equal to o. */ @Override public boolean equals(Object o) { @@ -184,26 +184,26 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - AlarmRuleConditionFilter alarmRuleConditionFilter = (AlarmRuleConditionFilter) o; - return Objects.equals(this.argument, alarmRuleConditionFilter.argument) && - Objects.equals(this.operation, alarmRuleConditionFilter.operation) && - Objects.equals(this.predicates, alarmRuleConditionFilter.predicates) && - Objects.equals(this.valueType, alarmRuleConditionFilter.valueType); + AlarmConditionFilter alarmConditionFilter = (AlarmConditionFilter) o; + return Objects.equals(this.argument, alarmConditionFilter.argument) && + Objects.equals(this.valueType, alarmConditionFilter.valueType) && + Objects.equals(this.operation, alarmConditionFilter.operation) && + Objects.equals(this.predicates, alarmConditionFilter.predicates); } @Override public int hashCode() { - return Objects.hash(argument, operation, predicates, valueType); + return Objects.hash(argument, valueType, operation, predicates); } @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class AlarmRuleConditionFilter {\n"); + sb.append("class AlarmConditionFilter {\n"); sb.append(" argument: ").append(toIndentedString(argument)).append("\n"); + sb.append(" valueType: ").append(toIndentedString(valueType)).append("\n"); sb.append(" operation: ").append(toIndentedString(operation)).append("\n"); sb.append(" predicates: ").append(toIndentedString(predicates)).append("\n"); - sb.append(" valueType: ").append(toIndentedString(valueType)).append("\n"); sb.append("}"); return sb.toString(); } @@ -256,6 +256,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sargument%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getArgument())))); } + // add `valueType` to the URL query string + if (getValueType() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%svalueType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getValueType())))); + } + // add `operation` to the URL query string if (getOperation() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%soperation%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getOperation())))); @@ -271,11 +276,6 @@ public String toUrlQueryString(String prefix) { } } - // add `valueType` to the URL query string - if (getValueType() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%svalueType%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getValueType())))); - } - return joiner.toString(); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmConditionValueAlarmRuleSchedule.java b/ce/src/main/java/org/thingsboard/client/model/AlarmConditionValueAlarmSchedule.java similarity index 79% rename from ce/src/main/java/org/thingsboard/client/model/AlarmConditionValueAlarmRuleSchedule.java rename to ce/src/main/java/org/thingsboard/client/model/AlarmConditionValueAlarmSchedule.java index bba1061a..5f7a74e3 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AlarmConditionValueAlarmRuleSchedule.java +++ b/ce/src/main/java/org/thingsboard/client/model/AlarmConditionValueAlarmSchedule.java @@ -29,81 +29,81 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; -import org.thingsboard.client.model.AlarmRuleSchedule; +import org.thingsboard.client.model.AlarmSchedule; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.thingsboard.client.ApiClient; /** - * AlarmConditionValueAlarmRuleSchedule + * AlarmConditionValueAlarmSchedule */ @JsonPropertyOrder({ - AlarmConditionValueAlarmRuleSchedule.JSON_PROPERTY_DYNAMIC_VALUE_ARGUMENT, - AlarmConditionValueAlarmRuleSchedule.JSON_PROPERTY_STATIC_VALUE + AlarmConditionValueAlarmSchedule.JSON_PROPERTY_STATIC_VALUE, + AlarmConditionValueAlarmSchedule.JSON_PROPERTY_DYNAMIC_VALUE_ARGUMENT }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") -public class AlarmConditionValueAlarmRuleSchedule { - public static final String JSON_PROPERTY_DYNAMIC_VALUE_ARGUMENT = "dynamicValueArgument"; +public class AlarmConditionValueAlarmSchedule { + public static final String JSON_PROPERTY_STATIC_VALUE = "staticValue"; @Nullable - private String dynamicValueArgument; + private AlarmSchedule staticValue; - public static final String JSON_PROPERTY_STATIC_VALUE = "staticValue"; + public static final String JSON_PROPERTY_DYNAMIC_VALUE_ARGUMENT = "dynamicValueArgument"; @Nullable - private AlarmRuleSchedule staticValue; + private String dynamicValueArgument; - public AlarmConditionValueAlarmRuleSchedule() { + public AlarmConditionValueAlarmSchedule() { } - public AlarmConditionValueAlarmRuleSchedule dynamicValueArgument(@Nullable String dynamicValueArgument) { - this.dynamicValueArgument = dynamicValueArgument; + public AlarmConditionValueAlarmSchedule staticValue(@Nullable AlarmSchedule staticValue) { + this.staticValue = staticValue; return this; } /** - * Get dynamicValueArgument - * @return dynamicValueArgument + * Get staticValue + * @return staticValue */ @Nullable - @JsonProperty(value = JSON_PROPERTY_DYNAMIC_VALUE_ARGUMENT, required = false) + @JsonProperty(value = JSON_PROPERTY_STATIC_VALUE, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getDynamicValueArgument() { - return dynamicValueArgument; + public AlarmSchedule getStaticValue() { + return staticValue; } - @JsonProperty(value = JSON_PROPERTY_DYNAMIC_VALUE_ARGUMENT, required = false) + @JsonProperty(value = JSON_PROPERTY_STATIC_VALUE, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDynamicValueArgument(@Nullable String dynamicValueArgument) { - this.dynamicValueArgument = dynamicValueArgument; + public void setStaticValue(@Nullable AlarmSchedule staticValue) { + this.staticValue = staticValue; } - public AlarmConditionValueAlarmRuleSchedule staticValue(@Nullable AlarmRuleSchedule staticValue) { - this.staticValue = staticValue; + public AlarmConditionValueAlarmSchedule dynamicValueArgument(@Nullable String dynamicValueArgument) { + this.dynamicValueArgument = dynamicValueArgument; return this; } /** - * Get staticValue - * @return staticValue + * Get dynamicValueArgument + * @return dynamicValueArgument */ @Nullable - @JsonProperty(value = JSON_PROPERTY_STATIC_VALUE, required = false) + @JsonProperty(value = JSON_PROPERTY_DYNAMIC_VALUE_ARGUMENT, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public AlarmRuleSchedule getStaticValue() { - return staticValue; + public String getDynamicValueArgument() { + return dynamicValueArgument; } - @JsonProperty(value = JSON_PROPERTY_STATIC_VALUE, required = false) + @JsonProperty(value = JSON_PROPERTY_DYNAMIC_VALUE_ARGUMENT, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setStaticValue(@Nullable AlarmRuleSchedule staticValue) { - this.staticValue = staticValue; + public void setDynamicValueArgument(@Nullable String dynamicValueArgument) { + this.dynamicValueArgument = dynamicValueArgument; } /** - * Return true if this AlarmConditionValueAlarmRuleSchedule object is equal to o. + * Return true if this AlarmConditionValueAlarmSchedule object is equal to o. */ @Override public boolean equals(Object o) { @@ -113,22 +113,22 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - AlarmConditionValueAlarmRuleSchedule alarmConditionValueAlarmRuleSchedule = (AlarmConditionValueAlarmRuleSchedule) o; - return Objects.equals(this.dynamicValueArgument, alarmConditionValueAlarmRuleSchedule.dynamicValueArgument) && - Objects.equals(this.staticValue, alarmConditionValueAlarmRuleSchedule.staticValue); + AlarmConditionValueAlarmSchedule alarmConditionValueAlarmSchedule = (AlarmConditionValueAlarmSchedule) o; + return Objects.equals(this.staticValue, alarmConditionValueAlarmSchedule.staticValue) && + Objects.equals(this.dynamicValueArgument, alarmConditionValueAlarmSchedule.dynamicValueArgument); } @Override public int hashCode() { - return Objects.hash(dynamicValueArgument, staticValue); + return Objects.hash(staticValue, dynamicValueArgument); } @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class AlarmConditionValueAlarmRuleSchedule {\n"); - sb.append(" dynamicValueArgument: ").append(toIndentedString(dynamicValueArgument)).append("\n"); + sb.append("class AlarmConditionValueAlarmSchedule {\n"); sb.append(" staticValue: ").append(toIndentedString(staticValue)).append("\n"); + sb.append(" dynamicValueArgument: ").append(toIndentedString(dynamicValueArgument)).append("\n"); sb.append("}"); return sb.toString(); } @@ -176,16 +176,16 @@ public String toUrlQueryString(String prefix) { StringJoiner joiner = new StringJoiner("&"); - // add `dynamicValueArgument` to the URL query string - if (getDynamicValueArgument() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sdynamicValueArgument%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDynamicValueArgument())))); - } - // add `staticValue` to the URL query string if (getStaticValue() != null) { joiner.add(getStaticValue().toUrlQueryString(prefix + "staticValue" + suffix)); } + // add `dynamicValueArgument` to the URL query string + if (getDynamicValueArgument() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sdynamicValueArgument%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDynamicValueArgument())))); + } + return joiner.toString(); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRule.java b/ce/src/main/java/org/thingsboard/client/model/AlarmRule.java new file mode 100644 index 00000000..2620dda5 --- /dev/null +++ b/ce/src/main/java/org/thingsboard/client/model/AlarmRule.java @@ -0,0 +1,230 @@ +/** + * Copyright © 2026-2026 ThingsBoard, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.client.model; + +import javax.annotation.Generated; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.StringJoiner; +import java.util.Objects; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.Arrays; +import org.thingsboard.client.model.AlarmCondition; +import org.thingsboard.client.model.DashboardId; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + + +import org.thingsboard.client.ApiClient; +/** + * AlarmRule + */ +@JsonPropertyOrder({ + AlarmRule.JSON_PROPERTY_CONDITION, + AlarmRule.JSON_PROPERTY_ALARM_DETAILS, + AlarmRule.JSON_PROPERTY_DASHBOARD_ID +}) +@Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") +public class AlarmRule { + public static final String JSON_PROPERTY_CONDITION = "condition"; + @Nonnull + private AlarmCondition condition; + + public static final String JSON_PROPERTY_ALARM_DETAILS = "alarmDetails"; + @Nullable + private String alarmDetails; + + public static final String JSON_PROPERTY_DASHBOARD_ID = "dashboardId"; + @Nullable + private DashboardId dashboardId; + + public AlarmRule() { + } + + public AlarmRule condition(@Nonnull AlarmCondition condition) { + this.condition = condition; + return this; + } + + /** + * Get condition + * @return condition + */ + @Nonnull + @JsonProperty(value = JSON_PROPERTY_CONDITION, required = true) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public AlarmCondition getCondition() { + return condition; + } + + + @JsonProperty(value = JSON_PROPERTY_CONDITION, required = true) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setCondition(@Nonnull AlarmCondition condition) { + this.condition = condition; + } + + + public AlarmRule alarmDetails(@Nullable String alarmDetails) { + this.alarmDetails = alarmDetails; + return this; + } + + /** + * Get alarmDetails + * @return alarmDetails + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ALARM_DETAILS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getAlarmDetails() { + return alarmDetails; + } + + + @JsonProperty(value = JSON_PROPERTY_ALARM_DETAILS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAlarmDetails(@Nullable String alarmDetails) { + this.alarmDetails = alarmDetails; + } + + + public AlarmRule dashboardId(@Nullable DashboardId dashboardId) { + this.dashboardId = dashboardId; + return this; + } + + /** + * Get dashboardId + * @return dashboardId + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_DASHBOARD_ID, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public DashboardId getDashboardId() { + return dashboardId; + } + + + @JsonProperty(value = JSON_PROPERTY_DASHBOARD_ID, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setDashboardId(@Nullable DashboardId dashboardId) { + this.dashboardId = dashboardId; + } + + + /** + * Return true if this AlarmRule object is equal to o. + */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AlarmRule alarmRule = (AlarmRule) o; + return Objects.equals(this.condition, alarmRule.condition) && + Objects.equals(this.alarmDetails, alarmRule.alarmDetails) && + Objects.equals(this.dashboardId, alarmRule.dashboardId); + } + + @Override + public int hashCode() { + return Objects.hash(condition, alarmDetails, dashboardId); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class AlarmRule {\n"); + sb.append(" condition: ").append(toIndentedString(condition)).append("\n"); + sb.append(" alarmDetails: ").append(toIndentedString(alarmDetails)).append("\n"); + sb.append(" dashboardId: ").append(toIndentedString(dashboardId)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + + /** + * Convert the instance into URL query string. + * + * @return URL query string + */ + public String toUrlQueryString() { + return toUrlQueryString(null); + } + + /** + * Convert the instance into URL query string. + * + * @param prefix prefix of the query string + * @return URL query string + */ + public String toUrlQueryString(String prefix) { + String suffix = ""; + String containerSuffix = ""; + String containerPrefix = ""; + if (prefix == null) { + // style=form, explode=true, e.g. /pet?name=cat&type=manx + prefix = ""; + } else { + // deepObject style e.g. /pet?id[name]=cat&id[type]=manx + prefix = prefix + "["; + suffix = "]"; + containerSuffix = "]"; + containerPrefix = "["; + } + + StringJoiner joiner = new StringJoiner("&"); + + // add `condition` to the URL query string + if (getCondition() != null) { + joiner.add(getCondition().toUrlQueryString(prefix + "condition" + suffix)); + } + + // add `alarmDetails` to the URL query string + if (getAlarmDetails() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%salarmDetails%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAlarmDetails())))); + } + + // add `dashboardId` to the URL query string + if (getDashboardId() != null) { + joiner.add(getDashboardId().toUrlQueryString(prefix + "dashboardId" + suffix)); + } + + return joiner.toString(); + } +} + diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleBooleanFilterPredicate.java b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleBooleanFilterPredicate.java index 95154389..11688972 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleBooleanFilterPredicate.java +++ b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleBooleanFilterPredicate.java @@ -33,8 +33,8 @@ import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; import org.thingsboard.client.model.AlarmConditionValueBoolean; +import org.thingsboard.client.model.AlarmRuleBooleanOperation; import org.thingsboard.client.model.AlarmRuleKeyFilterPredicate; -import org.thingsboard.client.model.BooleanOperation; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -57,7 +57,7 @@ public class AlarmRuleBooleanFilterPredicate extends AlarmRuleKeyFilterPredicate { public static final String JSON_PROPERTY_OPERATION = "operation"; @Nonnull - private BooleanOperation operation; + private AlarmRuleBooleanOperation operation; public static final String JSON_PROPERTY_VALUE = "value"; @Nonnull @@ -66,7 +66,7 @@ public class AlarmRuleBooleanFilterPredicate extends AlarmRuleKeyFilterPredicate public AlarmRuleBooleanFilterPredicate() { } - public AlarmRuleBooleanFilterPredicate operation(@Nonnull BooleanOperation operation) { + public AlarmRuleBooleanFilterPredicate operation(@Nonnull AlarmRuleBooleanOperation operation) { this.operation = operation; return this; } @@ -78,14 +78,14 @@ public AlarmRuleBooleanFilterPredicate operation(@Nonnull BooleanOperation opera @Nonnull @JsonProperty(value = JSON_PROPERTY_OPERATION, required = true) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public BooleanOperation getOperation() { + public AlarmRuleBooleanOperation getOperation() { return operation; } @JsonProperty(value = JSON_PROPERTY_OPERATION, required = true) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setOperation(@Nonnull BooleanOperation operation) { + public void setOperation(@Nonnull AlarmRuleBooleanOperation operation) { this.operation = operation; } diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleBooleanOperation.java b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleBooleanOperation.java new file mode 100644 index 00000000..a87dfc84 --- /dev/null +++ b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleBooleanOperation.java @@ -0,0 +1,80 @@ +/** + * Copyright © 2026-2026 ThingsBoard, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.client.model; + +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.StringJoiner; +import java.util.Objects; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + +/** + * Gets or Sets AlarmRuleBooleanOperation + */ +public enum AlarmRuleBooleanOperation { + + EQUAL("EQUAL"), + + NOT_EQUAL("NOT_EQUAL"); + + private String value; + + AlarmRuleBooleanOperation(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static AlarmRuleBooleanOperation fromValue(String value) { + for (AlarmRuleBooleanOperation b : AlarmRuleBooleanOperation.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + /** + * Convert the instance into URL query string. + * + * @param prefix prefix of the query string + * @return URL query string + */ + public String toUrlQueryString(String prefix) { + if (prefix == null) { + prefix = ""; + } + + return String.format(java.util.Locale.ROOT, "%s=%s", prefix, this.toString()); + } + +} + diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleComplexFilterPredicate.java b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleComplexFilterPredicate.java index b76c7f7a..1b745bf6 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleComplexFilterPredicate.java +++ b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleComplexFilterPredicate.java @@ -34,8 +34,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.thingsboard.client.model.AlarmRuleComplexOperation; import org.thingsboard.client.model.AlarmRuleKeyFilterPredicate; -import org.thingsboard.client.model.ComplexOperation; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -58,7 +58,7 @@ public class AlarmRuleComplexFilterPredicate extends AlarmRuleKeyFilterPredicate { public static final String JSON_PROPERTY_OPERATION = "operation"; @Nullable - private ComplexOperation operation; + private AlarmRuleComplexOperation operation; public static final String JSON_PROPERTY_PREDICATES = "predicates"; @Nullable @@ -67,7 +67,7 @@ public class AlarmRuleComplexFilterPredicate extends AlarmRuleKeyFilterPredicate public AlarmRuleComplexFilterPredicate() { } - public AlarmRuleComplexFilterPredicate operation(@Nullable ComplexOperation operation) { + public AlarmRuleComplexFilterPredicate operation(@Nullable AlarmRuleComplexOperation operation) { this.operation = operation; return this; } @@ -79,14 +79,14 @@ public AlarmRuleComplexFilterPredicate operation(@Nullable ComplexOperation oper @Nullable @JsonProperty(value = JSON_PROPERTY_OPERATION, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public ComplexOperation getOperation() { + public AlarmRuleComplexOperation getOperation() { return operation; } @JsonProperty(value = JSON_PROPERTY_OPERATION, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setOperation(@Nullable ComplexOperation operation) { + public void setOperation(@Nullable AlarmRuleComplexOperation operation) { this.operation = operation; } diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleComplexOperation.java b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleComplexOperation.java new file mode 100644 index 00000000..1b4a7106 --- /dev/null +++ b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleComplexOperation.java @@ -0,0 +1,80 @@ +/** + * Copyright © 2026-2026 ThingsBoard, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.client.model; + +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.StringJoiner; +import java.util.Objects; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + +/** + * Gets or Sets AlarmRuleComplexOperation + */ +public enum AlarmRuleComplexOperation { + + AND("AND"), + + OR("OR"); + + private String value; + + AlarmRuleComplexOperation(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static AlarmRuleComplexOperation fromValue(String value) { + for (AlarmRuleComplexOperation b : AlarmRuleComplexOperation.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + /** + * Convert the instance into URL query string. + * + * @param prefix prefix of the query string + * @return URL query string + */ + public String toUrlQueryString(String prefix) { + if (prefix == null) { + prefix = ""; + } + + return String.format(java.util.Locale.ROOT, "%s=%s", prefix, this.toString()); + } + +} + diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleDefinition.java b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleDefinition.java index 8a87627e..d22e098c 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleDefinition.java +++ b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleDefinition.java @@ -30,8 +30,11 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; -import org.thingsboard.client.model.AlarmRuleCondition; -import org.thingsboard.client.model.DashboardId; +import org.thingsboard.client.model.AlarmCalculatedFieldConfiguration; +import org.thingsboard.client.model.CalculatedFieldId; +import org.thingsboard.client.model.DebugSettings; +import org.thingsboard.client.model.EntityId; +import org.thingsboard.client.model.TenantId; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -40,96 +43,328 @@ * AlarmRuleDefinition */ @JsonPropertyOrder({ - AlarmRuleDefinition.JSON_PROPERTY_ALARM_DETAILS, - AlarmRuleDefinition.JSON_PROPERTY_CONDITION, - AlarmRuleDefinition.JSON_PROPERTY_DASHBOARD_ID + AlarmRuleDefinition.JSON_PROPERTY_ID, + AlarmRuleDefinition.JSON_PROPERTY_CREATED_TIME, + AlarmRuleDefinition.JSON_PROPERTY_TENANT_ID, + AlarmRuleDefinition.JSON_PROPERTY_ENTITY_ID, + AlarmRuleDefinition.JSON_PROPERTY_NAME, + AlarmRuleDefinition.JSON_PROPERTY_DEBUG_SETTINGS, + AlarmRuleDefinition.JSON_PROPERTY_CONFIGURATION_VERSION, + AlarmRuleDefinition.JSON_PROPERTY_CONFIGURATION, + AlarmRuleDefinition.JSON_PROPERTY_VERSION, + AlarmRuleDefinition.JSON_PROPERTY_ADDITIONAL_INFO, + AlarmRuleDefinition.JSON_PROPERTY_DEBUG_MODE }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") public class AlarmRuleDefinition { - public static final String JSON_PROPERTY_ALARM_DETAILS = "alarmDetails"; + public static final String JSON_PROPERTY_ID = "id"; @Nullable - private String alarmDetails; + private CalculatedFieldId id; - public static final String JSON_PROPERTY_CONDITION = "condition"; + public static final String JSON_PROPERTY_CREATED_TIME = "createdTime"; + @Nullable + private Long createdTime; + + public static final String JSON_PROPERTY_TENANT_ID = "tenantId"; + @Nullable + private TenantId tenantId; + + public static final String JSON_PROPERTY_ENTITY_ID = "entityId"; + @Nullable + private EntityId entityId; + + public static final String JSON_PROPERTY_NAME = "name"; + @Nullable + private String name; + + public static final String JSON_PROPERTY_DEBUG_SETTINGS = "debugSettings"; + @Nullable + private DebugSettings debugSettings; + + public static final String JSON_PROPERTY_CONFIGURATION_VERSION = "configurationVersion"; + @Nullable + private Integer configurationVersion; + + public static final String JSON_PROPERTY_CONFIGURATION = "configuration"; @Nonnull - private AlarmRuleCondition condition; + private AlarmCalculatedFieldConfiguration _configuration; + + public static final String JSON_PROPERTY_VERSION = "version"; + @Nullable + private Long version; - public static final String JSON_PROPERTY_DASHBOARD_ID = "dashboardId"; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; @Nullable - private DashboardId dashboardId; + private com.fasterxml.jackson.databind.JsonNode additionalInfo; + + public static final String JSON_PROPERTY_DEBUG_MODE = "debugMode"; + @Nullable + private Boolean debugMode; public AlarmRuleDefinition() { } - public AlarmRuleDefinition alarmDetails(@Nullable String alarmDetails) { - this.alarmDetails = alarmDetails; + @JsonCreator + public AlarmRuleDefinition( + @JsonProperty(JSON_PROPERTY_CREATED_TIME) Long createdTime + ) { + this(); + this.createdTime = createdTime; + } + + public AlarmRuleDefinition id(@Nullable CalculatedFieldId id) { + this.id = id; return this; } /** - * Get alarmDetails - * @return alarmDetails + * JSON object with the Alarm Rule Id. Referencing non-existing Alarm Rule Id will cause error. + * @return id */ @Nullable - @JsonProperty(value = JSON_PROPERTY_ALARM_DETAILS, required = false) + @JsonProperty(value = JSON_PROPERTY_ID, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getAlarmDetails() { - return alarmDetails; + public CalculatedFieldId getId() { + return id; } - @JsonProperty(value = JSON_PROPERTY_ALARM_DETAILS, required = false) + @JsonProperty(value = JSON_PROPERTY_ID, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAlarmDetails(@Nullable String alarmDetails) { - this.alarmDetails = alarmDetails; + public void setId(@Nullable CalculatedFieldId id) { + this.id = id; } - public AlarmRuleDefinition condition(@Nonnull AlarmRuleCondition condition) { - this.condition = condition; + /** + * Timestamp of the alarm rule creation, in milliseconds + * @return createdTime + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_CREATED_TIME, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long getCreatedTime() { + return createdTime; + } + + + + + public AlarmRuleDefinition tenantId(@Nullable TenantId tenantId) { + this.tenantId = tenantId; return this; } /** - * Get condition - * @return condition + * Get tenantId + * @return tenantId + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_TENANT_ID, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public TenantId getTenantId() { + return tenantId; + } + + + @JsonProperty(value = JSON_PROPERTY_TENANT_ID, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setTenantId(@Nullable TenantId tenantId) { + this.tenantId = tenantId; + } + + + public AlarmRuleDefinition entityId(@Nullable EntityId entityId) { + this.entityId = entityId; + return this; + } + + /** + * Get entityId + * @return entityId + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ENTITY_ID, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public EntityId getEntityId() { + return entityId; + } + + + @JsonProperty(value = JSON_PROPERTY_ENTITY_ID, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setEntityId(@Nullable EntityId entityId) { + this.entityId = entityId; + } + + + public AlarmRuleDefinition name(@Nullable String name) { + this.name = name; + return this; + } + + /** + * User defined name of the alarm rule. + * @return name + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_NAME, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getName() { + return name; + } + + + @JsonProperty(value = JSON_PROPERTY_NAME, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(@Nullable String name) { + this.name = name; + } + + + public AlarmRuleDefinition debugSettings(@Nullable DebugSettings debugSettings) { + this.debugSettings = debugSettings; + return this; + } + + /** + * Debug settings object. + * @return debugSettings + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_DEBUG_SETTINGS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public DebugSettings getDebugSettings() { + return debugSettings; + } + + + @JsonProperty(value = JSON_PROPERTY_DEBUG_SETTINGS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setDebugSettings(@Nullable DebugSettings debugSettings) { + this.debugSettings = debugSettings; + } + + + public AlarmRuleDefinition configurationVersion(@Nullable Integer configurationVersion) { + this.configurationVersion = configurationVersion; + return this; + } + + /** + * Version of alarm rule configuration. + * @return configurationVersion + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_CONFIGURATION_VERSION, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Integer getConfigurationVersion() { + return configurationVersion; + } + + + @JsonProperty(value = JSON_PROPERTY_CONFIGURATION_VERSION, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setConfigurationVersion(@Nullable Integer configurationVersion) { + this.configurationVersion = configurationVersion; + } + + + public AlarmRuleDefinition _configuration(@Nonnull AlarmCalculatedFieldConfiguration _configuration) { + this._configuration = _configuration; + return this; + } + + /** + * Get _configuration + * @return _configuration */ @Nonnull - @JsonProperty(value = JSON_PROPERTY_CONDITION, required = true) + @JsonProperty(value = JSON_PROPERTY_CONFIGURATION, required = true) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public AlarmRuleCondition getCondition() { - return condition; + public AlarmCalculatedFieldConfiguration getConfiguration() { + return _configuration; } - @JsonProperty(value = JSON_PROPERTY_CONDITION, required = true) + @JsonProperty(value = JSON_PROPERTY_CONFIGURATION, required = true) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setCondition(@Nonnull AlarmRuleCondition condition) { - this.condition = condition; + public void setConfiguration(@Nonnull AlarmCalculatedFieldConfiguration _configuration) { + this._configuration = _configuration; + } + + + public AlarmRuleDefinition version(@Nullable Long version) { + this.version = version; + return this; + } + + /** + * Get version + * @return version + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_VERSION, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long getVersion() { + return version; + } + + + @JsonProperty(value = JSON_PROPERTY_VERSION, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setVersion(@Nullable Long version) { + this.version = version; } - public AlarmRuleDefinition dashboardId(@Nullable DashboardId dashboardId) { - this.dashboardId = dashboardId; + public AlarmRuleDefinition additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; return this; } /** - * Get dashboardId - * @return dashboardId + * Additional parameters of the alarm rule. May include: 'description' (string). + * @return additionalInfo */ @Nullable - @JsonProperty(value = JSON_PROPERTY_DASHBOARD_ID, required = false) + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public DashboardId getDashboardId() { - return dashboardId; + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; } - @JsonProperty(value = JSON_PROPERTY_DASHBOARD_ID, required = false) + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDashboardId(@Nullable DashboardId dashboardId) { - this.dashboardId = dashboardId; + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + + public AlarmRuleDefinition debugMode(@Nullable Boolean debugMode) { + this.debugMode = debugMode; + return this; + } + + /** + * Get debugMode + * @return debugMode + * @deprecated + */ + @Deprecated + @Nullable + @JsonProperty(value = JSON_PROPERTY_DEBUG_MODE, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Boolean getDebugMode() { + return debugMode; + } + + + @JsonProperty(value = JSON_PROPERTY_DEBUG_MODE, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setDebugMode(@Nullable Boolean debugMode) { + this.debugMode = debugMode; } @@ -145,23 +380,39 @@ public boolean equals(Object o) { return false; } AlarmRuleDefinition alarmRuleDefinition = (AlarmRuleDefinition) o; - return Objects.equals(this.alarmDetails, alarmRuleDefinition.alarmDetails) && - Objects.equals(this.condition, alarmRuleDefinition.condition) && - Objects.equals(this.dashboardId, alarmRuleDefinition.dashboardId); + return Objects.equals(this.id, alarmRuleDefinition.id) && + Objects.equals(this.createdTime, alarmRuleDefinition.createdTime) && + Objects.equals(this.tenantId, alarmRuleDefinition.tenantId) && + Objects.equals(this.entityId, alarmRuleDefinition.entityId) && + Objects.equals(this.name, alarmRuleDefinition.name) && + Objects.equals(this.debugSettings, alarmRuleDefinition.debugSettings) && + Objects.equals(this.configurationVersion, alarmRuleDefinition.configurationVersion) && + Objects.equals(this._configuration, alarmRuleDefinition._configuration) && + Objects.equals(this.version, alarmRuleDefinition.version) && + Objects.equals(this.additionalInfo, alarmRuleDefinition.additionalInfo) && + Objects.equals(this.debugMode, alarmRuleDefinition.debugMode); } @Override public int hashCode() { - return Objects.hash(alarmDetails, condition, dashboardId); + return Objects.hash(id, createdTime, tenantId, entityId, name, debugSettings, configurationVersion, _configuration, version, additionalInfo, debugMode); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AlarmRuleDefinition {\n"); - sb.append(" alarmDetails: ").append(toIndentedString(alarmDetails)).append("\n"); - sb.append(" condition: ").append(toIndentedString(condition)).append("\n"); - sb.append(" dashboardId: ").append(toIndentedString(dashboardId)).append("\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" tenantId: ").append(toIndentedString(tenantId)).append("\n"); + sb.append(" entityId: ").append(toIndentedString(entityId)).append("\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" debugSettings: ").append(toIndentedString(debugSettings)).append("\n"); + sb.append(" configurationVersion: ").append(toIndentedString(configurationVersion)).append("\n"); + sb.append(" _configuration: ").append(toIndentedString(_configuration)).append("\n"); + sb.append(" version: ").append(toIndentedString(version)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); + sb.append(" debugMode: ").append(toIndentedString(debugMode)).append("\n"); sb.append("}"); return sb.toString(); } @@ -209,19 +460,59 @@ public String toUrlQueryString(String prefix) { StringJoiner joiner = new StringJoiner("&"); - // add `alarmDetails` to the URL query string - if (getAlarmDetails() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%salarmDetails%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAlarmDetails())))); + // add `id` to the URL query string + if (getId() != null) { + joiner.add(getId().toUrlQueryString(prefix + "id" + suffix)); + } + + // add `createdTime` to the URL query string + if (getCreatedTime() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); + } + + // add `tenantId` to the URL query string + if (getTenantId() != null) { + joiner.add(getTenantId().toUrlQueryString(prefix + "tenantId" + suffix)); + } + + // add `entityId` to the URL query string + if (getEntityId() != null) { + joiner.add(getEntityId().toUrlQueryString(prefix + "entityId" + suffix)); + } + + // add `name` to the URL query string + if (getName() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); + } + + // add `debugSettings` to the URL query string + if (getDebugSettings() != null) { + joiner.add(getDebugSettings().toUrlQueryString(prefix + "debugSettings" + suffix)); + } + + // add `configurationVersion` to the URL query string + if (getConfigurationVersion() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sconfigurationVersion%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getConfigurationVersion())))); + } + + // add `configuration` to the URL query string + if (getConfiguration() != null) { + joiner.add(getConfiguration().toUrlQueryString(prefix + "configuration" + suffix)); + } + + // add `version` to the URL query string + if (getVersion() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sversion%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getVersion())))); } - // add `condition` to the URL query string - if (getCondition() != null) { - joiner.add(getCondition().toUrlQueryString(prefix + "condition" + suffix)); + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); } - // add `dashboardId` to the URL query string - if (getDashboardId() != null) { - joiner.add(getDashboardId().toUrlQueryString(prefix + "dashboardId" + suffix)); + // add `debugMode` to the URL query string + if (getDebugMode() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sdebugMode%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDebugMode())))); } return joiner.toString(); diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleKeyFilterPredicate.java b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleKeyFilterPredicate.java index d1fe90cc..4795aa86 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleKeyFilterPredicate.java +++ b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleKeyFilterPredicate.java @@ -52,7 +52,7 @@ @JsonSubTypes({ @JsonSubTypes.Type(value = AlarmRuleBooleanFilterPredicate.class, name = "BOOLEAN"), @JsonSubTypes.Type(value = AlarmRuleComplexFilterPredicate.class, name = "COMPLEX"), - @JsonSubTypes.Type(value = AlarmRuleNoDataFilterPredicate.class, name = "NO_DATA"), + @JsonSubTypes.Type(value = NoDataFilterPredicate.class, name = "NO_DATA"), @JsonSubTypes.Type(value = AlarmRuleNumericFilterPredicate.class, name = "NUMERIC"), @JsonSubTypes.Type(value = AlarmRuleStringFilterPredicate.class, name = "STRING"), }) @@ -173,7 +173,7 @@ public String toUrlQueryString(String prefix) { Map> mappings = new HashMap>(); mappings.put("BOOLEAN", AlarmRuleBooleanFilterPredicate.class); mappings.put("COMPLEX", AlarmRuleComplexFilterPredicate.class); - mappings.put("NO_DATA", AlarmRuleNoDataFilterPredicate.class); + mappings.put("NO_DATA", NoDataFilterPredicate.class); mappings.put("NUMERIC", AlarmRuleNumericFilterPredicate.class); mappings.put("STRING", AlarmRuleStringFilterPredicate.class); mappings.put("AlarmRuleKeyFilterPredicate", AlarmRuleKeyFilterPredicate.class); diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleNumericFilterPredicate.java b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleNumericFilterPredicate.java index 311f8dee..e730ca75 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleNumericFilterPredicate.java +++ b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleNumericFilterPredicate.java @@ -34,7 +34,7 @@ import java.util.Arrays; import org.thingsboard.client.model.AlarmConditionValueDouble; import org.thingsboard.client.model.AlarmRuleKeyFilterPredicate; -import org.thingsboard.client.model.NumericOperation; +import org.thingsboard.client.model.AlarmRuleNumericOperation; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -57,7 +57,7 @@ public class AlarmRuleNumericFilterPredicate extends AlarmRuleKeyFilterPredicate { public static final String JSON_PROPERTY_OPERATION = "operation"; @Nonnull - private NumericOperation operation; + private AlarmRuleNumericOperation operation; public static final String JSON_PROPERTY_VALUE = "value"; @Nonnull @@ -66,7 +66,7 @@ public class AlarmRuleNumericFilterPredicate extends AlarmRuleKeyFilterPredicate public AlarmRuleNumericFilterPredicate() { } - public AlarmRuleNumericFilterPredicate operation(@Nonnull NumericOperation operation) { + public AlarmRuleNumericFilterPredicate operation(@Nonnull AlarmRuleNumericOperation operation) { this.operation = operation; return this; } @@ -78,14 +78,14 @@ public AlarmRuleNumericFilterPredicate operation(@Nonnull NumericOperation opera @Nonnull @JsonProperty(value = JSON_PROPERTY_OPERATION, required = true) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public NumericOperation getOperation() { + public AlarmRuleNumericOperation getOperation() { return operation; } @JsonProperty(value = JSON_PROPERTY_OPERATION, required = true) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setOperation(@Nonnull NumericOperation operation) { + public void setOperation(@Nonnull AlarmRuleNumericOperation operation) { this.operation = operation; } diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleNumericOperation.java b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleNumericOperation.java new file mode 100644 index 00000000..9e14b719 --- /dev/null +++ b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleNumericOperation.java @@ -0,0 +1,88 @@ +/** + * Copyright © 2026-2026 ThingsBoard, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.client.model; + +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.StringJoiner; +import java.util.Objects; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + +/** + * Gets or Sets AlarmRuleNumericOperation + */ +public enum AlarmRuleNumericOperation { + + EQUAL("EQUAL"), + + NOT_EQUAL("NOT_EQUAL"), + + GREATER("GREATER"), + + LESS("LESS"), + + GREATER_OR_EQUAL("GREATER_OR_EQUAL"), + + LESS_OR_EQUAL("LESS_OR_EQUAL"); + + private String value; + + AlarmRuleNumericOperation(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static AlarmRuleNumericOperation fromValue(String value) { + for (AlarmRuleNumericOperation b : AlarmRuleNumericOperation.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + /** + * Convert the instance into URL query string. + * + * @param prefix prefix of the query string + * @return URL query string + */ + public String toUrlQueryString(String prefix) { + if (prefix == null) { + prefix = ""; + } + + return String.format(java.util.Locale.ROOT, "%s=%s", prefix, this.toString()); + } + +} + diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleStringFilterPredicate.java b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleStringFilterPredicate.java index 643535c9..70890778 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleStringFilterPredicate.java +++ b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleStringFilterPredicate.java @@ -35,7 +35,7 @@ import java.util.Arrays; import org.thingsboard.client.model.AlarmConditionValueString; import org.thingsboard.client.model.AlarmRuleKeyFilterPredicate; -import org.thingsboard.client.model.StringOperation; +import org.thingsboard.client.model.AlarmRuleStringOperation; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -45,9 +45,9 @@ * AlarmRuleStringFilterPredicate */ @JsonPropertyOrder({ - AlarmRuleStringFilterPredicate.JSON_PROPERTY_IGNORE_CASE, AlarmRuleStringFilterPredicate.JSON_PROPERTY_OPERATION, - AlarmRuleStringFilterPredicate.JSON_PROPERTY_VALUE + AlarmRuleStringFilterPredicate.JSON_PROPERTY_VALUE, + AlarmRuleStringFilterPredicate.JSON_PROPERTY_IGNORE_CASE }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @JsonIgnoreProperties( @@ -57,46 +57,22 @@ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = true) public class AlarmRuleStringFilterPredicate extends AlarmRuleKeyFilterPredicate { - public static final String JSON_PROPERTY_IGNORE_CASE = "ignoreCase"; - @Nullable - private Boolean ignoreCase; - public static final String JSON_PROPERTY_OPERATION = "operation"; @Nonnull - private StringOperation operation; + private AlarmRuleStringOperation operation; public static final String JSON_PROPERTY_VALUE = "value"; @Nonnull private AlarmConditionValueString value; - public AlarmRuleStringFilterPredicate() { - } - - public AlarmRuleStringFilterPredicate ignoreCase(@Nullable Boolean ignoreCase) { - this.ignoreCase = ignoreCase; - return this; - } - - /** - * Get ignoreCase - * @return ignoreCase - */ + public static final String JSON_PROPERTY_IGNORE_CASE = "ignoreCase"; @Nullable - @JsonProperty(value = JSON_PROPERTY_IGNORE_CASE, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Boolean getIgnoreCase() { - return ignoreCase; - } - + private Boolean ignoreCase; - @JsonProperty(value = JSON_PROPERTY_IGNORE_CASE, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setIgnoreCase(@Nullable Boolean ignoreCase) { - this.ignoreCase = ignoreCase; + public AlarmRuleStringFilterPredicate() { } - - public AlarmRuleStringFilterPredicate operation(@Nonnull StringOperation operation) { + public AlarmRuleStringFilterPredicate operation(@Nonnull AlarmRuleStringOperation operation) { this.operation = operation; return this; } @@ -108,14 +84,14 @@ public AlarmRuleStringFilterPredicate operation(@Nonnull StringOperation operati @Nonnull @JsonProperty(value = JSON_PROPERTY_OPERATION, required = true) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public StringOperation getOperation() { + public AlarmRuleStringOperation getOperation() { return operation; } @JsonProperty(value = JSON_PROPERTY_OPERATION, required = true) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setOperation(@Nonnull StringOperation operation) { + public void setOperation(@Nonnull AlarmRuleStringOperation operation) { this.operation = operation; } @@ -144,6 +120,30 @@ public void setValue(@Nonnull AlarmConditionValueString value) { } + public AlarmRuleStringFilterPredicate ignoreCase(@Nullable Boolean ignoreCase) { + this.ignoreCase = ignoreCase; + return this; + } + + /** + * Get ignoreCase + * @return ignoreCase + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_IGNORE_CASE, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Boolean getIgnoreCase() { + return ignoreCase; + } + + + @JsonProperty(value = JSON_PROPERTY_IGNORE_CASE, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setIgnoreCase(@Nullable Boolean ignoreCase) { + this.ignoreCase = ignoreCase; + } + + /** * Return true if this AlarmRuleStringFilterPredicate object is equal to o. */ @@ -156,15 +156,15 @@ public boolean equals(Object o) { return false; } AlarmRuleStringFilterPredicate alarmRuleStringFilterPredicate = (AlarmRuleStringFilterPredicate) o; - return Objects.equals(this.ignoreCase, alarmRuleStringFilterPredicate.ignoreCase) && - Objects.equals(this.operation, alarmRuleStringFilterPredicate.operation) && + return Objects.equals(this.operation, alarmRuleStringFilterPredicate.operation) && Objects.equals(this.value, alarmRuleStringFilterPredicate.value) && + Objects.equals(this.ignoreCase, alarmRuleStringFilterPredicate.ignoreCase) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(ignoreCase, operation, value, super.hashCode()); + return Objects.hash(operation, value, ignoreCase, super.hashCode()); } @Override @@ -172,9 +172,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AlarmRuleStringFilterPredicate {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" ignoreCase: ").append(toIndentedString(ignoreCase)).append("\n"); sb.append(" operation: ").append(toIndentedString(operation)).append("\n"); sb.append(" value: ").append(toIndentedString(value)).append("\n"); + sb.append(" ignoreCase: ").append(toIndentedString(ignoreCase)).append("\n"); sb.append("}"); return sb.toString(); } @@ -227,11 +227,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%stype%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getType())))); } - // add `ignoreCase` to the URL query string - if (getIgnoreCase() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%signoreCase%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getIgnoreCase())))); - } - // add `operation` to the URL query string if (getOperation() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%soperation%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getOperation())))); @@ -242,6 +237,11 @@ public String toUrlQueryString(String prefix) { joiner.add(getValue().toUrlQueryString(prefix + "value" + suffix)); } + // add `ignoreCase` to the URL query string + if (getIgnoreCase() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%signoreCase%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getIgnoreCase())))); + } + return joiner.toString(); } static { diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleStringOperation.java b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleStringOperation.java new file mode 100644 index 00000000..aec34796 --- /dev/null +++ b/ce/src/main/java/org/thingsboard/client/model/AlarmRuleStringOperation.java @@ -0,0 +1,92 @@ +/** + * Copyright © 2026-2026 ThingsBoard, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.client.model; + +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.StringJoiner; +import java.util.Objects; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + +/** + * Gets or Sets AlarmRuleStringOperation + */ +public enum AlarmRuleStringOperation { + + EQUAL("EQUAL"), + + NOT_EQUAL("NOT_EQUAL"), + + STARTS_WITH("STARTS_WITH"), + + ENDS_WITH("ENDS_WITH"), + + CONTAINS("CONTAINS"), + + NOT_CONTAINS("NOT_CONTAINS"), + + IN("IN"), + + NOT_IN("NOT_IN"); + + private String value; + + AlarmRuleStringOperation(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static AlarmRuleStringOperation fromValue(String value) { + for (AlarmRuleStringOperation b : AlarmRuleStringOperation.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + /** + * Convert the instance into URL query string. + * + * @param prefix prefix of the query string + * @return URL query string + */ + public String toUrlQueryString(String prefix) { + if (prefix == null) { + prefix = ""; + } + + return String.format(java.util.Locale.ROOT, "%s=%s", prefix, this.toString()); + } + +} + diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleSchedule.java b/ce/src/main/java/org/thingsboard/client/model/AlarmSchedule.java similarity index 81% rename from ce/src/main/java/org/thingsboard/client/model/AlarmRuleSchedule.java rename to ce/src/main/java/org/thingsboard/client/model/AlarmSchedule.java index 1192bea2..2c4c7537 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleSchedule.java +++ b/ce/src/main/java/org/thingsboard/client/model/AlarmSchedule.java @@ -38,10 +38,10 @@ import org.thingsboard.client.JSON; import org.thingsboard.client.ApiClient; /** - * AlarmRuleSchedule + * AlarmSchedule */ @JsonPropertyOrder({ - AlarmRuleSchedule.JSON_PROPERTY_TYPE + AlarmSchedule.JSON_PROPERTY_TYPE }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @JsonIgnoreProperties( @@ -50,20 +50,20 @@ ) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = true) @JsonSubTypes({ - @JsonSubTypes.Type(value = AlarmRuleAnyTimeSchedule.class, name = "ANY_TIME"), - @JsonSubTypes.Type(value = AlarmRuleCustomTimeSchedule.class, name = "CUSTOM"), - @JsonSubTypes.Type(value = AlarmRuleSpecificTimeSchedule.class, name = "SPECIFIC_TIME"), + @JsonSubTypes.Type(value = AnyTimeSchedule.class, name = "ANY_TIME"), + @JsonSubTypes.Type(value = CustomTimeSchedule.class, name = "CUSTOM"), + @JsonSubTypes.Type(value = SpecificTimeSchedule.class, name = "SPECIFIC_TIME"), }) -public class AlarmRuleSchedule { +public class AlarmSchedule { public static final String JSON_PROPERTY_TYPE = "type"; @Nonnull private String type; - public AlarmRuleSchedule() { + public AlarmSchedule() { } - public AlarmRuleSchedule type(@Nonnull String type) { + public AlarmSchedule type(@Nonnull String type) { this.type = type; return this; } @@ -88,7 +88,7 @@ public void setType(@Nonnull String type) { /** - * Return true if this AlarmRuleSchedule object is equal to o. + * Return true if this AlarmSchedule object is equal to o. */ @Override public boolean equals(Object o) { @@ -98,8 +98,8 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - AlarmRuleSchedule alarmRuleSchedule = (AlarmRuleSchedule) o; - return Objects.equals(this.type, alarmRuleSchedule.type); + AlarmSchedule alarmSchedule = (AlarmSchedule) o; + return Objects.equals(this.type, alarmSchedule.type); } @Override @@ -110,7 +110,7 @@ public int hashCode() { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class AlarmRuleSchedule {\n"); + sb.append("class AlarmSchedule {\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); sb.append("}"); return sb.toString(); @@ -169,11 +169,11 @@ public String toUrlQueryString(String prefix) { static { // Initialize and register the discriminator mappings. Map> mappings = new HashMap>(); - mappings.put("ANY_TIME", AlarmRuleAnyTimeSchedule.class); - mappings.put("CUSTOM", AlarmRuleCustomTimeSchedule.class); - mappings.put("SPECIFIC_TIME", AlarmRuleSpecificTimeSchedule.class); - mappings.put("AlarmRuleSchedule", AlarmRuleSchedule.class); - JSON.registerDiscriminator(AlarmRuleSchedule.class, "type", mappings); + mappings.put("ANY_TIME", AnyTimeSchedule.class); + mappings.put("CUSTOM", CustomTimeSchedule.class); + mappings.put("SPECIFIC_TIME", SpecificTimeSchedule.class); + mappings.put("AlarmSchedule", AlarmSchedule.class); + JSON.registerDiscriminator(AlarmSchedule.class, "type", mappings); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleAnyTimeSchedule.java b/ce/src/main/java/org/thingsboard/client/model/AnyTimeSchedule.java similarity index 89% rename from ce/src/main/java/org/thingsboard/client/model/AlarmRuleAnyTimeSchedule.java rename to ce/src/main/java/org/thingsboard/client/model/AnyTimeSchedule.java index d6292653..df07f722 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleAnyTimeSchedule.java +++ b/ce/src/main/java/org/thingsboard/client/model/AnyTimeSchedule.java @@ -31,14 +31,14 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; -import org.thingsboard.client.model.AlarmRuleSchedule; +import org.thingsboard.client.model.AlarmSchedule; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.thingsboard.client.JSON; import org.thingsboard.client.ApiClient; /** - * AlarmRuleAnyTimeSchedule + * AnyTimeSchedule */ @JsonPropertyOrder({ }) @@ -49,12 +49,12 @@ ) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = true) -public class AlarmRuleAnyTimeSchedule extends AlarmRuleSchedule { - public AlarmRuleAnyTimeSchedule() { +public class AnyTimeSchedule extends AlarmSchedule { + public AnyTimeSchedule() { } /** - * Return true if this AlarmRuleAnyTimeSchedule object is equal to o. + * Return true if this AnyTimeSchedule object is equal to o. */ @Override public boolean equals(Object o) { @@ -75,7 +75,7 @@ public int hashCode() { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class AlarmRuleAnyTimeSchedule {\n"); + sb.append("class AnyTimeSchedule {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append("}"); return sb.toString(); @@ -134,8 +134,8 @@ public String toUrlQueryString(String prefix) { static { // Initialize and register the discriminator mappings. Map> mappings = new HashMap>(); - mappings.put("AlarmRuleAnyTimeSchedule", AlarmRuleAnyTimeSchedule.class); - JSON.registerDiscriminator(AlarmRuleAnyTimeSchedule.class, "type", mappings); + mappings.put("AnyTimeSchedule", AnyTimeSchedule.class); + JSON.registerDiscriminator(AnyTimeSchedule.class, "type", mappings); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/Asset.java b/ce/src/main/java/org/thingsboard/client/model/Asset.java index d568ba6f..c8209537 100644 --- a/ce/src/main/java/org/thingsboard/client/model/Asset.java +++ b/ce/src/main/java/org/thingsboard/client/model/Asset.java @@ -44,14 +44,14 @@ @JsonPropertyOrder({ Asset.JSON_PROPERTY_ID, Asset.JSON_PROPERTY_CREATED_TIME, + Asset.JSON_PROPERTY_ADDITIONAL_INFO, Asset.JSON_PROPERTY_TENANT_ID, Asset.JSON_PROPERTY_CUSTOMER_ID, Asset.JSON_PROPERTY_NAME, Asset.JSON_PROPERTY_TYPE, Asset.JSON_PROPERTY_LABEL, Asset.JSON_PROPERTY_ASSET_PROFILE_ID, - Asset.JSON_PROPERTY_VERSION, - Asset.JSON_PROPERTY_ADDITIONAL_INFO + Asset.JSON_PROPERTY_VERSION }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") public class Asset { @@ -63,6 +63,10 @@ public class Asset { @Nullable private Long createdTime; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo; + public static final String JSON_PROPERTY_TENANT_ID = "tenantId"; @Nullable private TenantId tenantId; @@ -91,10 +95,6 @@ public class Asset { @Nullable private Long version; - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo; - public Asset() { } @@ -148,6 +148,30 @@ public Long getCreatedTime() { + public Asset additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * Additional parameters of the asset. May include: 'description' (string). + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + /** * JSON object with Tenant Id. * @return tenantId @@ -296,30 +320,6 @@ public void setVersion(@Nullable Long version) { } - public Asset additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - return this; - } - - /** - * Additional parameters of the asset. May include: 'description' (string). - * @return additionalInfo - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; - } - - - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - - /** * Return true if this Asset object is equal to o. */ @@ -334,19 +334,19 @@ public boolean equals(Object o) { Asset asset = (Asset) o; return Objects.equals(this.id, asset.id) && Objects.equals(this.createdTime, asset.createdTime) && + Objects.equals(this.additionalInfo, asset.additionalInfo) && Objects.equals(this.tenantId, asset.tenantId) && Objects.equals(this.customerId, asset.customerId) && Objects.equals(this.name, asset.name) && Objects.equals(this.type, asset.type) && Objects.equals(this.label, asset.label) && Objects.equals(this.assetProfileId, asset.assetProfileId) && - Objects.equals(this.version, asset.version) && - Objects.equals(this.additionalInfo, asset.additionalInfo); + Objects.equals(this.version, asset.version); } @Override public int hashCode() { - return Objects.hash(id, createdTime, tenantId, customerId, name, type, label, assetProfileId, version, additionalInfo); + return Objects.hash(id, createdTime, additionalInfo, tenantId, customerId, name, type, label, assetProfileId, version); } @Override @@ -355,6 +355,7 @@ public String toString() { sb.append("class Asset {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" tenantId: ").append(toIndentedString(tenantId)).append("\n"); sb.append(" customerId: ").append(toIndentedString(customerId)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); @@ -362,7 +363,6 @@ public String toString() { sb.append(" label: ").append(toIndentedString(label)).append("\n"); sb.append(" assetProfileId: ").append(toIndentedString(assetProfileId)).append("\n"); sb.append(" version: ").append(toIndentedString(version)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append("}"); return sb.toString(); } @@ -420,6 +420,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `tenantId` to the URL query string if (getTenantId() != null) { joiner.add(getTenantId().toUrlQueryString(prefix + "tenantId" + suffix)); @@ -455,11 +460,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sversion%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getVersion())))); } - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - return joiner.toString(); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/AssetInfo.java b/ce/src/main/java/org/thingsboard/client/model/AssetInfo.java index a974bd4b..4367660f 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AssetInfo.java +++ b/ce/src/main/java/org/thingsboard/client/model/AssetInfo.java @@ -44,6 +44,7 @@ @JsonPropertyOrder({ AssetInfo.JSON_PROPERTY_ID, AssetInfo.JSON_PROPERTY_CREATED_TIME, + AssetInfo.JSON_PROPERTY_ADDITIONAL_INFO, AssetInfo.JSON_PROPERTY_TENANT_ID, AssetInfo.JSON_PROPERTY_CUSTOMER_ID, AssetInfo.JSON_PROPERTY_NAME, @@ -53,8 +54,7 @@ AssetInfo.JSON_PROPERTY_VERSION, AssetInfo.JSON_PROPERTY_CUSTOMER_TITLE, AssetInfo.JSON_PROPERTY_CUSTOMER_IS_PUBLIC, - AssetInfo.JSON_PROPERTY_ASSET_PROFILE_NAME, - AssetInfo.JSON_PROPERTY_ADDITIONAL_INFO + AssetInfo.JSON_PROPERTY_ASSET_PROFILE_NAME }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") public class AssetInfo { @@ -66,6 +66,10 @@ public class AssetInfo { @Nullable private Long createdTime; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo; + public static final String JSON_PROPERTY_TENANT_ID = "tenantId"; @Nullable private TenantId tenantId; @@ -106,10 +110,6 @@ public class AssetInfo { @Nullable private String assetProfileName; - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo; - public AssetInfo() { } @@ -169,6 +169,30 @@ public Long getCreatedTime() { + public AssetInfo additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * Additional parameters of the asset. May include: 'description' (string). + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + /** * JSON object with Tenant Id. * @return tenantId @@ -359,30 +383,6 @@ public String getAssetProfileName() { - public AssetInfo additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - return this; - } - - /** - * Additional parameters of the asset. May include: 'description' (string). - * @return additionalInfo - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; - } - - - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - - /** * Return true if this AssetInfo object is equal to o. */ @@ -397,6 +397,7 @@ public boolean equals(Object o) { AssetInfo assetInfo = (AssetInfo) o; return Objects.equals(this.id, assetInfo.id) && Objects.equals(this.createdTime, assetInfo.createdTime) && + Objects.equals(this.additionalInfo, assetInfo.additionalInfo) && Objects.equals(this.tenantId, assetInfo.tenantId) && Objects.equals(this.customerId, assetInfo.customerId) && Objects.equals(this.name, assetInfo.name) && @@ -406,13 +407,12 @@ public boolean equals(Object o) { Objects.equals(this.version, assetInfo.version) && Objects.equals(this.customerTitle, assetInfo.customerTitle) && Objects.equals(this.customerIsPublic, assetInfo.customerIsPublic) && - Objects.equals(this.assetProfileName, assetInfo.assetProfileName) && - Objects.equals(this.additionalInfo, assetInfo.additionalInfo); + Objects.equals(this.assetProfileName, assetInfo.assetProfileName); } @Override public int hashCode() { - return Objects.hash(id, createdTime, tenantId, customerId, name, type, label, assetProfileId, version, customerTitle, customerIsPublic, assetProfileName, additionalInfo); + return Objects.hash(id, createdTime, additionalInfo, tenantId, customerId, name, type, label, assetProfileId, version, customerTitle, customerIsPublic, assetProfileName); } @Override @@ -421,6 +421,7 @@ public String toString() { sb.append("class AssetInfo {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" tenantId: ").append(toIndentedString(tenantId)).append("\n"); sb.append(" customerId: ").append(toIndentedString(customerId)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); @@ -431,7 +432,6 @@ public String toString() { sb.append(" customerTitle: ").append(toIndentedString(customerTitle)).append("\n"); sb.append(" customerIsPublic: ").append(toIndentedString(customerIsPublic)).append("\n"); sb.append(" assetProfileName: ").append(toIndentedString(assetProfileName)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append("}"); return sb.toString(); } @@ -489,6 +489,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `tenantId` to the URL query string if (getTenantId() != null) { joiner.add(getTenantId().toUrlQueryString(prefix + "tenantId" + suffix)); @@ -539,11 +544,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sassetProfileName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAssetProfileName())))); } - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - return joiner.toString(); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/ComponentDescriptor.java b/ce/src/main/java/org/thingsboard/client/model/ComponentDescriptor.java index 98991966..272a086b 100644 --- a/ce/src/main/java/org/thingsboard/client/model/ComponentDescriptor.java +++ b/ce/src/main/java/org/thingsboard/client/model/ComponentDescriptor.java @@ -48,10 +48,10 @@ ComponentDescriptor.JSON_PROPERTY_CLUSTERING_MODE, ComponentDescriptor.JSON_PROPERTY_NAME, ComponentDescriptor.JSON_PROPERTY_CLAZZ, + ComponentDescriptor.JSON_PROPERTY_CONFIGURATION_DESCRIPTOR, ComponentDescriptor.JSON_PROPERTY_CONFIGURATION_VERSION, ComponentDescriptor.JSON_PROPERTY_ACTIONS, - ComponentDescriptor.JSON_PROPERTY_HAS_QUEUE_NAME, - ComponentDescriptor.JSON_PROPERTY_CONFIGURATION_DESCRIPTOR + ComponentDescriptor.JSON_PROPERTY_HAS_QUEUE_NAME }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") public class ComponentDescriptor { @@ -83,6 +83,10 @@ public class ComponentDescriptor { @Nullable private String clazz; + public static final String JSON_PROPERTY_CONFIGURATION_DESCRIPTOR = "configurationDescriptor"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode configurationDescriptor = null; + public static final String JSON_PROPERTY_CONFIGURATION_VERSION = "configurationVersion"; @Nullable private Integer configurationVersion; @@ -95,10 +99,6 @@ public class ComponentDescriptor { @Nullable private Boolean hasQueueName; - public static final String JSON_PROPERTY_CONFIGURATION_DESCRIPTOR = "configurationDescriptor"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode configurationDescriptor = null; - public ComponentDescriptor() { } @@ -234,6 +234,30 @@ public String getClazz() { + public ComponentDescriptor configurationDescriptor(@Nullable com.fasterxml.jackson.databind.JsonNode configurationDescriptor) { + this.configurationDescriptor = configurationDescriptor; + return this; + } + + /** + * Get configurationDescriptor + * @return configurationDescriptor + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_CONFIGURATION_DESCRIPTOR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getConfigurationDescriptor() { + return configurationDescriptor; + } + + + @JsonProperty(value = JSON_PROPERTY_CONFIGURATION_DESCRIPTOR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setConfigurationDescriptor(@Nullable com.fasterxml.jackson.databind.JsonNode configurationDescriptor) { + this.configurationDescriptor = configurationDescriptor; + } + + /** * Rule node configuration version. By default, this value is 0. If the rule node is a versioned node, this value might be greater than 0. * @return configurationVersion @@ -276,30 +300,6 @@ public Boolean getHasQueueName() { - public ComponentDescriptor configurationDescriptor(@Nullable com.fasterxml.jackson.databind.JsonNode configurationDescriptor) { - this.configurationDescriptor = configurationDescriptor; - return this; - } - - /** - * Get configurationDescriptor - * @return configurationDescriptor - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_CONFIGURATION_DESCRIPTOR, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getConfigurationDescriptor() { - return configurationDescriptor; - } - - - @JsonProperty(value = JSON_PROPERTY_CONFIGURATION_DESCRIPTOR, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setConfigurationDescriptor(@Nullable com.fasterxml.jackson.databind.JsonNode configurationDescriptor) { - this.configurationDescriptor = configurationDescriptor; - } - - /** * Return true if this ComponentDescriptor object is equal to o. */ @@ -319,15 +319,15 @@ public boolean equals(Object o) { Objects.equals(this.clusteringMode, componentDescriptor.clusteringMode) && Objects.equals(this.name, componentDescriptor.name) && Objects.equals(this.clazz, componentDescriptor.clazz) && + Objects.equals(this.configurationDescriptor, componentDescriptor.configurationDescriptor) && Objects.equals(this.configurationVersion, componentDescriptor.configurationVersion) && Objects.equals(this.actions, componentDescriptor.actions) && - Objects.equals(this.hasQueueName, componentDescriptor.hasQueueName) && - Objects.equals(this.configurationDescriptor, componentDescriptor.configurationDescriptor); + Objects.equals(this.hasQueueName, componentDescriptor.hasQueueName); } @Override public int hashCode() { - return Objects.hash(id, createdTime, type, scope, clusteringMode, name, clazz, configurationVersion, actions, hasQueueName, configurationDescriptor); + return Objects.hash(id, createdTime, type, scope, clusteringMode, name, clazz, configurationDescriptor, configurationVersion, actions, hasQueueName); } @Override @@ -341,10 +341,10 @@ public String toString() { sb.append(" clusteringMode: ").append(toIndentedString(clusteringMode)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" clazz: ").append(toIndentedString(clazz)).append("\n"); + sb.append(" configurationDescriptor: ").append(toIndentedString(configurationDescriptor)).append("\n"); sb.append(" configurationVersion: ").append(toIndentedString(configurationVersion)).append("\n"); sb.append(" actions: ").append(toIndentedString(actions)).append("\n"); sb.append(" hasQueueName: ").append(toIndentedString(hasQueueName)).append("\n"); - sb.append(" configurationDescriptor: ").append(toIndentedString(configurationDescriptor)).append("\n"); sb.append("}"); return sb.toString(); } @@ -427,6 +427,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sclazz%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getClazz())))); } + // add `configurationDescriptor` to the URL query string + if (getConfigurationDescriptor() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sconfigurationDescriptor%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getConfigurationDescriptor())))); + } + // add `configurationVersion` to the URL query string if (getConfigurationVersion() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sconfigurationVersion%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getConfigurationVersion())))); @@ -442,11 +447,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%shasQueueName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getHasQueueName())))); } - // add `configurationDescriptor` to the URL query string - if (getConfigurationDescriptor() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sconfigurationDescriptor%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getConfigurationDescriptor())))); - } - return joiner.toString(); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleCustomTimeSchedule.java b/ce/src/main/java/org/thingsboard/client/model/CustomTimeSchedule.java similarity index 80% rename from ce/src/main/java/org/thingsboard/client/model/AlarmRuleCustomTimeSchedule.java rename to ce/src/main/java/org/thingsboard/client/model/CustomTimeSchedule.java index 2503ab6b..ae2912a9 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleCustomTimeSchedule.java +++ b/ce/src/main/java/org/thingsboard/client/model/CustomTimeSchedule.java @@ -34,19 +34,19 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.thingsboard.client.model.AlarmRuleCustomTimeScheduleItem; -import org.thingsboard.client.model.AlarmRuleSchedule; +import org.thingsboard.client.model.AlarmSchedule; +import org.thingsboard.client.model.CustomTimeScheduleItem; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.thingsboard.client.JSON; import org.thingsboard.client.ApiClient; /** - * AlarmRuleCustomTimeSchedule + * CustomTimeSchedule */ @JsonPropertyOrder({ - AlarmRuleCustomTimeSchedule.JSON_PROPERTY_ITEMS, - AlarmRuleCustomTimeSchedule.JSON_PROPERTY_TIMEZONE + CustomTimeSchedule.JSON_PROPERTY_TIMEZONE, + CustomTimeSchedule.JSON_PROPERTY_ITEMS }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @JsonIgnoreProperties( @@ -55,76 +55,76 @@ ) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = true) -public class AlarmRuleCustomTimeSchedule extends AlarmRuleSchedule { - public static final String JSON_PROPERTY_ITEMS = "items"; - @Nullable - private List items = new ArrayList<>(); - +public class CustomTimeSchedule extends AlarmSchedule { public static final String JSON_PROPERTY_TIMEZONE = "timezone"; @Nullable private String timezone; - public AlarmRuleCustomTimeSchedule() { - } + public static final String JSON_PROPERTY_ITEMS = "items"; + @Nullable + private List items = new ArrayList<>(); - public AlarmRuleCustomTimeSchedule items(@Nullable List items) { - this.items = items; - return this; + public CustomTimeSchedule() { } - public AlarmRuleCustomTimeSchedule addItemsItem(AlarmRuleCustomTimeScheduleItem itemsItem) { - if (this.items == null) { - this.items = new ArrayList<>(); - } - this.items.add(itemsItem); + public CustomTimeSchedule timezone(@Nullable String timezone) { + this.timezone = timezone; return this; } /** - * Get items - * @return items + * Get timezone + * @return timezone */ @Nullable - @JsonProperty(value = JSON_PROPERTY_ITEMS, required = false) + @JsonProperty(value = JSON_PROPERTY_TIMEZONE, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public List getItems() { - return items; + public String getTimezone() { + return timezone; } - @JsonProperty(value = JSON_PROPERTY_ITEMS, required = false) + @JsonProperty(value = JSON_PROPERTY_TIMEZONE, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setItems(@Nullable List items) { - this.items = items; + public void setTimezone(@Nullable String timezone) { + this.timezone = timezone; } - public AlarmRuleCustomTimeSchedule timezone(@Nullable String timezone) { - this.timezone = timezone; + public CustomTimeSchedule items(@Nullable List items) { + this.items = items; + return this; + } + + public CustomTimeSchedule addItemsItem(CustomTimeScheduleItem itemsItem) { + if (this.items == null) { + this.items = new ArrayList<>(); + } + this.items.add(itemsItem); return this; } /** - * Get timezone - * @return timezone + * Get items + * @return items */ @Nullable - @JsonProperty(value = JSON_PROPERTY_TIMEZONE, required = false) + @JsonProperty(value = JSON_PROPERTY_ITEMS, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getTimezone() { - return timezone; + public List getItems() { + return items; } - @JsonProperty(value = JSON_PROPERTY_TIMEZONE, required = false) + @JsonProperty(value = JSON_PROPERTY_ITEMS, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setTimezone(@Nullable String timezone) { - this.timezone = timezone; + public void setItems(@Nullable List items) { + this.items = items; } /** - * Return true if this AlarmRuleCustomTimeSchedule object is equal to o. + * Return true if this CustomTimeSchedule object is equal to o. */ @Override public boolean equals(Object o) { @@ -134,24 +134,24 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - AlarmRuleCustomTimeSchedule alarmRuleCustomTimeSchedule = (AlarmRuleCustomTimeSchedule) o; - return Objects.equals(this.items, alarmRuleCustomTimeSchedule.items) && - Objects.equals(this.timezone, alarmRuleCustomTimeSchedule.timezone) && + CustomTimeSchedule customTimeSchedule = (CustomTimeSchedule) o; + return Objects.equals(this.timezone, customTimeSchedule.timezone) && + Objects.equals(this.items, customTimeSchedule.items) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(items, timezone, super.hashCode()); + return Objects.hash(timezone, items, super.hashCode()); } @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class AlarmRuleCustomTimeSchedule {\n"); + sb.append("class CustomTimeSchedule {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" items: ").append(toIndentedString(items)).append("\n"); sb.append(" timezone: ").append(toIndentedString(timezone)).append("\n"); + sb.append(" items: ").append(toIndentedString(items)).append("\n"); sb.append("}"); return sb.toString(); } @@ -204,6 +204,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%stype%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getType())))); } + // add `timezone` to the URL query string + if (getTimezone() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%stimezone%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getTimezone())))); + } + // add `items` to the URL query string if (getItems() != null) { for (int i = 0; i < getItems().size(); i++) { @@ -214,18 +219,13 @@ public String toUrlQueryString(String prefix) { } } - // add `timezone` to the URL query string - if (getTimezone() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%stimezone%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getTimezone())))); - } - return joiner.toString(); } static { // Initialize and register the discriminator mappings. Map> mappings = new HashMap>(); - mappings.put("AlarmRuleCustomTimeSchedule", AlarmRuleCustomTimeSchedule.class); - JSON.registerDiscriminator(AlarmRuleCustomTimeSchedule.class, "type", mappings); + mappings.put("CustomTimeSchedule", CustomTimeSchedule.class); + JSON.registerDiscriminator(CustomTimeSchedule.class, "type", mappings); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleCustomTimeScheduleItem.java b/ce/src/main/java/org/thingsboard/client/model/CustomTimeScheduleItem.java similarity index 83% rename from ce/src/main/java/org/thingsboard/client/model/AlarmRuleCustomTimeScheduleItem.java rename to ce/src/main/java/org/thingsboard/client/model/CustomTimeScheduleItem.java index 1152ea55..0e0bf890 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleCustomTimeScheduleItem.java +++ b/ce/src/main/java/org/thingsboard/client/model/CustomTimeScheduleItem.java @@ -34,60 +34,36 @@ import org.thingsboard.client.ApiClient; /** - * AlarmRuleCustomTimeScheduleItem + * CustomTimeScheduleItem */ @JsonPropertyOrder({ - AlarmRuleCustomTimeScheduleItem.JSON_PROPERTY_DAY_OF_WEEK, - AlarmRuleCustomTimeScheduleItem.JSON_PROPERTY_ENABLED, - AlarmRuleCustomTimeScheduleItem.JSON_PROPERTY_ENDS_ON, - AlarmRuleCustomTimeScheduleItem.JSON_PROPERTY_STARTS_ON + CustomTimeScheduleItem.JSON_PROPERTY_ENABLED, + CustomTimeScheduleItem.JSON_PROPERTY_DAY_OF_WEEK, + CustomTimeScheduleItem.JSON_PROPERTY_STARTS_ON, + CustomTimeScheduleItem.JSON_PROPERTY_ENDS_ON }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") -public class AlarmRuleCustomTimeScheduleItem { - public static final String JSON_PROPERTY_DAY_OF_WEEK = "dayOfWeek"; - @Nullable - private Integer dayOfWeek; - +public class CustomTimeScheduleItem { public static final String JSON_PROPERTY_ENABLED = "enabled"; @Nullable private Boolean enabled; - public static final String JSON_PROPERTY_ENDS_ON = "endsOn"; + public static final String JSON_PROPERTY_DAY_OF_WEEK = "dayOfWeek"; @Nullable - private Long endsOn; + private Integer dayOfWeek; public static final String JSON_PROPERTY_STARTS_ON = "startsOn"; @Nullable private Long startsOn; - public AlarmRuleCustomTimeScheduleItem() { - } - - public AlarmRuleCustomTimeScheduleItem dayOfWeek(@Nullable Integer dayOfWeek) { - this.dayOfWeek = dayOfWeek; - return this; - } - - /** - * Get dayOfWeek - * @return dayOfWeek - */ + public static final String JSON_PROPERTY_ENDS_ON = "endsOn"; @Nullable - @JsonProperty(value = JSON_PROPERTY_DAY_OF_WEEK, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Integer getDayOfWeek() { - return dayOfWeek; - } - + private Long endsOn; - @JsonProperty(value = JSON_PROPERTY_DAY_OF_WEEK, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDayOfWeek(@Nullable Integer dayOfWeek) { - this.dayOfWeek = dayOfWeek; + public CustomTimeScheduleItem() { } - - public AlarmRuleCustomTimeScheduleItem enabled(@Nullable Boolean enabled) { + public CustomTimeScheduleItem enabled(@Nullable Boolean enabled) { this.enabled = enabled; return this; } @@ -111,31 +87,31 @@ public void setEnabled(@Nullable Boolean enabled) { } - public AlarmRuleCustomTimeScheduleItem endsOn(@Nullable Long endsOn) { - this.endsOn = endsOn; + public CustomTimeScheduleItem dayOfWeek(@Nullable Integer dayOfWeek) { + this.dayOfWeek = dayOfWeek; return this; } /** - * Get endsOn - * @return endsOn + * Get dayOfWeek + * @return dayOfWeek */ @Nullable - @JsonProperty(value = JSON_PROPERTY_ENDS_ON, required = false) + @JsonProperty(value = JSON_PROPERTY_DAY_OF_WEEK, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Long getEndsOn() { - return endsOn; + public Integer getDayOfWeek() { + return dayOfWeek; } - @JsonProperty(value = JSON_PROPERTY_ENDS_ON, required = false) + @JsonProperty(value = JSON_PROPERTY_DAY_OF_WEEK, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setEndsOn(@Nullable Long endsOn) { - this.endsOn = endsOn; + public void setDayOfWeek(@Nullable Integer dayOfWeek) { + this.dayOfWeek = dayOfWeek; } - public AlarmRuleCustomTimeScheduleItem startsOn(@Nullable Long startsOn) { + public CustomTimeScheduleItem startsOn(@Nullable Long startsOn) { this.startsOn = startsOn; return this; } @@ -159,8 +135,32 @@ public void setStartsOn(@Nullable Long startsOn) { } + public CustomTimeScheduleItem endsOn(@Nullable Long endsOn) { + this.endsOn = endsOn; + return this; + } + + /** + * Get endsOn + * @return endsOn + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ENDS_ON, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long getEndsOn() { + return endsOn; + } + + + @JsonProperty(value = JSON_PROPERTY_ENDS_ON, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setEndsOn(@Nullable Long endsOn) { + this.endsOn = endsOn; + } + + /** - * Return true if this AlarmRuleCustomTimeScheduleItem object is equal to o. + * Return true if this CustomTimeScheduleItem object is equal to o. */ @Override public boolean equals(Object o) { @@ -170,26 +170,26 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - AlarmRuleCustomTimeScheduleItem alarmRuleCustomTimeScheduleItem = (AlarmRuleCustomTimeScheduleItem) o; - return Objects.equals(this.dayOfWeek, alarmRuleCustomTimeScheduleItem.dayOfWeek) && - Objects.equals(this.enabled, alarmRuleCustomTimeScheduleItem.enabled) && - Objects.equals(this.endsOn, alarmRuleCustomTimeScheduleItem.endsOn) && - Objects.equals(this.startsOn, alarmRuleCustomTimeScheduleItem.startsOn); + CustomTimeScheduleItem customTimeScheduleItem = (CustomTimeScheduleItem) o; + return Objects.equals(this.enabled, customTimeScheduleItem.enabled) && + Objects.equals(this.dayOfWeek, customTimeScheduleItem.dayOfWeek) && + Objects.equals(this.startsOn, customTimeScheduleItem.startsOn) && + Objects.equals(this.endsOn, customTimeScheduleItem.endsOn); } @Override public int hashCode() { - return Objects.hash(dayOfWeek, enabled, endsOn, startsOn); + return Objects.hash(enabled, dayOfWeek, startsOn, endsOn); } @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class AlarmRuleCustomTimeScheduleItem {\n"); - sb.append(" dayOfWeek: ").append(toIndentedString(dayOfWeek)).append("\n"); + sb.append("class CustomTimeScheduleItem {\n"); sb.append(" enabled: ").append(toIndentedString(enabled)).append("\n"); - sb.append(" endsOn: ").append(toIndentedString(endsOn)).append("\n"); + sb.append(" dayOfWeek: ").append(toIndentedString(dayOfWeek)).append("\n"); sb.append(" startsOn: ").append(toIndentedString(startsOn)).append("\n"); + sb.append(" endsOn: ").append(toIndentedString(endsOn)).append("\n"); sb.append("}"); return sb.toString(); } @@ -237,19 +237,14 @@ public String toUrlQueryString(String prefix) { StringJoiner joiner = new StringJoiner("&"); - // add `dayOfWeek` to the URL query string - if (getDayOfWeek() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sdayOfWeek%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDayOfWeek())))); - } - // add `enabled` to the URL query string if (getEnabled() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%senabled%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEnabled())))); } - // add `endsOn` to the URL query string - if (getEndsOn() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sendsOn%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEndsOn())))); + // add `dayOfWeek` to the URL query string + if (getDayOfWeek() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sdayOfWeek%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDayOfWeek())))); } // add `startsOn` to the URL query string @@ -257,6 +252,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sstartsOn%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getStartsOn())))); } + // add `endsOn` to the URL query string + if (getEndsOn() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sendsOn%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEndsOn())))); + } + return joiner.toString(); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/Customer.java b/ce/src/main/java/org/thingsboard/client/model/Customer.java index 2dfa061a..a93a9560 100644 --- a/ce/src/main/java/org/thingsboard/client/model/Customer.java +++ b/ce/src/main/java/org/thingsboard/client/model/Customer.java @@ -42,6 +42,7 @@ @JsonPropertyOrder({ Customer.JSON_PROPERTY_ID, Customer.JSON_PROPERTY_CREATED_TIME, + Customer.JSON_PROPERTY_ADDITIONAL_INFO, Customer.JSON_PROPERTY_COUNTRY, Customer.JSON_PROPERTY_STATE, Customer.JSON_PROPERTY_CITY, @@ -53,7 +54,6 @@ Customer.JSON_PROPERTY_TITLE, Customer.JSON_PROPERTY_TENANT_ID, Customer.JSON_PROPERTY_VERSION, - Customer.JSON_PROPERTY_ADDITIONAL_INFO, Customer.JSON_PROPERTY_NAME }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @@ -66,6 +66,10 @@ public class Customer { @Nullable private Long createdTime; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo; + public static final String JSON_PROPERTY_COUNTRY = "country"; @Nullable private String country; @@ -110,10 +114,6 @@ public class Customer { @Nullable private Long version; - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo; - public static final String JSON_PROPERTY_NAME = "name"; @Nullable private String name; @@ -169,6 +169,30 @@ public Long getCreatedTime() { + public Customer additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * Additional parameters of the customer. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar), 'isPublic' (boolean, whether this is a public customer). + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + public Customer country(@Nullable String country) { this.country = country; return this; @@ -433,30 +457,6 @@ public void setVersion(@Nullable Long version) { } - public Customer additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - return this; - } - - /** - * Additional parameters of the customer. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar), 'isPublic' (boolean, whether this is a public customer). - * @return additionalInfo - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; - } - - - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - - /** * Name of the customer. Read-only, duplicated from title for backward compatibility * @return name @@ -485,6 +485,7 @@ public boolean equals(Object o) { Customer customer = (Customer) o; return Objects.equals(this.id, customer.id) && Objects.equals(this.createdTime, customer.createdTime) && + Objects.equals(this.additionalInfo, customer.additionalInfo) && Objects.equals(this.country, customer.country) && Objects.equals(this.state, customer.state) && Objects.equals(this.city, customer.city) && @@ -496,13 +497,12 @@ public boolean equals(Object o) { Objects.equals(this.title, customer.title) && Objects.equals(this.tenantId, customer.tenantId) && Objects.equals(this.version, customer.version) && - Objects.equals(this.additionalInfo, customer.additionalInfo) && Objects.equals(this.name, customer.name); } @Override public int hashCode() { - return Objects.hash(id, createdTime, country, state, city, address, address2, zip, phone, email, title, tenantId, version, additionalInfo, name); + return Objects.hash(id, createdTime, additionalInfo, country, state, city, address, address2, zip, phone, email, title, tenantId, version, name); } @Override @@ -511,6 +511,7 @@ public String toString() { sb.append("class Customer {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" country: ").append(toIndentedString(country)).append("\n"); sb.append(" state: ").append(toIndentedString(state)).append("\n"); sb.append(" city: ").append(toIndentedString(city)).append("\n"); @@ -522,7 +523,6 @@ public String toString() { sb.append(" title: ").append(toIndentedString(title)).append("\n"); sb.append(" tenantId: ").append(toIndentedString(tenantId)).append("\n"); sb.append(" version: ").append(toIndentedString(version)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append("}"); return sb.toString(); @@ -581,6 +581,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `country` to the URL query string if (getCountry() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%scountry%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCountry())))); @@ -636,11 +641,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sversion%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getVersion())))); } - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - // add `name` to the URL query string if (getName() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); diff --git a/ce/src/main/java/org/thingsboard/client/model/Device.java b/ce/src/main/java/org/thingsboard/client/model/Device.java index d32beac7..7d09a400 100644 --- a/ce/src/main/java/org/thingsboard/client/model/Device.java +++ b/ce/src/main/java/org/thingsboard/client/model/Device.java @@ -46,17 +46,17 @@ @JsonPropertyOrder({ Device.JSON_PROPERTY_ID, Device.JSON_PROPERTY_CREATED_TIME, + Device.JSON_PROPERTY_ADDITIONAL_INFO, Device.JSON_PROPERTY_TENANT_ID, Device.JSON_PROPERTY_CUSTOMER_ID, Device.JSON_PROPERTY_NAME, Device.JSON_PROPERTY_TYPE, Device.JSON_PROPERTY_LABEL, Device.JSON_PROPERTY_DEVICE_PROFILE_ID, + Device.JSON_PROPERTY_DEVICE_DATA, Device.JSON_PROPERTY_FIRMWARE_ID, Device.JSON_PROPERTY_SOFTWARE_ID, - Device.JSON_PROPERTY_VERSION, - Device.JSON_PROPERTY_ADDITIONAL_INFO, - Device.JSON_PROPERTY_DEVICE_DATA + Device.JSON_PROPERTY_VERSION }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") public class Device { @@ -68,6 +68,10 @@ public class Device { @Nullable private Long createdTime; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo; + public static final String JSON_PROPERTY_TENANT_ID = "tenantId"; @Nullable private TenantId tenantId; @@ -92,6 +96,10 @@ public class Device { @Nullable private DeviceProfileId deviceProfileId; + public static final String JSON_PROPERTY_DEVICE_DATA = "deviceData"; + @Nullable + private DeviceData deviceData; + public static final String JSON_PROPERTY_FIRMWARE_ID = "firmwareId"; @Nullable private OtaPackageId firmwareId; @@ -104,14 +112,6 @@ public class Device { @Nullable private Long version; - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo; - - public static final String JSON_PROPERTY_DEVICE_DATA = "deviceData"; - @Nullable - private DeviceData deviceData; - public Device() { } @@ -165,6 +165,30 @@ public Long getCreatedTime() { + public Device additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device). + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + /** * JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id. * @return tenantId @@ -289,6 +313,30 @@ public void setDeviceProfileId(@Nullable DeviceProfileId deviceProfileId) { } + public Device deviceData(@Nullable DeviceData deviceData) { + this.deviceData = deviceData; + return this; + } + + /** + * JSON object with content specific to type of transport in the device profile. + * @return deviceData + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_DEVICE_DATA, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public DeviceData getDeviceData() { + return deviceData; + } + + + @JsonProperty(value = JSON_PROPERTY_DEVICE_DATA, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setDeviceData(@Nullable DeviceData deviceData) { + this.deviceData = deviceData; + } + + public Device firmwareId(@Nullable OtaPackageId firmwareId) { this.firmwareId = firmwareId; return this; @@ -361,54 +409,6 @@ public void setVersion(@Nullable Long version) { } - public Device additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - return this; - } - - /** - * Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device). - * @return additionalInfo - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; - } - - - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - - - public Device deviceData(@Nullable DeviceData deviceData) { - this.deviceData = deviceData; - return this; - } - - /** - * JSON object with content specific to type of transport in the device profile. - * @return deviceData - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_DEVICE_DATA, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public DeviceData getDeviceData() { - return deviceData; - } - - - @JsonProperty(value = JSON_PROPERTY_DEVICE_DATA, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDeviceData(@Nullable DeviceData deviceData) { - this.deviceData = deviceData; - } - - /** * Return true if this Device object is equal to o. */ @@ -423,22 +423,22 @@ public boolean equals(Object o) { Device device = (Device) o; return Objects.equals(this.id, device.id) && Objects.equals(this.createdTime, device.createdTime) && + Objects.equals(this.additionalInfo, device.additionalInfo) && Objects.equals(this.tenantId, device.tenantId) && Objects.equals(this.customerId, device.customerId) && Objects.equals(this.name, device.name) && Objects.equals(this.type, device.type) && Objects.equals(this.label, device.label) && Objects.equals(this.deviceProfileId, device.deviceProfileId) && + Objects.equals(this.deviceData, device.deviceData) && Objects.equals(this.firmwareId, device.firmwareId) && Objects.equals(this.softwareId, device.softwareId) && - Objects.equals(this.version, device.version) && - Objects.equals(this.additionalInfo, device.additionalInfo) && - Objects.equals(this.deviceData, device.deviceData); + Objects.equals(this.version, device.version); } @Override public int hashCode() { - return Objects.hash(id, createdTime, tenantId, customerId, name, type, label, deviceProfileId, firmwareId, softwareId, version, additionalInfo, deviceData); + return Objects.hash(id, createdTime, additionalInfo, tenantId, customerId, name, type, label, deviceProfileId, deviceData, firmwareId, softwareId, version); } @Override @@ -447,17 +447,17 @@ public String toString() { sb.append("class Device {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" tenantId: ").append(toIndentedString(tenantId)).append("\n"); sb.append(" customerId: ").append(toIndentedString(customerId)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); sb.append(" label: ").append(toIndentedString(label)).append("\n"); sb.append(" deviceProfileId: ").append(toIndentedString(deviceProfileId)).append("\n"); + sb.append(" deviceData: ").append(toIndentedString(deviceData)).append("\n"); sb.append(" firmwareId: ").append(toIndentedString(firmwareId)).append("\n"); sb.append(" softwareId: ").append(toIndentedString(softwareId)).append("\n"); sb.append(" version: ").append(toIndentedString(version)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); - sb.append(" deviceData: ").append(toIndentedString(deviceData)).append("\n"); sb.append("}"); return sb.toString(); } @@ -515,6 +515,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `tenantId` to the URL query string if (getTenantId() != null) { joiner.add(getTenantId().toUrlQueryString(prefix + "tenantId" + suffix)); @@ -545,6 +550,11 @@ public String toUrlQueryString(String prefix) { joiner.add(getDeviceProfileId().toUrlQueryString(prefix + "deviceProfileId" + suffix)); } + // add `deviceData` to the URL query string + if (getDeviceData() != null) { + joiner.add(getDeviceData().toUrlQueryString(prefix + "deviceData" + suffix)); + } + // add `firmwareId` to the URL query string if (getFirmwareId() != null) { joiner.add(getFirmwareId().toUrlQueryString(prefix + "firmwareId" + suffix)); @@ -560,16 +570,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sversion%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getVersion())))); } - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - - // add `deviceData` to the URL query string - if (getDeviceData() != null) { - joiner.add(getDeviceData().toUrlQueryString(prefix + "deviceData" + suffix)); - } - return joiner.toString(); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/DeviceInfo.java b/ce/src/main/java/org/thingsboard/client/model/DeviceInfo.java index c6c1970b..de1bcb4f 100644 --- a/ce/src/main/java/org/thingsboard/client/model/DeviceInfo.java +++ b/ce/src/main/java/org/thingsboard/client/model/DeviceInfo.java @@ -46,21 +46,21 @@ @JsonPropertyOrder({ DeviceInfo.JSON_PROPERTY_ID, DeviceInfo.JSON_PROPERTY_CREATED_TIME, + DeviceInfo.JSON_PROPERTY_ADDITIONAL_INFO, DeviceInfo.JSON_PROPERTY_TENANT_ID, DeviceInfo.JSON_PROPERTY_CUSTOMER_ID, DeviceInfo.JSON_PROPERTY_NAME, DeviceInfo.JSON_PROPERTY_TYPE, DeviceInfo.JSON_PROPERTY_LABEL, DeviceInfo.JSON_PROPERTY_DEVICE_PROFILE_ID, + DeviceInfo.JSON_PROPERTY_DEVICE_DATA, DeviceInfo.JSON_PROPERTY_FIRMWARE_ID, DeviceInfo.JSON_PROPERTY_SOFTWARE_ID, DeviceInfo.JSON_PROPERTY_VERSION, DeviceInfo.JSON_PROPERTY_CUSTOMER_TITLE, DeviceInfo.JSON_PROPERTY_CUSTOMER_IS_PUBLIC, DeviceInfo.JSON_PROPERTY_DEVICE_PROFILE_NAME, - DeviceInfo.JSON_PROPERTY_ACTIVE, - DeviceInfo.JSON_PROPERTY_ADDITIONAL_INFO, - DeviceInfo.JSON_PROPERTY_DEVICE_DATA + DeviceInfo.JSON_PROPERTY_ACTIVE }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") public class DeviceInfo { @@ -72,6 +72,10 @@ public class DeviceInfo { @Nullable private Long createdTime; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo; + public static final String JSON_PROPERTY_TENANT_ID = "tenantId"; @Nullable private TenantId tenantId; @@ -96,6 +100,10 @@ public class DeviceInfo { @Nullable private DeviceProfileId deviceProfileId; + public static final String JSON_PROPERTY_DEVICE_DATA = "deviceData"; + @Nullable + private DeviceData deviceData; + public static final String JSON_PROPERTY_FIRMWARE_ID = "firmwareId"; @Nullable private OtaPackageId firmwareId; @@ -124,14 +132,6 @@ public class DeviceInfo { @Nullable private Boolean active; - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo; - - public static final String JSON_PROPERTY_DEVICE_DATA = "deviceData"; - @Nullable - private DeviceData deviceData; - public DeviceInfo() { } @@ -193,6 +193,30 @@ public Long getCreatedTime() { + public DeviceInfo additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device). + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + /** * JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id. * @return tenantId @@ -317,6 +341,30 @@ public void setDeviceProfileId(@Nullable DeviceProfileId deviceProfileId) { } + public DeviceInfo deviceData(@Nullable DeviceData deviceData) { + this.deviceData = deviceData; + return this; + } + + /** + * JSON object with content specific to type of transport in the device profile. + * @return deviceData + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_DEVICE_DATA, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public DeviceData getDeviceData() { + return deviceData; + } + + + @JsonProperty(value = JSON_PROPERTY_DEVICE_DATA, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setDeviceData(@Nullable DeviceData deviceData) { + this.deviceData = deviceData; + } + + public DeviceInfo firmwareId(@Nullable OtaPackageId firmwareId) { this.firmwareId = firmwareId; return this; @@ -445,54 +493,6 @@ public Boolean getActive() { - public DeviceInfo additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - return this; - } - - /** - * Additional parameters of the device. May include: 'gateway' (boolean, whether the device is a gateway), 'description' (string), 'lastConnectedGateway' (string, UUID of the last gateway that connected this device). - * @return additionalInfo - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; - } - - - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - - - public DeviceInfo deviceData(@Nullable DeviceData deviceData) { - this.deviceData = deviceData; - return this; - } - - /** - * JSON object with content specific to type of transport in the device profile. - * @return deviceData - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_DEVICE_DATA, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public DeviceData getDeviceData() { - return deviceData; - } - - - @JsonProperty(value = JSON_PROPERTY_DEVICE_DATA, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setDeviceData(@Nullable DeviceData deviceData) { - this.deviceData = deviceData; - } - - /** * Return true if this DeviceInfo object is equal to o. */ @@ -507,26 +507,26 @@ public boolean equals(Object o) { DeviceInfo deviceInfo = (DeviceInfo) o; return Objects.equals(this.id, deviceInfo.id) && Objects.equals(this.createdTime, deviceInfo.createdTime) && + Objects.equals(this.additionalInfo, deviceInfo.additionalInfo) && Objects.equals(this.tenantId, deviceInfo.tenantId) && Objects.equals(this.customerId, deviceInfo.customerId) && Objects.equals(this.name, deviceInfo.name) && Objects.equals(this.type, deviceInfo.type) && Objects.equals(this.label, deviceInfo.label) && Objects.equals(this.deviceProfileId, deviceInfo.deviceProfileId) && + Objects.equals(this.deviceData, deviceInfo.deviceData) && Objects.equals(this.firmwareId, deviceInfo.firmwareId) && Objects.equals(this.softwareId, deviceInfo.softwareId) && Objects.equals(this.version, deviceInfo.version) && Objects.equals(this.customerTitle, deviceInfo.customerTitle) && Objects.equals(this.customerIsPublic, deviceInfo.customerIsPublic) && Objects.equals(this.deviceProfileName, deviceInfo.deviceProfileName) && - Objects.equals(this.active, deviceInfo.active) && - Objects.equals(this.additionalInfo, deviceInfo.additionalInfo) && - Objects.equals(this.deviceData, deviceInfo.deviceData); + Objects.equals(this.active, deviceInfo.active); } @Override public int hashCode() { - return Objects.hash(id, createdTime, tenantId, customerId, name, type, label, deviceProfileId, firmwareId, softwareId, version, customerTitle, customerIsPublic, deviceProfileName, active, additionalInfo, deviceData); + return Objects.hash(id, createdTime, additionalInfo, tenantId, customerId, name, type, label, deviceProfileId, deviceData, firmwareId, softwareId, version, customerTitle, customerIsPublic, deviceProfileName, active); } @Override @@ -535,12 +535,14 @@ public String toString() { sb.append("class DeviceInfo {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" tenantId: ").append(toIndentedString(tenantId)).append("\n"); sb.append(" customerId: ").append(toIndentedString(customerId)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); sb.append(" label: ").append(toIndentedString(label)).append("\n"); sb.append(" deviceProfileId: ").append(toIndentedString(deviceProfileId)).append("\n"); + sb.append(" deviceData: ").append(toIndentedString(deviceData)).append("\n"); sb.append(" firmwareId: ").append(toIndentedString(firmwareId)).append("\n"); sb.append(" softwareId: ").append(toIndentedString(softwareId)).append("\n"); sb.append(" version: ").append(toIndentedString(version)).append("\n"); @@ -548,8 +550,6 @@ public String toString() { sb.append(" customerIsPublic: ").append(toIndentedString(customerIsPublic)).append("\n"); sb.append(" deviceProfileName: ").append(toIndentedString(deviceProfileName)).append("\n"); sb.append(" active: ").append(toIndentedString(active)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); - sb.append(" deviceData: ").append(toIndentedString(deviceData)).append("\n"); sb.append("}"); return sb.toString(); } @@ -607,6 +607,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `tenantId` to the URL query string if (getTenantId() != null) { joiner.add(getTenantId().toUrlQueryString(prefix + "tenantId" + suffix)); @@ -637,6 +642,11 @@ public String toUrlQueryString(String prefix) { joiner.add(getDeviceProfileId().toUrlQueryString(prefix + "deviceProfileId" + suffix)); } + // add `deviceData` to the URL query string + if (getDeviceData() != null) { + joiner.add(getDeviceData().toUrlQueryString(prefix + "deviceData" + suffix)); + } + // add `firmwareId` to the URL query string if (getFirmwareId() != null) { joiner.add(getFirmwareId().toUrlQueryString(prefix + "firmwareId" + suffix)); @@ -672,16 +682,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sactive%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getActive())))); } - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - - // add `deviceData` to the URL query string - if (getDeviceData() != null) { - joiner.add(getDeviceData().toUrlQueryString(prefix + "deviceData" + suffix)); - } - return joiner.toString(); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/DeviceProfile.java b/ce/src/main/java/org/thingsboard/client/model/DeviceProfile.java index 8dab2aa5..e148d2d9 100644 --- a/ce/src/main/java/org/thingsboard/client/model/DeviceProfile.java +++ b/ce/src/main/java/org/thingsboard/client/model/DeviceProfile.java @@ -58,13 +58,13 @@ DeviceProfile.JSON_PROPERTY_DEFAULT_RULE_CHAIN_ID, DeviceProfile.JSON_PROPERTY_DEFAULT_DASHBOARD_ID, DeviceProfile.JSON_PROPERTY_DEFAULT_QUEUE_NAME, + DeviceProfile.JSON_PROPERTY_PROFILE_DATA, DeviceProfile.JSON_PROPERTY_PROVISION_DEVICE_KEY, DeviceProfile.JSON_PROPERTY_FIRMWARE_ID, DeviceProfile.JSON_PROPERTY_SOFTWARE_ID, DeviceProfile.JSON_PROPERTY_DEFAULT_EDGE_RULE_CHAIN_ID, DeviceProfile.JSON_PROPERTY_VERSION, - DeviceProfile.JSON_PROPERTY_DEFAULT, - DeviceProfile.JSON_PROPERTY_PROFILE_DATA + DeviceProfile.JSON_PROPERTY_DEFAULT }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") public class DeviceProfile { @@ -116,6 +116,10 @@ public class DeviceProfile { @Nullable private String defaultQueueName; + public static final String JSON_PROPERTY_PROFILE_DATA = "profileData"; + @Nullable + private DeviceProfileData profileData; + public static final String JSON_PROPERTY_PROVISION_DEVICE_KEY = "provisionDeviceKey"; @Nullable private String provisionDeviceKey; @@ -140,10 +144,6 @@ public class DeviceProfile { @Nullable private Boolean _default; - public static final String JSON_PROPERTY_PROFILE_DATA = "profileData"; - @Nullable - private DeviceProfileData profileData; - public DeviceProfile() { } @@ -425,6 +425,30 @@ public void setDefaultQueueName(@Nullable String defaultQueueName) { } + public DeviceProfile profileData(@Nullable DeviceProfileData profileData) { + this.profileData = profileData; + return this; + } + + /** + * Complex JSON object that includes addition device profile configuration (transport, alarm rules, etc). + * @return profileData + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_PROFILE_DATA, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public DeviceProfileData getProfileData() { + return profileData; + } + + + @JsonProperty(value = JSON_PROPERTY_PROFILE_DATA, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setProfileData(@Nullable DeviceProfileData profileData) { + this.profileData = profileData; + } + + public DeviceProfile provisionDeviceKey(@Nullable String provisionDeviceKey) { this.provisionDeviceKey = provisionDeviceKey; return this; @@ -569,30 +593,6 @@ public void setDefault(@Nullable Boolean _default) { } - public DeviceProfile profileData(@Nullable DeviceProfileData profileData) { - this.profileData = profileData; - return this; - } - - /** - * Complex JSON object that includes addition device profile configuration (transport, alarm rules, etc). - * @return profileData - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_PROFILE_DATA, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public DeviceProfileData getProfileData() { - return profileData; - } - - - @JsonProperty(value = JSON_PROPERTY_PROFILE_DATA, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setProfileData(@Nullable DeviceProfileData profileData) { - this.profileData = profileData; - } - - /** * Return true if this DeviceProfile object is equal to o. */ @@ -617,18 +617,18 @@ public boolean equals(Object o) { Objects.equals(this.defaultRuleChainId, deviceProfile.defaultRuleChainId) && Objects.equals(this.defaultDashboardId, deviceProfile.defaultDashboardId) && Objects.equals(this.defaultQueueName, deviceProfile.defaultQueueName) && + Objects.equals(this.profileData, deviceProfile.profileData) && Objects.equals(this.provisionDeviceKey, deviceProfile.provisionDeviceKey) && Objects.equals(this.firmwareId, deviceProfile.firmwareId) && Objects.equals(this.softwareId, deviceProfile.softwareId) && Objects.equals(this.defaultEdgeRuleChainId, deviceProfile.defaultEdgeRuleChainId) && Objects.equals(this.version, deviceProfile.version) && - Objects.equals(this._default, deviceProfile._default) && - Objects.equals(this.profileData, deviceProfile.profileData); + Objects.equals(this._default, deviceProfile._default); } @Override public int hashCode() { - return Objects.hash(id, createdTime, tenantId, name, description, image, type, transportType, provisionType, defaultRuleChainId, defaultDashboardId, defaultQueueName, provisionDeviceKey, firmwareId, softwareId, defaultEdgeRuleChainId, version, _default, profileData); + return Objects.hash(id, createdTime, tenantId, name, description, image, type, transportType, provisionType, defaultRuleChainId, defaultDashboardId, defaultQueueName, profileData, provisionDeviceKey, firmwareId, softwareId, defaultEdgeRuleChainId, version, _default); } @Override @@ -647,13 +647,13 @@ public String toString() { sb.append(" defaultRuleChainId: ").append(toIndentedString(defaultRuleChainId)).append("\n"); sb.append(" defaultDashboardId: ").append(toIndentedString(defaultDashboardId)).append("\n"); sb.append(" defaultQueueName: ").append(toIndentedString(defaultQueueName)).append("\n"); + sb.append(" profileData: ").append(toIndentedString(profileData)).append("\n"); sb.append(" provisionDeviceKey: ").append(toIndentedString(provisionDeviceKey)).append("\n"); sb.append(" firmwareId: ").append(toIndentedString(firmwareId)).append("\n"); sb.append(" softwareId: ").append(toIndentedString(softwareId)).append("\n"); sb.append(" defaultEdgeRuleChainId: ").append(toIndentedString(defaultEdgeRuleChainId)).append("\n"); sb.append(" version: ").append(toIndentedString(version)).append("\n"); sb.append(" _default: ").append(toIndentedString(_default)).append("\n"); - sb.append(" profileData: ").append(toIndentedString(profileData)).append("\n"); sb.append("}"); return sb.toString(); } @@ -761,6 +761,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sdefaultQueueName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDefaultQueueName())))); } + // add `profileData` to the URL query string + if (getProfileData() != null) { + joiner.add(getProfileData().toUrlQueryString(prefix + "profileData" + suffix)); + } + // add `provisionDeviceKey` to the URL query string if (getProvisionDeviceKey() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sprovisionDeviceKey%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getProvisionDeviceKey())))); @@ -791,11 +796,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sdefault%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDefault())))); } - // add `profileData` to the URL query string - if (getProfileData() != null) { - joiner.add(getProfileData().toUrlQueryString(prefix + "profileData" + suffix)); - } - return joiner.toString(); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleDurationCondition.java b/ce/src/main/java/org/thingsboard/client/model/DurationAlarmCondition.java similarity index 83% rename from ce/src/main/java/org/thingsboard/client/model/AlarmRuleDurationCondition.java rename to ce/src/main/java/org/thingsboard/client/model/DurationAlarmCondition.java index d5d02631..f2964866 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleDurationCondition.java +++ b/ce/src/main/java/org/thingsboard/client/model/DurationAlarmCondition.java @@ -33,10 +33,10 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; +import org.thingsboard.client.model.AlarmCondition; import org.thingsboard.client.model.AlarmConditionExpression; -import org.thingsboard.client.model.AlarmConditionValueAlarmRuleSchedule; +import org.thingsboard.client.model.AlarmConditionValueAlarmSchedule; import org.thingsboard.client.model.AlarmConditionValueLong; -import org.thingsboard.client.model.AlarmRuleCondition; import org.thingsboard.client.model.TimeUnit; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -44,11 +44,11 @@ import org.thingsboard.client.JSON; import org.thingsboard.client.ApiClient; /** - * AlarmRuleDurationCondition + * DurationAlarmCondition */ @JsonPropertyOrder({ - AlarmRuleDurationCondition.JSON_PROPERTY_UNIT, - AlarmRuleDurationCondition.JSON_PROPERTY_VALUE + DurationAlarmCondition.JSON_PROPERTY_UNIT, + DurationAlarmCondition.JSON_PROPERTY_VALUE }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @JsonIgnoreProperties( @@ -57,7 +57,7 @@ ) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = true) -public class AlarmRuleDurationCondition extends AlarmRuleCondition { +public class DurationAlarmCondition extends AlarmCondition { public static final String JSON_PROPERTY_UNIT = "unit"; @Nonnull private TimeUnit unit; @@ -66,10 +66,10 @@ public class AlarmRuleDurationCondition extends AlarmRuleCondition { @Nonnull private AlarmConditionValueLong value; - public AlarmRuleDurationCondition() { + public DurationAlarmCondition() { } - public AlarmRuleDurationCondition unit(@Nonnull TimeUnit unit) { + public DurationAlarmCondition unit(@Nonnull TimeUnit unit) { this.unit = unit; return this; } @@ -93,7 +93,7 @@ public void setUnit(@Nonnull TimeUnit unit) { } - public AlarmRuleDurationCondition value(@Nonnull AlarmConditionValueLong value) { + public DurationAlarmCondition value(@Nonnull AlarmConditionValueLong value) { this.value = value; return this; } @@ -118,19 +118,19 @@ public void setValue(@Nonnull AlarmConditionValueLong value) { @Override - public AlarmRuleDurationCondition expression(@Nonnull AlarmConditionExpression expression) { + public DurationAlarmCondition expression(@Nonnull AlarmConditionExpression expression) { this.setExpression(expression); return this; } @Override - public AlarmRuleDurationCondition schedule(@Nullable AlarmConditionValueAlarmRuleSchedule schedule) { + public DurationAlarmCondition schedule(@Nullable AlarmConditionValueAlarmSchedule schedule) { this.setSchedule(schedule); return this; } /** - * Return true if this AlarmRuleDurationCondition object is equal to o. + * Return true if this DurationAlarmCondition object is equal to o. */ @Override public boolean equals(Object o) { @@ -140,9 +140,9 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - AlarmRuleDurationCondition alarmRuleDurationCondition = (AlarmRuleDurationCondition) o; - return Objects.equals(this.unit, alarmRuleDurationCondition.unit) && - Objects.equals(this.value, alarmRuleDurationCondition.value) && + DurationAlarmCondition durationAlarmCondition = (DurationAlarmCondition) o; + return Objects.equals(this.unit, durationAlarmCondition.unit) && + Objects.equals(this.value, durationAlarmCondition.value) && super.equals(o); } @@ -154,7 +154,7 @@ public int hashCode() { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class AlarmRuleDurationCondition {\n"); + sb.append("class DurationAlarmCondition {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" unit: ").append(toIndentedString(unit)).append("\n"); sb.append(" value: ").append(toIndentedString(value)).append("\n"); @@ -235,8 +235,8 @@ public String toUrlQueryString(String prefix) { static { // Initialize and register the discriminator mappings. Map> mappings = new HashMap>(); - mappings.put("AlarmRuleDurationCondition", AlarmRuleDurationCondition.class); - JSON.registerDiscriminator(AlarmRuleDurationCondition.class, "type", mappings); + mappings.put("DurationAlarmCondition", DurationAlarmCondition.class); + JSON.registerDiscriminator(DurationAlarmCondition.class, "type", mappings); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/Edge.java b/ce/src/main/java/org/thingsboard/client/model/Edge.java index f29ff914..69a7abfb 100644 --- a/ce/src/main/java/org/thingsboard/client/model/Edge.java +++ b/ce/src/main/java/org/thingsboard/client/model/Edge.java @@ -44,6 +44,7 @@ @JsonPropertyOrder({ Edge.JSON_PROPERTY_ID, Edge.JSON_PROPERTY_CREATED_TIME, + Edge.JSON_PROPERTY_ADDITIONAL_INFO, Edge.JSON_PROPERTY_TENANT_ID, Edge.JSON_PROPERTY_CUSTOMER_ID, Edge.JSON_PROPERTY_ROOT_RULE_CHAIN_ID, @@ -52,8 +53,7 @@ Edge.JSON_PROPERTY_LABEL, Edge.JSON_PROPERTY_ROUTING_KEY, Edge.JSON_PROPERTY_SECRET, - Edge.JSON_PROPERTY_VERSION, - Edge.JSON_PROPERTY_ADDITIONAL_INFO + Edge.JSON_PROPERTY_VERSION }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") public class Edge { @@ -65,6 +65,10 @@ public class Edge { @Nullable private Long createdTime; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo; + public static final String JSON_PROPERTY_TENANT_ID = "tenantId"; @Nullable private TenantId tenantId; @@ -101,10 +105,6 @@ public class Edge { @Nullable private Long version; - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo; - public Edge() { } @@ -160,6 +160,30 @@ public Long getCreatedTime() { + public Edge additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * Additional parameters of the edge. May include: 'description' (string). + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + /** * JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id. * @return tenantId @@ -346,30 +370,6 @@ public void setVersion(@Nullable Long version) { } - public Edge additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - return this; - } - - /** - * Additional parameters of the edge. May include: 'description' (string). - * @return additionalInfo - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; - } - - - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - - /** * Return true if this Edge object is equal to o. */ @@ -384,6 +384,7 @@ public boolean equals(Object o) { Edge edge = (Edge) o; return Objects.equals(this.id, edge.id) && Objects.equals(this.createdTime, edge.createdTime) && + Objects.equals(this.additionalInfo, edge.additionalInfo) && Objects.equals(this.tenantId, edge.tenantId) && Objects.equals(this.customerId, edge.customerId) && Objects.equals(this.rootRuleChainId, edge.rootRuleChainId) && @@ -392,13 +393,12 @@ public boolean equals(Object o) { Objects.equals(this.label, edge.label) && Objects.equals(this.routingKey, edge.routingKey) && Objects.equals(this.secret, edge.secret) && - Objects.equals(this.version, edge.version) && - Objects.equals(this.additionalInfo, edge.additionalInfo); + Objects.equals(this.version, edge.version); } @Override public int hashCode() { - return Objects.hash(id, createdTime, tenantId, customerId, rootRuleChainId, name, type, label, routingKey, secret, version, additionalInfo); + return Objects.hash(id, createdTime, additionalInfo, tenantId, customerId, rootRuleChainId, name, type, label, routingKey, secret, version); } @Override @@ -407,6 +407,7 @@ public String toString() { sb.append("class Edge {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" tenantId: ").append(toIndentedString(tenantId)).append("\n"); sb.append(" customerId: ").append(toIndentedString(customerId)).append("\n"); sb.append(" rootRuleChainId: ").append(toIndentedString(rootRuleChainId)).append("\n"); @@ -416,7 +417,6 @@ public String toString() { sb.append(" routingKey: ").append(toIndentedString(routingKey)).append("\n"); sb.append(" secret: ").append(toIndentedString(secret)).append("\n"); sb.append(" version: ").append(toIndentedString(version)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append("}"); return sb.toString(); } @@ -474,6 +474,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `tenantId` to the URL query string if (getTenantId() != null) { joiner.add(getTenantId().toUrlQueryString(prefix + "tenantId" + suffix)); @@ -519,11 +524,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sversion%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getVersion())))); } - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - return joiner.toString(); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/EdgeInfo.java b/ce/src/main/java/org/thingsboard/client/model/EdgeInfo.java index 11d29518..21f41bf9 100644 --- a/ce/src/main/java/org/thingsboard/client/model/EdgeInfo.java +++ b/ce/src/main/java/org/thingsboard/client/model/EdgeInfo.java @@ -44,6 +44,7 @@ @JsonPropertyOrder({ EdgeInfo.JSON_PROPERTY_ID, EdgeInfo.JSON_PROPERTY_CREATED_TIME, + EdgeInfo.JSON_PROPERTY_ADDITIONAL_INFO, EdgeInfo.JSON_PROPERTY_TENANT_ID, EdgeInfo.JSON_PROPERTY_CUSTOMER_ID, EdgeInfo.JSON_PROPERTY_ROOT_RULE_CHAIN_ID, @@ -54,8 +55,7 @@ EdgeInfo.JSON_PROPERTY_SECRET, EdgeInfo.JSON_PROPERTY_VERSION, EdgeInfo.JSON_PROPERTY_CUSTOMER_TITLE, - EdgeInfo.JSON_PROPERTY_CUSTOMER_IS_PUBLIC, - EdgeInfo.JSON_PROPERTY_ADDITIONAL_INFO + EdgeInfo.JSON_PROPERTY_CUSTOMER_IS_PUBLIC }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") public class EdgeInfo { @@ -67,6 +67,10 @@ public class EdgeInfo { @Nullable private Long createdTime; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo; + public static final String JSON_PROPERTY_TENANT_ID = "tenantId"; @Nullable private TenantId tenantId; @@ -111,10 +115,6 @@ public class EdgeInfo { @Nullable private Boolean customerIsPublic; - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo; - public EdgeInfo() { } @@ -170,6 +170,30 @@ public Long getCreatedTime() { + public EdgeInfo additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * Additional parameters of the edge. May include: 'description' (string). + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + /** * JSON object with Tenant Id. Use 'assignDeviceToTenant' to change the Tenant Id. * @return tenantId @@ -404,30 +428,6 @@ public void setCustomerIsPublic(@Nullable Boolean customerIsPublic) { } - public EdgeInfo additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - return this; - } - - /** - * Additional parameters of the edge. May include: 'description' (string). - * @return additionalInfo - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; - } - - - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - - /** * Return true if this EdgeInfo object is equal to o. */ @@ -442,6 +442,7 @@ public boolean equals(Object o) { EdgeInfo edgeInfo = (EdgeInfo) o; return Objects.equals(this.id, edgeInfo.id) && Objects.equals(this.createdTime, edgeInfo.createdTime) && + Objects.equals(this.additionalInfo, edgeInfo.additionalInfo) && Objects.equals(this.tenantId, edgeInfo.tenantId) && Objects.equals(this.customerId, edgeInfo.customerId) && Objects.equals(this.rootRuleChainId, edgeInfo.rootRuleChainId) && @@ -452,13 +453,12 @@ public boolean equals(Object o) { Objects.equals(this.secret, edgeInfo.secret) && Objects.equals(this.version, edgeInfo.version) && Objects.equals(this.customerTitle, edgeInfo.customerTitle) && - Objects.equals(this.customerIsPublic, edgeInfo.customerIsPublic) && - Objects.equals(this.additionalInfo, edgeInfo.additionalInfo); + Objects.equals(this.customerIsPublic, edgeInfo.customerIsPublic); } @Override public int hashCode() { - return Objects.hash(id, createdTime, tenantId, customerId, rootRuleChainId, name, type, label, routingKey, secret, version, customerTitle, customerIsPublic, additionalInfo); + return Objects.hash(id, createdTime, additionalInfo, tenantId, customerId, rootRuleChainId, name, type, label, routingKey, secret, version, customerTitle, customerIsPublic); } @Override @@ -467,6 +467,7 @@ public String toString() { sb.append("class EdgeInfo {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" tenantId: ").append(toIndentedString(tenantId)).append("\n"); sb.append(" customerId: ").append(toIndentedString(customerId)).append("\n"); sb.append(" rootRuleChainId: ").append(toIndentedString(rootRuleChainId)).append("\n"); @@ -478,7 +479,6 @@ public String toString() { sb.append(" version: ").append(toIndentedString(version)).append("\n"); sb.append(" customerTitle: ").append(toIndentedString(customerTitle)).append("\n"); sb.append(" customerIsPublic: ").append(toIndentedString(customerIsPublic)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append("}"); return sb.toString(); } @@ -536,6 +536,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `tenantId` to the URL query string if (getTenantId() != null) { joiner.add(getTenantId().toUrlQueryString(prefix + "tenantId" + suffix)); @@ -591,11 +596,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%scustomerIsPublic%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCustomerIsPublic())))); } - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - return joiner.toString(); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/EntityRelationInfo.java b/ce/src/main/java/org/thingsboard/client/model/EntityRelationInfo.java index b74c1ec1..9e7a9aef 100644 --- a/ce/src/main/java/org/thingsboard/client/model/EntityRelationInfo.java +++ b/ce/src/main/java/org/thingsboard/client/model/EntityRelationInfo.java @@ -45,9 +45,9 @@ EntityRelationInfo.JSON_PROPERTY_TYPE, EntityRelationInfo.JSON_PROPERTY_TYPE_GROUP, EntityRelationInfo.JSON_PROPERTY_VERSION, + EntityRelationInfo.JSON_PROPERTY_ADDITIONAL_INFO, EntityRelationInfo.JSON_PROPERTY_FROM_NAME, - EntityRelationInfo.JSON_PROPERTY_TO_NAME, - EntityRelationInfo.JSON_PROPERTY_ADDITIONAL_INFO + EntityRelationInfo.JSON_PROPERTY_TO_NAME }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") public class EntityRelationInfo { @@ -71,6 +71,10 @@ public class EntityRelationInfo { @Nullable private Long version; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo; + public static final String JSON_PROPERTY_FROM_NAME = "fromName"; @Nullable private String fromName; @@ -79,10 +83,6 @@ public class EntityRelationInfo { @Nullable private String toName; - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo; - public EntityRelationInfo() { } @@ -216,6 +216,30 @@ public void setVersion(@Nullable Long version) { } + public EntityRelationInfo additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * Additional parameters of the relation. + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + /** * Name of the entity for [from] direction. * @return fromName @@ -244,30 +268,6 @@ public String getToName() { - public EntityRelationInfo additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - return this; - } - - /** - * Additional parameters of the relation. - * @return additionalInfo - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; - } - - - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - - /** * Return true if this EntityRelationInfo object is equal to o. */ @@ -285,14 +285,14 @@ public boolean equals(Object o) { Objects.equals(this.type, entityRelationInfo.type) && Objects.equals(this.typeGroup, entityRelationInfo.typeGroup) && Objects.equals(this.version, entityRelationInfo.version) && + Objects.equals(this.additionalInfo, entityRelationInfo.additionalInfo) && Objects.equals(this.fromName, entityRelationInfo.fromName) && - Objects.equals(this.toName, entityRelationInfo.toName) && - Objects.equals(this.additionalInfo, entityRelationInfo.additionalInfo); + Objects.equals(this.toName, entityRelationInfo.toName); } @Override public int hashCode() { - return Objects.hash(from, to, type, typeGroup, version, fromName, toName, additionalInfo); + return Objects.hash(from, to, type, typeGroup, version, additionalInfo, fromName, toName); } @Override @@ -304,9 +304,9 @@ public String toString() { sb.append(" type: ").append(toIndentedString(type)).append("\n"); sb.append(" typeGroup: ").append(toIndentedString(typeGroup)).append("\n"); sb.append(" version: ").append(toIndentedString(version)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" fromName: ").append(toIndentedString(fromName)).append("\n"); sb.append(" toName: ").append(toIndentedString(toName)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append("}"); return sb.toString(); } @@ -379,6 +379,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sversion%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getVersion())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `fromName` to the URL query string if (getFromName() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sfromName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getFromName())))); @@ -389,11 +394,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%stoName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getToName())))); } - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - return joiner.toString(); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/EntityView.java b/ce/src/main/java/org/thingsboard/client/model/EntityView.java index 9a3c40e9..9970c2e4 100644 --- a/ce/src/main/java/org/thingsboard/client/model/EntityView.java +++ b/ce/src/main/java/org/thingsboard/client/model/EntityView.java @@ -45,6 +45,7 @@ @JsonPropertyOrder({ EntityView.JSON_PROPERTY_ID, EntityView.JSON_PROPERTY_CREATED_TIME, + EntityView.JSON_PROPERTY_ADDITIONAL_INFO, EntityView.JSON_PROPERTY_ENTITY_ID, EntityView.JSON_PROPERTY_TENANT_ID, EntityView.JSON_PROPERTY_CUSTOMER_ID, @@ -53,8 +54,7 @@ EntityView.JSON_PROPERTY_KEYS, EntityView.JSON_PROPERTY_START_TIME_MS, EntityView.JSON_PROPERTY_END_TIME_MS, - EntityView.JSON_PROPERTY_VERSION, - EntityView.JSON_PROPERTY_ADDITIONAL_INFO + EntityView.JSON_PROPERTY_VERSION }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") public class EntityView { @@ -66,6 +66,10 @@ public class EntityView { @Nullable private Long createdTime; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo; + public static final String JSON_PROPERTY_ENTITY_ID = "entityId"; @Nonnull private EntityId entityId; @@ -102,10 +106,6 @@ public class EntityView { @Nullable private Long version; - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo; - public EntityView() { } @@ -159,6 +159,30 @@ public Long getCreatedTime() { + public EntityView additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * Additional parameters of the entity view. May include: 'description' (string). + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + public EntityView entityId(@Nonnull EntityId entityId) { this.entityId = entityId; return this; @@ -355,30 +379,6 @@ public void setVersion(@Nullable Long version) { } - public EntityView additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - return this; - } - - /** - * Additional parameters of the entity view. May include: 'description' (string). - * @return additionalInfo - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; - } - - - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - - /** * Return true if this EntityView object is equal to o. */ @@ -393,6 +393,7 @@ public boolean equals(Object o) { EntityView entityView = (EntityView) o; return Objects.equals(this.id, entityView.id) && Objects.equals(this.createdTime, entityView.createdTime) && + Objects.equals(this.additionalInfo, entityView.additionalInfo) && Objects.equals(this.entityId, entityView.entityId) && Objects.equals(this.tenantId, entityView.tenantId) && Objects.equals(this.customerId, entityView.customerId) && @@ -401,13 +402,12 @@ public boolean equals(Object o) { Objects.equals(this.keys, entityView.keys) && Objects.equals(this.startTimeMs, entityView.startTimeMs) && Objects.equals(this.endTimeMs, entityView.endTimeMs) && - Objects.equals(this.version, entityView.version) && - Objects.equals(this.additionalInfo, entityView.additionalInfo); + Objects.equals(this.version, entityView.version); } @Override public int hashCode() { - return Objects.hash(id, createdTime, entityId, tenantId, customerId, name, type, keys, startTimeMs, endTimeMs, version, additionalInfo); + return Objects.hash(id, createdTime, additionalInfo, entityId, tenantId, customerId, name, type, keys, startTimeMs, endTimeMs, version); } @Override @@ -416,6 +416,7 @@ public String toString() { sb.append("class EntityView {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" entityId: ").append(toIndentedString(entityId)).append("\n"); sb.append(" tenantId: ").append(toIndentedString(tenantId)).append("\n"); sb.append(" customerId: ").append(toIndentedString(customerId)).append("\n"); @@ -425,7 +426,6 @@ public String toString() { sb.append(" startTimeMs: ").append(toIndentedString(startTimeMs)).append("\n"); sb.append(" endTimeMs: ").append(toIndentedString(endTimeMs)).append("\n"); sb.append(" version: ").append(toIndentedString(version)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append("}"); return sb.toString(); } @@ -483,6 +483,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `entityId` to the URL query string if (getEntityId() != null) { joiner.add(getEntityId().toUrlQueryString(prefix + "entityId" + suffix)); @@ -528,11 +533,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sversion%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getVersion())))); } - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - return joiner.toString(); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/EntityViewInfo.java b/ce/src/main/java/org/thingsboard/client/model/EntityViewInfo.java index 8d45c7bf..6f300ffd 100644 --- a/ce/src/main/java/org/thingsboard/client/model/EntityViewInfo.java +++ b/ce/src/main/java/org/thingsboard/client/model/EntityViewInfo.java @@ -45,6 +45,7 @@ @JsonPropertyOrder({ EntityViewInfo.JSON_PROPERTY_ID, EntityViewInfo.JSON_PROPERTY_CREATED_TIME, + EntityViewInfo.JSON_PROPERTY_ADDITIONAL_INFO, EntityViewInfo.JSON_PROPERTY_ENTITY_ID, EntityViewInfo.JSON_PROPERTY_TENANT_ID, EntityViewInfo.JSON_PROPERTY_CUSTOMER_ID, @@ -55,8 +56,7 @@ EntityViewInfo.JSON_PROPERTY_END_TIME_MS, EntityViewInfo.JSON_PROPERTY_VERSION, EntityViewInfo.JSON_PROPERTY_CUSTOMER_TITLE, - EntityViewInfo.JSON_PROPERTY_CUSTOMER_IS_PUBLIC, - EntityViewInfo.JSON_PROPERTY_ADDITIONAL_INFO + EntityViewInfo.JSON_PROPERTY_CUSTOMER_IS_PUBLIC }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") public class EntityViewInfo { @@ -68,6 +68,10 @@ public class EntityViewInfo { @Nullable private Long createdTime; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo; + public static final String JSON_PROPERTY_ENTITY_ID = "entityId"; @Nonnull private EntityId entityId; @@ -112,10 +116,6 @@ public class EntityViewInfo { @Nullable private Boolean customerIsPublic; - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo; - public EntityViewInfo() { } @@ -173,6 +173,30 @@ public Long getCreatedTime() { + public EntityViewInfo additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * Additional parameters of the entity view. May include: 'description' (string). + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + public EntityViewInfo entityId(@Nonnull EntityId entityId) { this.entityId = entityId; return this; @@ -397,30 +421,6 @@ public Boolean getCustomerIsPublic() { - public EntityViewInfo additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - return this; - } - - /** - * Additional parameters of the entity view. May include: 'description' (string). - * @return additionalInfo - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; - } - - - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - - /** * Return true if this EntityViewInfo object is equal to o. */ @@ -435,6 +435,7 @@ public boolean equals(Object o) { EntityViewInfo entityViewInfo = (EntityViewInfo) o; return Objects.equals(this.id, entityViewInfo.id) && Objects.equals(this.createdTime, entityViewInfo.createdTime) && + Objects.equals(this.additionalInfo, entityViewInfo.additionalInfo) && Objects.equals(this.entityId, entityViewInfo.entityId) && Objects.equals(this.tenantId, entityViewInfo.tenantId) && Objects.equals(this.customerId, entityViewInfo.customerId) && @@ -445,13 +446,12 @@ public boolean equals(Object o) { Objects.equals(this.endTimeMs, entityViewInfo.endTimeMs) && Objects.equals(this.version, entityViewInfo.version) && Objects.equals(this.customerTitle, entityViewInfo.customerTitle) && - Objects.equals(this.customerIsPublic, entityViewInfo.customerIsPublic) && - Objects.equals(this.additionalInfo, entityViewInfo.additionalInfo); + Objects.equals(this.customerIsPublic, entityViewInfo.customerIsPublic); } @Override public int hashCode() { - return Objects.hash(id, createdTime, entityId, tenantId, customerId, name, type, keys, startTimeMs, endTimeMs, version, customerTitle, customerIsPublic, additionalInfo); + return Objects.hash(id, createdTime, additionalInfo, entityId, tenantId, customerId, name, type, keys, startTimeMs, endTimeMs, version, customerTitle, customerIsPublic); } @Override @@ -460,6 +460,7 @@ public String toString() { sb.append("class EntityViewInfo {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" entityId: ").append(toIndentedString(entityId)).append("\n"); sb.append(" tenantId: ").append(toIndentedString(tenantId)).append("\n"); sb.append(" customerId: ").append(toIndentedString(customerId)).append("\n"); @@ -471,7 +472,6 @@ public String toString() { sb.append(" version: ").append(toIndentedString(version)).append("\n"); sb.append(" customerTitle: ").append(toIndentedString(customerTitle)).append("\n"); sb.append(" customerIsPublic: ").append(toIndentedString(customerIsPublic)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append("}"); return sb.toString(); } @@ -529,6 +529,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `entityId` to the URL query string if (getEntityId() != null) { joiner.add(getEntityId().toUrlQueryString(prefix + "entityId" + suffix)); @@ -584,11 +589,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%scustomerIsPublic%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCustomerIsPublic())))); } - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - return joiner.toString(); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleNoDataFilterPredicate.java b/ce/src/main/java/org/thingsboard/client/model/NoDataFilterPredicate.java similarity index 84% rename from ce/src/main/java/org/thingsboard/client/model/AlarmRuleNoDataFilterPredicate.java rename to ce/src/main/java/org/thingsboard/client/model/NoDataFilterPredicate.java index aa93a1de..69c4103f 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleNoDataFilterPredicate.java +++ b/ce/src/main/java/org/thingsboard/client/model/NoDataFilterPredicate.java @@ -41,11 +41,11 @@ import org.thingsboard.client.JSON; import org.thingsboard.client.ApiClient; /** - * AlarmRuleNoDataFilterPredicate + * NoDataFilterPredicate */ @JsonPropertyOrder({ - AlarmRuleNoDataFilterPredicate.JSON_PROPERTY_DURATION, - AlarmRuleNoDataFilterPredicate.JSON_PROPERTY_UNIT + NoDataFilterPredicate.JSON_PROPERTY_UNIT, + NoDataFilterPredicate.JSON_PROPERTY_DURATION }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @JsonIgnoreProperties( @@ -54,68 +54,68 @@ ) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = true) -public class AlarmRuleNoDataFilterPredicate extends AlarmRuleKeyFilterPredicate { - public static final String JSON_PROPERTY_DURATION = "duration"; - @Nonnull - private AlarmConditionValueLong duration; - +public class NoDataFilterPredicate extends AlarmRuleKeyFilterPredicate { public static final String JSON_PROPERTY_UNIT = "unit"; @Nonnull private TimeUnit unit; - public AlarmRuleNoDataFilterPredicate() { + public static final String JSON_PROPERTY_DURATION = "duration"; + @Nonnull + private AlarmConditionValueLong duration; + + public NoDataFilterPredicate() { } - public AlarmRuleNoDataFilterPredicate duration(@Nonnull AlarmConditionValueLong duration) { - this.duration = duration; + public NoDataFilterPredicate unit(@Nonnull TimeUnit unit) { + this.unit = unit; return this; } /** - * Get duration - * @return duration + * Get unit + * @return unit */ @Nonnull - @JsonProperty(value = JSON_PROPERTY_DURATION, required = true) + @JsonProperty(value = JSON_PROPERTY_UNIT, required = true) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public AlarmConditionValueLong getDuration() { - return duration; + public TimeUnit getUnit() { + return unit; } - @JsonProperty(value = JSON_PROPERTY_DURATION, required = true) + @JsonProperty(value = JSON_PROPERTY_UNIT, required = true) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setDuration(@Nonnull AlarmConditionValueLong duration) { - this.duration = duration; + public void setUnit(@Nonnull TimeUnit unit) { + this.unit = unit; } - public AlarmRuleNoDataFilterPredicate unit(@Nonnull TimeUnit unit) { - this.unit = unit; + public NoDataFilterPredicate duration(@Nonnull AlarmConditionValueLong duration) { + this.duration = duration; return this; } /** - * Get unit - * @return unit + * Get duration + * @return duration */ @Nonnull - @JsonProperty(value = JSON_PROPERTY_UNIT, required = true) + @JsonProperty(value = JSON_PROPERTY_DURATION, required = true) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public TimeUnit getUnit() { - return unit; + public AlarmConditionValueLong getDuration() { + return duration; } - @JsonProperty(value = JSON_PROPERTY_UNIT, required = true) + @JsonProperty(value = JSON_PROPERTY_DURATION, required = true) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setUnit(@Nonnull TimeUnit unit) { - this.unit = unit; + public void setDuration(@Nonnull AlarmConditionValueLong duration) { + this.duration = duration; } /** - * Return true if this AlarmRuleNoDataFilterPredicate object is equal to o. + * Return true if this NoDataFilterPredicate object is equal to o. */ @Override public boolean equals(Object o) { @@ -125,24 +125,24 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - AlarmRuleNoDataFilterPredicate alarmRuleNoDataFilterPredicate = (AlarmRuleNoDataFilterPredicate) o; - return Objects.equals(this.duration, alarmRuleNoDataFilterPredicate.duration) && - Objects.equals(this.unit, alarmRuleNoDataFilterPredicate.unit) && + NoDataFilterPredicate noDataFilterPredicate = (NoDataFilterPredicate) o; + return Objects.equals(this.unit, noDataFilterPredicate.unit) && + Objects.equals(this.duration, noDataFilterPredicate.duration) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(duration, unit, super.hashCode()); + return Objects.hash(unit, duration, super.hashCode()); } @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class AlarmRuleNoDataFilterPredicate {\n"); + sb.append("class NoDataFilterPredicate {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); - sb.append(" duration: ").append(toIndentedString(duration)).append("\n"); sb.append(" unit: ").append(toIndentedString(unit)).append("\n"); + sb.append(" duration: ").append(toIndentedString(duration)).append("\n"); sb.append("}"); return sb.toString(); } @@ -195,23 +195,23 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%stype%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getType())))); } - // add `duration` to the URL query string - if (getDuration() != null) { - joiner.add(getDuration().toUrlQueryString(prefix + "duration" + suffix)); - } - // add `unit` to the URL query string if (getUnit() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sunit%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getUnit())))); } + // add `duration` to the URL query string + if (getDuration() != null) { + joiner.add(getDuration().toUrlQueryString(prefix + "duration" + suffix)); + } + return joiner.toString(); } static { // Initialize and register the discriminator mappings. Map> mappings = new HashMap>(); - mappings.put("AlarmRuleNoDataFilterPredicate", AlarmRuleNoDataFilterPredicate.class); - JSON.registerDiscriminator(AlarmRuleNoDataFilterPredicate.class, "type", mappings); + mappings.put("NoDataFilterPredicate", NoDataFilterPredicate.class); + JSON.registerDiscriminator(NoDataFilterPredicate.class, "type", mappings); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/OAuth2ClientRegistrationTemplate.java b/ce/src/main/java/org/thingsboard/client/model/OAuth2ClientRegistrationTemplate.java index 32b7e0ef..8a726a8b 100644 --- a/ce/src/main/java/org/thingsboard/client/model/OAuth2ClientRegistrationTemplate.java +++ b/ce/src/main/java/org/thingsboard/client/model/OAuth2ClientRegistrationTemplate.java @@ -44,6 +44,7 @@ @JsonPropertyOrder({ OAuth2ClientRegistrationTemplate.JSON_PROPERTY_ID, OAuth2ClientRegistrationTemplate.JSON_PROPERTY_CREATED_TIME, + OAuth2ClientRegistrationTemplate.JSON_PROPERTY_ADDITIONAL_INFO, OAuth2ClientRegistrationTemplate.JSON_PROPERTY_PROVIDER_ID, OAuth2ClientRegistrationTemplate.JSON_PROPERTY_MAPPER_CONFIG, OAuth2ClientRegistrationTemplate.JSON_PROPERTY_AUTHORIZATION_URI, @@ -57,7 +58,6 @@ OAuth2ClientRegistrationTemplate.JSON_PROPERTY_LOGIN_BUTTON_ICON, OAuth2ClientRegistrationTemplate.JSON_PROPERTY_LOGIN_BUTTON_LABEL, OAuth2ClientRegistrationTemplate.JSON_PROPERTY_HELP_LINK, - OAuth2ClientRegistrationTemplate.JSON_PROPERTY_ADDITIONAL_INFO, OAuth2ClientRegistrationTemplate.JSON_PROPERTY_NAME }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @@ -70,6 +70,10 @@ public class OAuth2ClientRegistrationTemplate { @Nullable private Long createdTime; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo = null; + public static final String JSON_PROPERTY_PROVIDER_ID = "providerId"; @Nonnull private String providerId; @@ -122,10 +126,6 @@ public class OAuth2ClientRegistrationTemplate { @Nullable private String helpLink; - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo = null; - public static final String JSON_PROPERTY_NAME = "name"; @Nullable private String name; @@ -179,6 +179,30 @@ public Long getCreatedTime() { + public OAuth2ClientRegistrationTemplate additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * Get additionalInfo + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + public OAuth2ClientRegistrationTemplate providerId(@Nonnull String providerId) { this.providerId = providerId; return this; @@ -499,30 +523,6 @@ public void setHelpLink(@Nullable String helpLink) { } - public OAuth2ClientRegistrationTemplate additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - return this; - } - - /** - * Get additionalInfo - * @return additionalInfo - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; - } - - - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - - public OAuth2ClientRegistrationTemplate name(@Nullable String name) { this.name = name; return this; @@ -561,6 +561,7 @@ public boolean equals(Object o) { OAuth2ClientRegistrationTemplate oauth2ClientRegistrationTemplate = (OAuth2ClientRegistrationTemplate) o; return Objects.equals(this.id, oauth2ClientRegistrationTemplate.id) && Objects.equals(this.createdTime, oauth2ClientRegistrationTemplate.createdTime) && + Objects.equals(this.additionalInfo, oauth2ClientRegistrationTemplate.additionalInfo) && Objects.equals(this.providerId, oauth2ClientRegistrationTemplate.providerId) && Objects.equals(this.mapperConfig, oauth2ClientRegistrationTemplate.mapperConfig) && Objects.equals(this.authorizationUri, oauth2ClientRegistrationTemplate.authorizationUri) && @@ -574,13 +575,12 @@ public boolean equals(Object o) { Objects.equals(this.loginButtonIcon, oauth2ClientRegistrationTemplate.loginButtonIcon) && Objects.equals(this.loginButtonLabel, oauth2ClientRegistrationTemplate.loginButtonLabel) && Objects.equals(this.helpLink, oauth2ClientRegistrationTemplate.helpLink) && - Objects.equals(this.additionalInfo, oauth2ClientRegistrationTemplate.additionalInfo) && Objects.equals(this.name, oauth2ClientRegistrationTemplate.name); } @Override public int hashCode() { - return Objects.hash(id, createdTime, providerId, mapperConfig, authorizationUri, accessTokenUri, scope, userInfoUri, userNameAttributeName, jwkSetUri, clientAuthenticationMethod, comment, loginButtonIcon, loginButtonLabel, helpLink, additionalInfo, name); + return Objects.hash(id, createdTime, additionalInfo, providerId, mapperConfig, authorizationUri, accessTokenUri, scope, userInfoUri, userNameAttributeName, jwkSetUri, clientAuthenticationMethod, comment, loginButtonIcon, loginButtonLabel, helpLink, name); } @Override @@ -589,6 +589,7 @@ public String toString() { sb.append("class OAuth2ClientRegistrationTemplate {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" providerId: ").append(toIndentedString(providerId)).append("\n"); sb.append(" mapperConfig: ").append(toIndentedString(mapperConfig)).append("\n"); sb.append(" authorizationUri: ").append(toIndentedString(authorizationUri)).append("\n"); @@ -602,7 +603,6 @@ public String toString() { sb.append(" loginButtonIcon: ").append(toIndentedString(loginButtonIcon)).append("\n"); sb.append(" loginButtonLabel: ").append(toIndentedString(loginButtonLabel)).append("\n"); sb.append(" helpLink: ").append(toIndentedString(helpLink)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append("}"); return sb.toString(); @@ -661,6 +661,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `providerId` to the URL query string if (getProviderId() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sproviderId%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getProviderId())))); @@ -730,11 +735,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%shelpLink%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getHelpLink())))); } - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - // add `name` to the URL query string if (getName() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); diff --git a/ce/src/main/java/org/thingsboard/client/model/OtaPackage.java b/ce/src/main/java/org/thingsboard/client/model/OtaPackage.java index 584bf25a..c3b80dba 100644 --- a/ce/src/main/java/org/thingsboard/client/model/OtaPackage.java +++ b/ce/src/main/java/org/thingsboard/client/model/OtaPackage.java @@ -44,6 +44,7 @@ @JsonPropertyOrder({ OtaPackage.JSON_PROPERTY_ID, OtaPackage.JSON_PROPERTY_CREATED_TIME, + OtaPackage.JSON_PROPERTY_ADDITIONAL_INFO, OtaPackage.JSON_PROPERTY_TENANT_ID, OtaPackage.JSON_PROPERTY_DEVICE_PROFILE_ID, OtaPackage.JSON_PROPERTY_TYPE, @@ -57,7 +58,6 @@ OtaPackage.JSON_PROPERTY_CHECKSUM_ALGORITHM, OtaPackage.JSON_PROPERTY_CHECKSUM, OtaPackage.JSON_PROPERTY_DATA_SIZE, - OtaPackage.JSON_PROPERTY_ADDITIONAL_INFO, OtaPackage.JSON_PROPERTY_DATA, OtaPackage.JSON_PROPERTY_NAME }) @@ -71,6 +71,10 @@ public class OtaPackage { @Nullable private Long createdTime; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo; + public static final String JSON_PROPERTY_TENANT_ID = "tenantId"; @Nullable private TenantId tenantId; @@ -123,10 +127,6 @@ public class OtaPackage { @Nullable private Long dataSize; - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo; - public static final String JSON_PROPERTY_DATA = "data"; @Nullable private byte[] data; @@ -202,6 +202,30 @@ public Long getCreatedTime() { + public OtaPackage additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * OTA Package description. + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + /** * JSON object with Tenant Id. Tenant Id of the ota package can't be changed. * @return tenantId @@ -434,30 +458,6 @@ public Long getDataSize() { - public OtaPackage additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - return this; - } - - /** - * OTA Package description. - * @return additionalInfo - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; - } - - - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - - public OtaPackage data(@Nullable byte[] data) { this.data = data; return this; @@ -510,6 +510,7 @@ public boolean equals(Object o) { OtaPackage otaPackage = (OtaPackage) o; return Objects.equals(this.id, otaPackage.id) && Objects.equals(this.createdTime, otaPackage.createdTime) && + Objects.equals(this.additionalInfo, otaPackage.additionalInfo) && Objects.equals(this.tenantId, otaPackage.tenantId) && Objects.equals(this.deviceProfileId, otaPackage.deviceProfileId) && Objects.equals(this.type, otaPackage.type) && @@ -523,14 +524,13 @@ public boolean equals(Object o) { Objects.equals(this.checksumAlgorithm, otaPackage.checksumAlgorithm) && Objects.equals(this.checksum, otaPackage.checksum) && Objects.equals(this.dataSize, otaPackage.dataSize) && - Objects.equals(this.additionalInfo, otaPackage.additionalInfo) && Arrays.equals(this.data, otaPackage.data) && Objects.equals(this.name, otaPackage.name); } @Override public int hashCode() { - return Objects.hash(id, createdTime, tenantId, deviceProfileId, type, title, version, tag, url, hasData, fileName, contentType, checksumAlgorithm, checksum, dataSize, additionalInfo, Arrays.hashCode(data), name); + return Objects.hash(id, createdTime, additionalInfo, tenantId, deviceProfileId, type, title, version, tag, url, hasData, fileName, contentType, checksumAlgorithm, checksum, dataSize, Arrays.hashCode(data), name); } @Override @@ -539,6 +539,7 @@ public String toString() { sb.append("class OtaPackage {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" tenantId: ").append(toIndentedString(tenantId)).append("\n"); sb.append(" deviceProfileId: ").append(toIndentedString(deviceProfileId)).append("\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); @@ -552,7 +553,6 @@ public String toString() { sb.append(" checksumAlgorithm: ").append(toIndentedString(checksumAlgorithm)).append("\n"); sb.append(" checksum: ").append(toIndentedString(checksum)).append("\n"); sb.append(" dataSize: ").append(toIndentedString(dataSize)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" data: ").append(toIndentedString(data)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append("}"); @@ -612,6 +612,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `tenantId` to the URL query string if (getTenantId() != null) { joiner.add(getTenantId().toUrlQueryString(prefix + "tenantId" + suffix)); @@ -677,11 +682,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sdataSize%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDataSize())))); } - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - // add `data` to the URL query string if (getData() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sdata%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getData())))); diff --git a/ce/src/main/java/org/thingsboard/client/model/OtaPackageInfo.java b/ce/src/main/java/org/thingsboard/client/model/OtaPackageInfo.java index 71f77a93..f2fd5843 100644 --- a/ce/src/main/java/org/thingsboard/client/model/OtaPackageInfo.java +++ b/ce/src/main/java/org/thingsboard/client/model/OtaPackageInfo.java @@ -44,6 +44,7 @@ @JsonPropertyOrder({ OtaPackageInfo.JSON_PROPERTY_ID, OtaPackageInfo.JSON_PROPERTY_CREATED_TIME, + OtaPackageInfo.JSON_PROPERTY_ADDITIONAL_INFO, OtaPackageInfo.JSON_PROPERTY_TENANT_ID, OtaPackageInfo.JSON_PROPERTY_DEVICE_PROFILE_ID, OtaPackageInfo.JSON_PROPERTY_TYPE, @@ -57,7 +58,6 @@ OtaPackageInfo.JSON_PROPERTY_CHECKSUM_ALGORITHM, OtaPackageInfo.JSON_PROPERTY_CHECKSUM, OtaPackageInfo.JSON_PROPERTY_DATA_SIZE, - OtaPackageInfo.JSON_PROPERTY_ADDITIONAL_INFO, OtaPackageInfo.JSON_PROPERTY_NAME }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @@ -70,6 +70,10 @@ public class OtaPackageInfo { @Nullable private Long createdTime; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo; + public static final String JSON_PROPERTY_TENANT_ID = "tenantId"; @Nullable private TenantId tenantId; @@ -122,10 +126,6 @@ public class OtaPackageInfo { @Nullable private Long dataSize; - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo; - public static final String JSON_PROPERTY_NAME = "name"; @Nullable private String name; @@ -197,6 +197,30 @@ public Long getCreatedTime() { + public OtaPackageInfo additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * OTA Package description. + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + /** * JSON object with Tenant Id. Tenant Id of the ota package can't be changed. * @return tenantId @@ -429,30 +453,6 @@ public Long getDataSize() { - public OtaPackageInfo additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - return this; - } - - /** - * OTA Package description. - * @return additionalInfo - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; - } - - - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - - /** * Get name * @return name @@ -481,6 +481,7 @@ public boolean equals(Object o) { OtaPackageInfo otaPackageInfo = (OtaPackageInfo) o; return Objects.equals(this.id, otaPackageInfo.id) && Objects.equals(this.createdTime, otaPackageInfo.createdTime) && + Objects.equals(this.additionalInfo, otaPackageInfo.additionalInfo) && Objects.equals(this.tenantId, otaPackageInfo.tenantId) && Objects.equals(this.deviceProfileId, otaPackageInfo.deviceProfileId) && Objects.equals(this.type, otaPackageInfo.type) && @@ -494,13 +495,12 @@ public boolean equals(Object o) { Objects.equals(this.checksumAlgorithm, otaPackageInfo.checksumAlgorithm) && Objects.equals(this.checksum, otaPackageInfo.checksum) && Objects.equals(this.dataSize, otaPackageInfo.dataSize) && - Objects.equals(this.additionalInfo, otaPackageInfo.additionalInfo) && Objects.equals(this.name, otaPackageInfo.name); } @Override public int hashCode() { - return Objects.hash(id, createdTime, tenantId, deviceProfileId, type, title, version, tag, url, hasData, fileName, contentType, checksumAlgorithm, checksum, dataSize, additionalInfo, name); + return Objects.hash(id, createdTime, additionalInfo, tenantId, deviceProfileId, type, title, version, tag, url, hasData, fileName, contentType, checksumAlgorithm, checksum, dataSize, name); } @Override @@ -509,6 +509,7 @@ public String toString() { sb.append("class OtaPackageInfo {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" tenantId: ").append(toIndentedString(tenantId)).append("\n"); sb.append(" deviceProfileId: ").append(toIndentedString(deviceProfileId)).append("\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); @@ -522,7 +523,6 @@ public String toString() { sb.append(" checksumAlgorithm: ").append(toIndentedString(checksumAlgorithm)).append("\n"); sb.append(" checksum: ").append(toIndentedString(checksum)).append("\n"); sb.append(" dataSize: ").append(toIndentedString(dataSize)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append("}"); return sb.toString(); @@ -581,6 +581,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `tenantId` to the URL query string if (getTenantId() != null) { joiner.add(getTenantId().toUrlQueryString(prefix + "tenantId" + suffix)); @@ -646,11 +651,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sdataSize%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDataSize())))); } - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - // add `name` to the URL query string if (getName() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); diff --git a/ce/src/main/java/org/thingsboard/client/model/Queue.java b/ce/src/main/java/org/thingsboard/client/model/Queue.java index 1547010a..0c7ef0b0 100644 --- a/ce/src/main/java/org/thingsboard/client/model/Queue.java +++ b/ce/src/main/java/org/thingsboard/client/model/Queue.java @@ -43,6 +43,7 @@ @JsonPropertyOrder({ Queue.JSON_PROPERTY_ID, Queue.JSON_PROPERTY_CREATED_TIME, + Queue.JSON_PROPERTY_ADDITIONAL_INFO, Queue.JSON_PROPERTY_TENANT_ID, Queue.JSON_PROPERTY_NAME, Queue.JSON_PROPERTY_TOPIC, @@ -51,8 +52,7 @@ Queue.JSON_PROPERTY_CONSUMER_PER_PARTITION, Queue.JSON_PROPERTY_PACK_PROCESSING_TIMEOUT, Queue.JSON_PROPERTY_SUBMIT_STRATEGY, - Queue.JSON_PROPERTY_PROCESSING_STRATEGY, - Queue.JSON_PROPERTY_ADDITIONAL_INFO + Queue.JSON_PROPERTY_PROCESSING_STRATEGY }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") public class Queue { @@ -64,6 +64,10 @@ public class Queue { @Nullable private Long createdTime; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo = null; + public static final String JSON_PROPERTY_TENANT_ID = "tenantId"; @Nullable private TenantId tenantId; @@ -100,10 +104,6 @@ public class Queue { @Nullable private ProcessingStrategy processingStrategy; - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo = null; - public Queue() { } @@ -153,6 +153,30 @@ public Long getCreatedTime() { + public Queue additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * Get additionalInfo + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + public Queue tenantId(@Nullable TenantId tenantId) { this.tenantId = tenantId; return this; @@ -369,30 +393,6 @@ public void setProcessingStrategy(@Nullable ProcessingStrategy processingStrateg } - public Queue additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - return this; - } - - /** - * Get additionalInfo - * @return additionalInfo - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; - } - - - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - - /** * Return true if this Queue object is equal to o. */ @@ -407,6 +407,7 @@ public boolean equals(Object o) { Queue queue = (Queue) o; return Objects.equals(this.id, queue.id) && Objects.equals(this.createdTime, queue.createdTime) && + Objects.equals(this.additionalInfo, queue.additionalInfo) && Objects.equals(this.tenantId, queue.tenantId) && Objects.equals(this.name, queue.name) && Objects.equals(this.topic, queue.topic) && @@ -415,13 +416,12 @@ public boolean equals(Object o) { Objects.equals(this.consumerPerPartition, queue.consumerPerPartition) && Objects.equals(this.packProcessingTimeout, queue.packProcessingTimeout) && Objects.equals(this.submitStrategy, queue.submitStrategy) && - Objects.equals(this.processingStrategy, queue.processingStrategy) && - Objects.equals(this.additionalInfo, queue.additionalInfo); + Objects.equals(this.processingStrategy, queue.processingStrategy); } @Override public int hashCode() { - return Objects.hash(id, createdTime, tenantId, name, topic, pollInterval, partitions, consumerPerPartition, packProcessingTimeout, submitStrategy, processingStrategy, additionalInfo); + return Objects.hash(id, createdTime, additionalInfo, tenantId, name, topic, pollInterval, partitions, consumerPerPartition, packProcessingTimeout, submitStrategy, processingStrategy); } @Override @@ -430,6 +430,7 @@ public String toString() { sb.append("class Queue {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" tenantId: ").append(toIndentedString(tenantId)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" topic: ").append(toIndentedString(topic)).append("\n"); @@ -439,7 +440,6 @@ public String toString() { sb.append(" packProcessingTimeout: ").append(toIndentedString(packProcessingTimeout)).append("\n"); sb.append(" submitStrategy: ").append(toIndentedString(submitStrategy)).append("\n"); sb.append(" processingStrategy: ").append(toIndentedString(processingStrategy)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append("}"); return sb.toString(); } @@ -497,6 +497,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `tenantId` to the URL query string if (getTenantId() != null) { joiner.add(getTenantId().toUrlQueryString(prefix + "tenantId" + suffix)); @@ -542,11 +547,6 @@ public String toUrlQueryString(String prefix) { joiner.add(getProcessingStrategy().toUrlQueryString(prefix + "processingStrategy" + suffix)); } - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - return joiner.toString(); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleRepeatingCondition.java b/ce/src/main/java/org/thingsboard/client/model/RepeatingAlarmCondition.java similarity index 83% rename from ce/src/main/java/org/thingsboard/client/model/AlarmRuleRepeatingCondition.java rename to ce/src/main/java/org/thingsboard/client/model/RepeatingAlarmCondition.java index 65a77f5f..c19f598a 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleRepeatingCondition.java +++ b/ce/src/main/java/org/thingsboard/client/model/RepeatingAlarmCondition.java @@ -33,20 +33,20 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; +import org.thingsboard.client.model.AlarmCondition; import org.thingsboard.client.model.AlarmConditionExpression; -import org.thingsboard.client.model.AlarmConditionValueAlarmRuleSchedule; +import org.thingsboard.client.model.AlarmConditionValueAlarmSchedule; import org.thingsboard.client.model.AlarmConditionValueInteger; -import org.thingsboard.client.model.AlarmRuleCondition; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.thingsboard.client.JSON; import org.thingsboard.client.ApiClient; /** - * AlarmRuleRepeatingCondition + * RepeatingAlarmCondition */ @JsonPropertyOrder({ - AlarmRuleRepeatingCondition.JSON_PROPERTY_COUNT + RepeatingAlarmCondition.JSON_PROPERTY_COUNT }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @JsonIgnoreProperties( @@ -55,15 +55,15 @@ ) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = true) -public class AlarmRuleRepeatingCondition extends AlarmRuleCondition { +public class RepeatingAlarmCondition extends AlarmCondition { public static final String JSON_PROPERTY_COUNT = "count"; @Nonnull private AlarmConditionValueInteger count; - public AlarmRuleRepeatingCondition() { + public RepeatingAlarmCondition() { } - public AlarmRuleRepeatingCondition count(@Nonnull AlarmConditionValueInteger count) { + public RepeatingAlarmCondition count(@Nonnull AlarmConditionValueInteger count) { this.count = count; return this; } @@ -88,19 +88,19 @@ public void setCount(@Nonnull AlarmConditionValueInteger count) { @Override - public AlarmRuleRepeatingCondition expression(@Nonnull AlarmConditionExpression expression) { + public RepeatingAlarmCondition expression(@Nonnull AlarmConditionExpression expression) { this.setExpression(expression); return this; } @Override - public AlarmRuleRepeatingCondition schedule(@Nullable AlarmConditionValueAlarmRuleSchedule schedule) { + public RepeatingAlarmCondition schedule(@Nullable AlarmConditionValueAlarmSchedule schedule) { this.setSchedule(schedule); return this; } /** - * Return true if this AlarmRuleRepeatingCondition object is equal to o. + * Return true if this RepeatingAlarmCondition object is equal to o. */ @Override public boolean equals(Object o) { @@ -110,8 +110,8 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - AlarmRuleRepeatingCondition alarmRuleRepeatingCondition = (AlarmRuleRepeatingCondition) o; - return Objects.equals(this.count, alarmRuleRepeatingCondition.count) && + RepeatingAlarmCondition repeatingAlarmCondition = (RepeatingAlarmCondition) o; + return Objects.equals(this.count, repeatingAlarmCondition.count) && super.equals(o); } @@ -123,7 +123,7 @@ public int hashCode() { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class AlarmRuleRepeatingCondition {\n"); + sb.append("class RepeatingAlarmCondition {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" count: ").append(toIndentedString(count)).append("\n"); sb.append("}"); @@ -198,8 +198,8 @@ public String toUrlQueryString(String prefix) { static { // Initialize and register the discriminator mappings. Map> mappings = new HashMap>(); - mappings.put("AlarmRuleRepeatingCondition", AlarmRuleRepeatingCondition.class); - JSON.registerDiscriminator(AlarmRuleRepeatingCondition.class, "type", mappings); + mappings.put("RepeatingAlarmCondition", RepeatingAlarmCondition.class); + JSON.registerDiscriminator(RepeatingAlarmCondition.class, "type", mappings); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/RuleChain.java b/ce/src/main/java/org/thingsboard/client/model/RuleChain.java index f9f40680..145d93f8 100644 --- a/ce/src/main/java/org/thingsboard/client/model/RuleChain.java +++ b/ce/src/main/java/org/thingsboard/client/model/RuleChain.java @@ -44,15 +44,15 @@ @JsonPropertyOrder({ RuleChain.JSON_PROPERTY_ID, RuleChain.JSON_PROPERTY_CREATED_TIME, + RuleChain.JSON_PROPERTY_ADDITIONAL_INFO, RuleChain.JSON_PROPERTY_TENANT_ID, RuleChain.JSON_PROPERTY_NAME, RuleChain.JSON_PROPERTY_TYPE, RuleChain.JSON_PROPERTY_FIRST_RULE_NODE_ID, RuleChain.JSON_PROPERTY_ROOT, RuleChain.JSON_PROPERTY_DEBUG_MODE, - RuleChain.JSON_PROPERTY_VERSION, - RuleChain.JSON_PROPERTY_ADDITIONAL_INFO, - RuleChain.JSON_PROPERTY_CONFIGURATION + RuleChain.JSON_PROPERTY_CONFIGURATION, + RuleChain.JSON_PROPERTY_VERSION }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") public class RuleChain { @@ -64,6 +64,10 @@ public class RuleChain { @Nullable private Long createdTime; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo = null; + public static final String JSON_PROPERTY_TENANT_ID = "tenantId"; @Nonnull private TenantId tenantId; @@ -88,18 +92,14 @@ public class RuleChain { @Nullable private Boolean debugMode; - public static final String JSON_PROPERTY_VERSION = "version"; - @Nullable - private Long version; - - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo = null; - public static final String JSON_PROPERTY_CONFIGURATION = "configuration"; @Nullable private com.fasterxml.jackson.databind.JsonNode _configuration = null; + public static final String JSON_PROPERTY_VERSION = "version"; + @Nullable + private Long version; + public RuleChain() { } @@ -151,6 +151,30 @@ public Long getCreatedTime() { + public RuleChain additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * Get additionalInfo + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + /** * JSON object with Tenant Id. * @return tenantId @@ -285,75 +309,51 @@ public void setDebugMode(@Nullable Boolean debugMode) { } - public RuleChain version(@Nullable Long version) { - this.version = version; - return this; - } - - /** - * Get version - * @return version - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_VERSION, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Long getVersion() { - return version; - } - - - @JsonProperty(value = JSON_PROPERTY_VERSION, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setVersion(@Nullable Long version) { - this.version = version; - } - - - public RuleChain additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; + public RuleChain _configuration(@Nullable com.fasterxml.jackson.databind.JsonNode _configuration) { + this._configuration = _configuration; return this; } /** - * Get additionalInfo - * @return additionalInfo + * Get _configuration + * @return _configuration */ @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonProperty(value = JSON_PROPERTY_CONFIGURATION, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; + public com.fasterxml.jackson.databind.JsonNode getConfiguration() { + return _configuration; } - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonProperty(value = JSON_PROPERTY_CONFIGURATION, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; + public void setConfiguration(@Nullable com.fasterxml.jackson.databind.JsonNode _configuration) { + this._configuration = _configuration; } - public RuleChain _configuration(@Nullable com.fasterxml.jackson.databind.JsonNode _configuration) { - this._configuration = _configuration; + public RuleChain version(@Nullable Long version) { + this.version = version; return this; } /** - * Get _configuration - * @return _configuration + * Get version + * @return version */ @Nullable - @JsonProperty(value = JSON_PROPERTY_CONFIGURATION, required = false) + @JsonProperty(value = JSON_PROPERTY_VERSION, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getConfiguration() { - return _configuration; + public Long getVersion() { + return version; } - @JsonProperty(value = JSON_PROPERTY_CONFIGURATION, required = false) + @JsonProperty(value = JSON_PROPERTY_VERSION, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setConfiguration(@Nullable com.fasterxml.jackson.databind.JsonNode _configuration) { - this._configuration = _configuration; + public void setVersion(@Nullable Long version) { + this.version = version; } @@ -371,20 +371,20 @@ public boolean equals(Object o) { RuleChain ruleChain = (RuleChain) o; return Objects.equals(this.id, ruleChain.id) && Objects.equals(this.createdTime, ruleChain.createdTime) && + Objects.equals(this.additionalInfo, ruleChain.additionalInfo) && Objects.equals(this.tenantId, ruleChain.tenantId) && Objects.equals(this.name, ruleChain.name) && Objects.equals(this.type, ruleChain.type) && Objects.equals(this.firstRuleNodeId, ruleChain.firstRuleNodeId) && Objects.equals(this.root, ruleChain.root) && Objects.equals(this.debugMode, ruleChain.debugMode) && - Objects.equals(this.version, ruleChain.version) && - Objects.equals(this.additionalInfo, ruleChain.additionalInfo) && - Objects.equals(this._configuration, ruleChain._configuration); + Objects.equals(this._configuration, ruleChain._configuration) && + Objects.equals(this.version, ruleChain.version); } @Override public int hashCode() { - return Objects.hash(id, createdTime, tenantId, name, type, firstRuleNodeId, root, debugMode, version, additionalInfo, _configuration); + return Objects.hash(id, createdTime, additionalInfo, tenantId, name, type, firstRuleNodeId, root, debugMode, _configuration, version); } @Override @@ -393,15 +393,15 @@ public String toString() { sb.append("class RuleChain {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" tenantId: ").append(toIndentedString(tenantId)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); sb.append(" firstRuleNodeId: ").append(toIndentedString(firstRuleNodeId)).append("\n"); sb.append(" root: ").append(toIndentedString(root)).append("\n"); sb.append(" debugMode: ").append(toIndentedString(debugMode)).append("\n"); - sb.append(" version: ").append(toIndentedString(version)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" _configuration: ").append(toIndentedString(_configuration)).append("\n"); + sb.append(" version: ").append(toIndentedString(version)).append("\n"); sb.append("}"); return sb.toString(); } @@ -459,6 +459,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `tenantId` to the URL query string if (getTenantId() != null) { joiner.add(getTenantId().toUrlQueryString(prefix + "tenantId" + suffix)); @@ -489,21 +494,16 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sdebugMode%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDebugMode())))); } - // add `version` to the URL query string - if (getVersion() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sversion%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getVersion())))); - } - - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - // add `configuration` to the URL query string if (getConfiguration() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sconfiguration%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getConfiguration())))); } + // add `version` to the URL query string + if (getVersion() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sversion%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getVersion())))); + } + return joiner.toString(); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/RuleNode.java b/ce/src/main/java/org/thingsboard/client/model/RuleNode.java index 8daa1e3b..053942cc 100644 --- a/ce/src/main/java/org/thingsboard/client/model/RuleNode.java +++ b/ce/src/main/java/org/thingsboard/client/model/RuleNode.java @@ -42,6 +42,7 @@ @JsonPropertyOrder({ RuleNode.JSON_PROPERTY_ID, RuleNode.JSON_PROPERTY_CREATED_TIME, + RuleNode.JSON_PROPERTY_ADDITIONAL_INFO, RuleNode.JSON_PROPERTY_RULE_CHAIN_ID, RuleNode.JSON_PROPERTY_TYPE, RuleNode.JSON_PROPERTY_NAME, @@ -51,7 +52,6 @@ RuleNode.JSON_PROPERTY_CONFIGURATION_VERSION, RuleNode.JSON_PROPERTY_CONFIGURATION, RuleNode.JSON_PROPERTY_EXTERNAL_ID, - RuleNode.JSON_PROPERTY_ADDITIONAL_INFO, RuleNode.JSON_PROPERTY_DEBUG_MODE }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @@ -64,6 +64,10 @@ public class RuleNode { @Nullable private Long createdTime; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo; + public static final String JSON_PROPERTY_RULE_CHAIN_ID = "ruleChainId"; @Nullable private RuleChainId ruleChainId; @@ -100,10 +104,6 @@ public class RuleNode { @Nullable private RuleNodeId externalId; - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo; - public static final String JSON_PROPERTY_DEBUG_MODE = "debugMode"; @Nullable private Boolean debugMode; @@ -159,6 +159,30 @@ public Long getCreatedTime() { + public RuleNode additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * Additional parameters of the rule node. May include: 'layoutX' (number, X coordinate for visualization), 'layoutY' (number, Y coordinate for visualization), 'description' (string). + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + /** * JSON object with the Rule Chain Id. * @return ruleChainId @@ -365,30 +389,6 @@ public void setExternalId(@Nullable RuleNodeId externalId) { } - public RuleNode additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - return this; - } - - /** - * Additional parameters of the rule node. May include: 'layoutX' (number, X coordinate for visualization), 'layoutY' (number, Y coordinate for visualization), 'description' (string). - * @return additionalInfo - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; - } - - - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - - public RuleNode debugMode(@Nullable Boolean debugMode) { this.debugMode = debugMode; return this; @@ -429,6 +429,7 @@ public boolean equals(Object o) { RuleNode ruleNode = (RuleNode) o; return Objects.equals(this.id, ruleNode.id) && Objects.equals(this.createdTime, ruleNode.createdTime) && + Objects.equals(this.additionalInfo, ruleNode.additionalInfo) && Objects.equals(this.ruleChainId, ruleNode.ruleChainId) && Objects.equals(this.type, ruleNode.type) && Objects.equals(this.name, ruleNode.name) && @@ -438,13 +439,12 @@ public boolean equals(Object o) { Objects.equals(this.configurationVersion, ruleNode.configurationVersion) && Objects.equals(this._configuration, ruleNode._configuration) && Objects.equals(this.externalId, ruleNode.externalId) && - Objects.equals(this.additionalInfo, ruleNode.additionalInfo) && Objects.equals(this.debugMode, ruleNode.debugMode); } @Override public int hashCode() { - return Objects.hash(id, createdTime, ruleChainId, type, name, debugSettings, singletonMode, queueName, configurationVersion, _configuration, externalId, additionalInfo, debugMode); + return Objects.hash(id, createdTime, additionalInfo, ruleChainId, type, name, debugSettings, singletonMode, queueName, configurationVersion, _configuration, externalId, debugMode); } @Override @@ -453,6 +453,7 @@ public String toString() { sb.append("class RuleNode {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" ruleChainId: ").append(toIndentedString(ruleChainId)).append("\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); @@ -462,7 +463,6 @@ public String toString() { sb.append(" configurationVersion: ").append(toIndentedString(configurationVersion)).append("\n"); sb.append(" _configuration: ").append(toIndentedString(_configuration)).append("\n"); sb.append(" externalId: ").append(toIndentedString(externalId)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" debugMode: ").append(toIndentedString(debugMode)).append("\n"); sb.append("}"); return sb.toString(); @@ -521,6 +521,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `ruleChainId` to the URL query string if (getRuleChainId() != null) { joiner.add(getRuleChainId().toUrlQueryString(prefix + "ruleChainId" + suffix)); @@ -566,11 +571,6 @@ public String toUrlQueryString(String prefix) { joiner.add(getExternalId().toUrlQueryString(prefix + "externalId" + suffix)); } - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - // add `debugMode` to the URL query string if (getDebugMode() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sdebugMode%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDebugMode())))); diff --git a/ce/src/main/java/org/thingsboard/client/model/SaveOtaPackageInfoRequest.java b/ce/src/main/java/org/thingsboard/client/model/SaveOtaPackageInfoRequest.java index 6aba0a1a..5c06da9a 100644 --- a/ce/src/main/java/org/thingsboard/client/model/SaveOtaPackageInfoRequest.java +++ b/ce/src/main/java/org/thingsboard/client/model/SaveOtaPackageInfoRequest.java @@ -44,6 +44,7 @@ @JsonPropertyOrder({ SaveOtaPackageInfoRequest.JSON_PROPERTY_ID, SaveOtaPackageInfoRequest.JSON_PROPERTY_CREATED_TIME, + SaveOtaPackageInfoRequest.JSON_PROPERTY_ADDITIONAL_INFO, SaveOtaPackageInfoRequest.JSON_PROPERTY_TENANT_ID, SaveOtaPackageInfoRequest.JSON_PROPERTY_DEVICE_PROFILE_ID, SaveOtaPackageInfoRequest.JSON_PROPERTY_TYPE, @@ -58,7 +59,6 @@ SaveOtaPackageInfoRequest.JSON_PROPERTY_CHECKSUM, SaveOtaPackageInfoRequest.JSON_PROPERTY_DATA_SIZE, SaveOtaPackageInfoRequest.JSON_PROPERTY_USES_URL, - SaveOtaPackageInfoRequest.JSON_PROPERTY_ADDITIONAL_INFO, SaveOtaPackageInfoRequest.JSON_PROPERTY_NAME }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @@ -71,6 +71,10 @@ public class SaveOtaPackageInfoRequest { @Nullable private Long createdTime; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo; + public static final String JSON_PROPERTY_TENANT_ID = "tenantId"; @Nullable private TenantId tenantId; @@ -127,10 +131,6 @@ public class SaveOtaPackageInfoRequest { @Nullable private Boolean usesUrl; - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo; - public static final String JSON_PROPERTY_NAME = "name"; @Nullable private String name; @@ -204,6 +204,30 @@ public Long getCreatedTime() { + public SaveOtaPackageInfoRequest additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * OTA Package description. + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + /** * JSON object with Tenant Id. Tenant Id of the ota package can't be changed. * @return tenantId @@ -450,30 +474,6 @@ public Boolean getUsesUrl() { - public SaveOtaPackageInfoRequest additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - return this; - } - - /** - * OTA Package description. - * @return additionalInfo - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; - } - - - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - - /** * Get name * @return name @@ -502,6 +502,7 @@ public boolean equals(Object o) { SaveOtaPackageInfoRequest saveOtaPackageInfoRequest = (SaveOtaPackageInfoRequest) o; return Objects.equals(this.id, saveOtaPackageInfoRequest.id) && Objects.equals(this.createdTime, saveOtaPackageInfoRequest.createdTime) && + Objects.equals(this.additionalInfo, saveOtaPackageInfoRequest.additionalInfo) && Objects.equals(this.tenantId, saveOtaPackageInfoRequest.tenantId) && Objects.equals(this.deviceProfileId, saveOtaPackageInfoRequest.deviceProfileId) && Objects.equals(this.type, saveOtaPackageInfoRequest.type) && @@ -516,13 +517,12 @@ public boolean equals(Object o) { Objects.equals(this.checksum, saveOtaPackageInfoRequest.checksum) && Objects.equals(this.dataSize, saveOtaPackageInfoRequest.dataSize) && Objects.equals(this.usesUrl, saveOtaPackageInfoRequest.usesUrl) && - Objects.equals(this.additionalInfo, saveOtaPackageInfoRequest.additionalInfo) && Objects.equals(this.name, saveOtaPackageInfoRequest.name); } @Override public int hashCode() { - return Objects.hash(id, createdTime, tenantId, deviceProfileId, type, title, version, tag, url, hasData, fileName, contentType, checksumAlgorithm, checksum, dataSize, usesUrl, additionalInfo, name); + return Objects.hash(id, createdTime, additionalInfo, tenantId, deviceProfileId, type, title, version, tag, url, hasData, fileName, contentType, checksumAlgorithm, checksum, dataSize, usesUrl, name); } @Override @@ -531,6 +531,7 @@ public String toString() { sb.append("class SaveOtaPackageInfoRequest {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" tenantId: ").append(toIndentedString(tenantId)).append("\n"); sb.append(" deviceProfileId: ").append(toIndentedString(deviceProfileId)).append("\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); @@ -545,7 +546,6 @@ public String toString() { sb.append(" checksum: ").append(toIndentedString(checksum)).append("\n"); sb.append(" dataSize: ").append(toIndentedString(dataSize)).append("\n"); sb.append(" usesUrl: ").append(toIndentedString(usesUrl)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append("}"); return sb.toString(); @@ -604,6 +604,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `tenantId` to the URL query string if (getTenantId() != null) { joiner.add(getTenantId().toUrlQueryString(prefix + "tenantId" + suffix)); @@ -674,11 +679,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%susesUrl%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getUsesUrl())))); } - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - // add `name` to the URL query string if (getName() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleSimpleCondition.java b/ce/src/main/java/org/thingsboard/client/model/SimpleAlarmCondition.java similarity index 85% rename from ce/src/main/java/org/thingsboard/client/model/AlarmRuleSimpleCondition.java rename to ce/src/main/java/org/thingsboard/client/model/SimpleAlarmCondition.java index 2c40aa83..200ce71b 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleSimpleCondition.java +++ b/ce/src/main/java/org/thingsboard/client/model/SimpleAlarmCondition.java @@ -33,16 +33,16 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.Arrays; +import org.thingsboard.client.model.AlarmCondition; import org.thingsboard.client.model.AlarmConditionExpression; -import org.thingsboard.client.model.AlarmConditionValueAlarmRuleSchedule; -import org.thingsboard.client.model.AlarmRuleCondition; +import org.thingsboard.client.model.AlarmConditionValueAlarmSchedule; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.thingsboard.client.JSON; import org.thingsboard.client.ApiClient; /** - * AlarmRuleSimpleCondition + * SimpleAlarmCondition */ @JsonPropertyOrder({ }) @@ -53,24 +53,24 @@ ) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = true) -public class AlarmRuleSimpleCondition extends AlarmRuleCondition { - public AlarmRuleSimpleCondition() { +public class SimpleAlarmCondition extends AlarmCondition { + public SimpleAlarmCondition() { } @Override - public AlarmRuleSimpleCondition expression(@Nonnull AlarmConditionExpression expression) { + public SimpleAlarmCondition expression(@Nonnull AlarmConditionExpression expression) { this.setExpression(expression); return this; } @Override - public AlarmRuleSimpleCondition schedule(@Nullable AlarmConditionValueAlarmRuleSchedule schedule) { + public SimpleAlarmCondition schedule(@Nullable AlarmConditionValueAlarmSchedule schedule) { this.setSchedule(schedule); return this; } /** - * Return true if this AlarmRuleSimpleCondition object is equal to o. + * Return true if this SimpleAlarmCondition object is equal to o. */ @Override public boolean equals(Object o) { @@ -91,7 +91,7 @@ public int hashCode() { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class AlarmRuleSimpleCondition {\n"); + sb.append("class SimpleAlarmCondition {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append("}"); return sb.toString(); @@ -160,8 +160,8 @@ public String toUrlQueryString(String prefix) { static { // Initialize and register the discriminator mappings. Map> mappings = new HashMap>(); - mappings.put("AlarmRuleSimpleCondition", AlarmRuleSimpleCondition.class); - JSON.registerDiscriminator(AlarmRuleSimpleCondition.class, "type", mappings); + mappings.put("SimpleAlarmCondition", SimpleAlarmCondition.class); + JSON.registerDiscriminator(SimpleAlarmCondition.class, "type", mappings); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/SimpleAlarmConditionExpression.java b/ce/src/main/java/org/thingsboard/client/model/SimpleAlarmConditionExpression.java index e6a84462..b4faec69 100644 --- a/ce/src/main/java/org/thingsboard/client/model/SimpleAlarmConditionExpression.java +++ b/ce/src/main/java/org/thingsboard/client/model/SimpleAlarmConditionExpression.java @@ -36,8 +36,8 @@ import java.util.Arrays; import java.util.List; import org.thingsboard.client.model.AlarmConditionExpression; -import org.thingsboard.client.model.AlarmRuleConditionFilter; -import org.thingsboard.client.model.ComplexOperation; +import org.thingsboard.client.model.AlarmConditionFilter; +import org.thingsboard.client.model.AlarmRuleComplexOperation; import com.fasterxml.jackson.annotation.JsonPropertyOrder; @@ -60,21 +60,21 @@ public class SimpleAlarmConditionExpression extends AlarmConditionExpression { public static final String JSON_PROPERTY_FILTERS = "filters"; @Nonnull - private List filters = new ArrayList<>(); + private List filters = new ArrayList<>(); public static final String JSON_PROPERTY_OPERATION = "operation"; @Nullable - private ComplexOperation operation; + private AlarmRuleComplexOperation operation; public SimpleAlarmConditionExpression() { } - public SimpleAlarmConditionExpression filters(@Nonnull List filters) { + public SimpleAlarmConditionExpression filters(@Nonnull List filters) { this.filters = filters; return this; } - public SimpleAlarmConditionExpression addFiltersItem(AlarmRuleConditionFilter filtersItem) { + public SimpleAlarmConditionExpression addFiltersItem(AlarmConditionFilter filtersItem) { if (this.filters == null) { this.filters = new ArrayList<>(); } @@ -89,19 +89,19 @@ public SimpleAlarmConditionExpression addFiltersItem(AlarmRuleConditionFilter fi @Nonnull @JsonProperty(value = JSON_PROPERTY_FILTERS, required = true) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public List getFilters() { + public List getFilters() { return filters; } @JsonProperty(value = JSON_PROPERTY_FILTERS, required = true) @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setFilters(@Nonnull List filters) { + public void setFilters(@Nonnull List filters) { this.filters = filters; } - public SimpleAlarmConditionExpression operation(@Nullable ComplexOperation operation) { + public SimpleAlarmConditionExpression operation(@Nullable AlarmRuleComplexOperation operation) { this.operation = operation; return this; } @@ -113,14 +113,14 @@ public SimpleAlarmConditionExpression operation(@Nullable ComplexOperation opera @Nullable @JsonProperty(value = JSON_PROPERTY_OPERATION, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public ComplexOperation getOperation() { + public AlarmRuleComplexOperation getOperation() { return operation; } @JsonProperty(value = JSON_PROPERTY_OPERATION, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setOperation(@Nullable ComplexOperation operation) { + public void setOperation(@Nullable AlarmRuleComplexOperation operation) { this.operation = operation; } diff --git a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleSpecificTimeSchedule.java b/ce/src/main/java/org/thingsboard/client/model/SpecificTimeSchedule.java similarity index 83% rename from ce/src/main/java/org/thingsboard/client/model/AlarmRuleSpecificTimeSchedule.java rename to ce/src/main/java/org/thingsboard/client/model/SpecificTimeSchedule.java index 1743bd11..91c49425 100644 --- a/ce/src/main/java/org/thingsboard/client/model/AlarmRuleSpecificTimeSchedule.java +++ b/ce/src/main/java/org/thingsboard/client/model/SpecificTimeSchedule.java @@ -35,20 +35,20 @@ import java.util.Arrays; import java.util.LinkedHashSet; import java.util.Set; -import org.thingsboard.client.model.AlarmRuleSchedule; +import org.thingsboard.client.model.AlarmSchedule; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.thingsboard.client.JSON; import org.thingsboard.client.ApiClient; /** - * AlarmRuleSpecificTimeSchedule + * SpecificTimeSchedule */ @JsonPropertyOrder({ - AlarmRuleSpecificTimeSchedule.JSON_PROPERTY_DAYS_OF_WEEK, - AlarmRuleSpecificTimeSchedule.JSON_PROPERTY_ENDS_ON, - AlarmRuleSpecificTimeSchedule.JSON_PROPERTY_STARTS_ON, - AlarmRuleSpecificTimeSchedule.JSON_PROPERTY_TIMEZONE + SpecificTimeSchedule.JSON_PROPERTY_TIMEZONE, + SpecificTimeSchedule.JSON_PROPERTY_DAYS_OF_WEEK, + SpecificTimeSchedule.JSON_PROPERTY_STARTS_ON, + SpecificTimeSchedule.JSON_PROPERTY_ENDS_ON }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @JsonIgnoreProperties( @@ -57,32 +57,56 @@ ) @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = true) -public class AlarmRuleSpecificTimeSchedule extends AlarmRuleSchedule { +public class SpecificTimeSchedule extends AlarmSchedule { + public static final String JSON_PROPERTY_TIMEZONE = "timezone"; + @Nullable + private String timezone; + public static final String JSON_PROPERTY_DAYS_OF_WEEK = "daysOfWeek"; @Nullable private Set daysOfWeek = new LinkedHashSet<>(); + public static final String JSON_PROPERTY_STARTS_ON = "startsOn"; + @Nullable + private Long startsOn; + public static final String JSON_PROPERTY_ENDS_ON = "endsOn"; @Nullable private Long endsOn; - public static final String JSON_PROPERTY_STARTS_ON = "startsOn"; - @Nullable - private Long startsOn; + public SpecificTimeSchedule() { + } - public static final String JSON_PROPERTY_TIMEZONE = "timezone"; + public SpecificTimeSchedule timezone(@Nullable String timezone) { + this.timezone = timezone; + return this; + } + + /** + * Get timezone + * @return timezone + */ @Nullable - private String timezone; + @JsonProperty(value = JSON_PROPERTY_TIMEZONE, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public String getTimezone() { + return timezone; + } - public AlarmRuleSpecificTimeSchedule() { + + @JsonProperty(value = JSON_PROPERTY_TIMEZONE, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setTimezone(@Nullable String timezone) { + this.timezone = timezone; } - public AlarmRuleSpecificTimeSchedule daysOfWeek(@Nullable Set daysOfWeek) { + + public SpecificTimeSchedule daysOfWeek(@Nullable Set daysOfWeek) { this.daysOfWeek = daysOfWeek; return this; } - public AlarmRuleSpecificTimeSchedule addDaysOfWeekItem(Integer daysOfWeekItem) { + public SpecificTimeSchedule addDaysOfWeekItem(Integer daysOfWeekItem) { if (this.daysOfWeek == null) { this.daysOfWeek = new LinkedHashSet<>(); } @@ -110,31 +134,7 @@ public void setDaysOfWeek(@Nullable Set daysOfWeek) { } - public AlarmRuleSpecificTimeSchedule endsOn(@Nullable Long endsOn) { - this.endsOn = endsOn; - return this; - } - - /** - * Get endsOn - * @return endsOn - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ENDS_ON, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Long getEndsOn() { - return endsOn; - } - - - @JsonProperty(value = JSON_PROPERTY_ENDS_ON, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setEndsOn(@Nullable Long endsOn) { - this.endsOn = endsOn; - } - - - public AlarmRuleSpecificTimeSchedule startsOn(@Nullable Long startsOn) { + public SpecificTimeSchedule startsOn(@Nullable Long startsOn) { this.startsOn = startsOn; return this; } @@ -158,32 +158,32 @@ public void setStartsOn(@Nullable Long startsOn) { } - public AlarmRuleSpecificTimeSchedule timezone(@Nullable String timezone) { - this.timezone = timezone; + public SpecificTimeSchedule endsOn(@Nullable Long endsOn) { + this.endsOn = endsOn; return this; } /** - * Get timezone - * @return timezone + * Get endsOn + * @return endsOn */ @Nullable - @JsonProperty(value = JSON_PROPERTY_TIMEZONE, required = false) + @JsonProperty(value = JSON_PROPERTY_ENDS_ON, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getTimezone() { - return timezone; + public Long getEndsOn() { + return endsOn; } - @JsonProperty(value = JSON_PROPERTY_TIMEZONE, required = false) + @JsonProperty(value = JSON_PROPERTY_ENDS_ON, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setTimezone(@Nullable String timezone) { - this.timezone = timezone; + public void setEndsOn(@Nullable Long endsOn) { + this.endsOn = endsOn; } /** - * Return true if this AlarmRuleSpecificTimeSchedule object is equal to o. + * Return true if this SpecificTimeSchedule object is equal to o. */ @Override public boolean equals(Object o) { @@ -193,28 +193,28 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - AlarmRuleSpecificTimeSchedule alarmRuleSpecificTimeSchedule = (AlarmRuleSpecificTimeSchedule) o; - return Objects.equals(this.daysOfWeek, alarmRuleSpecificTimeSchedule.daysOfWeek) && - Objects.equals(this.endsOn, alarmRuleSpecificTimeSchedule.endsOn) && - Objects.equals(this.startsOn, alarmRuleSpecificTimeSchedule.startsOn) && - Objects.equals(this.timezone, alarmRuleSpecificTimeSchedule.timezone) && + SpecificTimeSchedule specificTimeSchedule = (SpecificTimeSchedule) o; + return Objects.equals(this.timezone, specificTimeSchedule.timezone) && + Objects.equals(this.daysOfWeek, specificTimeSchedule.daysOfWeek) && + Objects.equals(this.startsOn, specificTimeSchedule.startsOn) && + Objects.equals(this.endsOn, specificTimeSchedule.endsOn) && super.equals(o); } @Override public int hashCode() { - return Objects.hash(daysOfWeek, endsOn, startsOn, timezone, super.hashCode()); + return Objects.hash(timezone, daysOfWeek, startsOn, endsOn, super.hashCode()); } @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("class AlarmRuleSpecificTimeSchedule {\n"); + sb.append("class SpecificTimeSchedule {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" timezone: ").append(toIndentedString(timezone)).append("\n"); sb.append(" daysOfWeek: ").append(toIndentedString(daysOfWeek)).append("\n"); - sb.append(" endsOn: ").append(toIndentedString(endsOn)).append("\n"); sb.append(" startsOn: ").append(toIndentedString(startsOn)).append("\n"); - sb.append(" timezone: ").append(toIndentedString(timezone)).append("\n"); + sb.append(" endsOn: ").append(toIndentedString(endsOn)).append("\n"); sb.append("}"); return sb.toString(); } @@ -267,6 +267,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%stype%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getType())))); } + // add `timezone` to the URL query string + if (getTimezone() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%stimezone%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getTimezone())))); + } + // add `daysOfWeek` to the URL query string if (getDaysOfWeek() != null) { int i = 0; @@ -278,19 +283,14 @@ public String toUrlQueryString(String prefix) { i++; } - // add `endsOn` to the URL query string - if (getEndsOn() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sendsOn%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEndsOn())))); - } - // add `startsOn` to the URL query string if (getStartsOn() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sstartsOn%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getStartsOn())))); } - // add `timezone` to the URL query string - if (getTimezone() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%stimezone%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getTimezone())))); + // add `endsOn` to the URL query string + if (getEndsOn() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sendsOn%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEndsOn())))); } return joiner.toString(); @@ -298,8 +298,8 @@ public String toUrlQueryString(String prefix) { static { // Initialize and register the discriminator mappings. Map> mappings = new HashMap>(); - mappings.put("AlarmRuleSpecificTimeSchedule", AlarmRuleSpecificTimeSchedule.class); - JSON.registerDiscriminator(AlarmRuleSpecificTimeSchedule.class, "type", mappings); + mappings.put("SpecificTimeSchedule", SpecificTimeSchedule.class); + JSON.registerDiscriminator(SpecificTimeSchedule.class, "type", mappings); } } diff --git a/ce/src/main/java/org/thingsboard/client/model/Tenant.java b/ce/src/main/java/org/thingsboard/client/model/Tenant.java index 4f205e91..63632f0a 100644 --- a/ce/src/main/java/org/thingsboard/client/model/Tenant.java +++ b/ce/src/main/java/org/thingsboard/client/model/Tenant.java @@ -42,6 +42,7 @@ @JsonPropertyOrder({ Tenant.JSON_PROPERTY_ID, Tenant.JSON_PROPERTY_CREATED_TIME, + Tenant.JSON_PROPERTY_ADDITIONAL_INFO, Tenant.JSON_PROPERTY_COUNTRY, Tenant.JSON_PROPERTY_STATE, Tenant.JSON_PROPERTY_CITY, @@ -54,7 +55,6 @@ Tenant.JSON_PROPERTY_REGION, Tenant.JSON_PROPERTY_TENANT_PROFILE_ID, Tenant.JSON_PROPERTY_VERSION, - Tenant.JSON_PROPERTY_ADDITIONAL_INFO, Tenant.JSON_PROPERTY_NAME }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @@ -67,6 +67,10 @@ public class Tenant { @Nullable private Long createdTime; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo; + public static final String JSON_PROPERTY_COUNTRY = "country"; @Nullable private String country; @@ -115,10 +119,6 @@ public class Tenant { @Nullable private Long version; - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo; - public static final String JSON_PROPERTY_NAME = "name"; @Nullable private String name; @@ -174,6 +174,30 @@ public Long getCreatedTime() { + public Tenant additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar). + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + public Tenant country(@Nullable String country) { this.country = country; return this; @@ -462,30 +486,6 @@ public void setVersion(@Nullable Long version) { } - public Tenant additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - return this; - } - - /** - * Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar). - * @return additionalInfo - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; - } - - - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - - /** * Name of the tenant. Read-only, duplicated from title for backward compatibility * @return name @@ -514,6 +514,7 @@ public boolean equals(Object o) { Tenant tenant = (Tenant) o; return Objects.equals(this.id, tenant.id) && Objects.equals(this.createdTime, tenant.createdTime) && + Objects.equals(this.additionalInfo, tenant.additionalInfo) && Objects.equals(this.country, tenant.country) && Objects.equals(this.state, tenant.state) && Objects.equals(this.city, tenant.city) && @@ -526,13 +527,12 @@ public boolean equals(Object o) { Objects.equals(this.region, tenant.region) && Objects.equals(this.tenantProfileId, tenant.tenantProfileId) && Objects.equals(this.version, tenant.version) && - Objects.equals(this.additionalInfo, tenant.additionalInfo) && Objects.equals(this.name, tenant.name); } @Override public int hashCode() { - return Objects.hash(id, createdTime, country, state, city, address, address2, zip, phone, email, title, region, tenantProfileId, version, additionalInfo, name); + return Objects.hash(id, createdTime, additionalInfo, country, state, city, address, address2, zip, phone, email, title, region, tenantProfileId, version, name); } @Override @@ -541,6 +541,7 @@ public String toString() { sb.append("class Tenant {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" country: ").append(toIndentedString(country)).append("\n"); sb.append(" state: ").append(toIndentedString(state)).append("\n"); sb.append(" city: ").append(toIndentedString(city)).append("\n"); @@ -553,7 +554,6 @@ public String toString() { sb.append(" region: ").append(toIndentedString(region)).append("\n"); sb.append(" tenantProfileId: ").append(toIndentedString(tenantProfileId)).append("\n"); sb.append(" version: ").append(toIndentedString(version)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append("}"); return sb.toString(); @@ -612,6 +612,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `country` to the URL query string if (getCountry() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%scountry%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCountry())))); @@ -672,11 +677,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sversion%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getVersion())))); } - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - // add `name` to the URL query string if (getName() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); diff --git a/ce/src/main/java/org/thingsboard/client/model/TenantInfo.java b/ce/src/main/java/org/thingsboard/client/model/TenantInfo.java index d838586b..92952abc 100644 --- a/ce/src/main/java/org/thingsboard/client/model/TenantInfo.java +++ b/ce/src/main/java/org/thingsboard/client/model/TenantInfo.java @@ -42,6 +42,7 @@ @JsonPropertyOrder({ TenantInfo.JSON_PROPERTY_ID, TenantInfo.JSON_PROPERTY_CREATED_TIME, + TenantInfo.JSON_PROPERTY_ADDITIONAL_INFO, TenantInfo.JSON_PROPERTY_COUNTRY, TenantInfo.JSON_PROPERTY_STATE, TenantInfo.JSON_PROPERTY_CITY, @@ -55,7 +56,6 @@ TenantInfo.JSON_PROPERTY_TENANT_PROFILE_ID, TenantInfo.JSON_PROPERTY_VERSION, TenantInfo.JSON_PROPERTY_TENANT_PROFILE_NAME, - TenantInfo.JSON_PROPERTY_ADDITIONAL_INFO, TenantInfo.JSON_PROPERTY_NAME }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @@ -68,6 +68,10 @@ public class TenantInfo { @Nullable private Long createdTime; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo; + public static final String JSON_PROPERTY_COUNTRY = "country"; @Nullable private String country; @@ -120,10 +124,6 @@ public class TenantInfo { @Nullable private String tenantProfileName; - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo; - public static final String JSON_PROPERTY_NAME = "name"; @Nullable private String name; @@ -179,6 +179,30 @@ public Long getCreatedTime() { + public TenantInfo additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar). + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + public TenantInfo country(@Nullable String country) { this.country = country; return this; @@ -491,30 +515,6 @@ public void setTenantProfileName(@Nullable String tenantProfileName) { } - public TenantInfo additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - return this; - } - - /** - * Additional parameters of the tenant. May include: 'description' (string), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean, whether to hide the dashboard toolbar). - * @return additionalInfo - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; - } - - - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - - /** * Name of the tenant. Read-only, duplicated from title for backward compatibility * @return name @@ -543,6 +543,7 @@ public boolean equals(Object o) { TenantInfo tenantInfo = (TenantInfo) o; return Objects.equals(this.id, tenantInfo.id) && Objects.equals(this.createdTime, tenantInfo.createdTime) && + Objects.equals(this.additionalInfo, tenantInfo.additionalInfo) && Objects.equals(this.country, tenantInfo.country) && Objects.equals(this.state, tenantInfo.state) && Objects.equals(this.city, tenantInfo.city) && @@ -556,13 +557,12 @@ public boolean equals(Object o) { Objects.equals(this.tenantProfileId, tenantInfo.tenantProfileId) && Objects.equals(this.version, tenantInfo.version) && Objects.equals(this.tenantProfileName, tenantInfo.tenantProfileName) && - Objects.equals(this.additionalInfo, tenantInfo.additionalInfo) && Objects.equals(this.name, tenantInfo.name); } @Override public int hashCode() { - return Objects.hash(id, createdTime, country, state, city, address, address2, zip, phone, email, title, region, tenantProfileId, version, tenantProfileName, additionalInfo, name); + return Objects.hash(id, createdTime, additionalInfo, country, state, city, address, address2, zip, phone, email, title, region, tenantProfileId, version, tenantProfileName, name); } @Override @@ -571,6 +571,7 @@ public String toString() { sb.append("class TenantInfo {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" country: ").append(toIndentedString(country)).append("\n"); sb.append(" state: ").append(toIndentedString(state)).append("\n"); sb.append(" city: ").append(toIndentedString(city)).append("\n"); @@ -584,7 +585,6 @@ public String toString() { sb.append(" tenantProfileId: ").append(toIndentedString(tenantProfileId)).append("\n"); sb.append(" version: ").append(toIndentedString(version)).append("\n"); sb.append(" tenantProfileName: ").append(toIndentedString(tenantProfileName)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append("}"); return sb.toString(); @@ -643,6 +643,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `country` to the URL query string if (getCountry() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%scountry%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCountry())))); @@ -708,11 +713,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%stenantProfileName%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getTenantProfileName())))); } - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - // add `name` to the URL query string if (getName() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName())))); diff --git a/ce/src/main/java/org/thingsboard/client/model/User.java b/ce/src/main/java/org/thingsboard/client/model/User.java index cbdc28ea..3c512807 100644 --- a/ce/src/main/java/org/thingsboard/client/model/User.java +++ b/ce/src/main/java/org/thingsboard/client/model/User.java @@ -44,6 +44,7 @@ @JsonPropertyOrder({ User.JSON_PROPERTY_ID, User.JSON_PROPERTY_CREATED_TIME, + User.JSON_PROPERTY_ADDITIONAL_INFO, User.JSON_PROPERTY_TENANT_ID, User.JSON_PROPERTY_CUSTOMER_ID, User.JSON_PROPERTY_EMAIL, @@ -52,7 +53,6 @@ User.JSON_PROPERTY_LAST_NAME, User.JSON_PROPERTY_PHONE, User.JSON_PROPERTY_VERSION, - User.JSON_PROPERTY_ADDITIONAL_INFO, User.JSON_PROPERTY_NAME }) @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0") @@ -65,6 +65,10 @@ public class User { @Nullable private Long createdTime; + public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; + @Nullable + private com.fasterxml.jackson.databind.JsonNode additionalInfo; + public static final String JSON_PROPERTY_TENANT_ID = "tenantId"; @Nullable private TenantId tenantId; @@ -97,10 +101,6 @@ public class User { @Nullable private Long version; - public static final String JSON_PROPERTY_ADDITIONAL_INFO = "additionalInfo"; - @Nullable - private com.fasterxml.jackson.databind.JsonNode additionalInfo; - public static final String JSON_PROPERTY_NAME = "name"; @Nullable private String name; @@ -156,6 +156,30 @@ public Long getCreatedTime() { + public User additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + return this; + } + + /** + * Additional parameters of the user. May include: 'defaultDashboardId' (string, UUID of the default dashboard), 'defaultDashboardFullscreen' (boolean), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean), 'lang' (string, user locale, e.g. 'en_US'), 'authProviderName' (string, name of the authentication provider). + * @return additionalInfo + */ + @Nullable + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { + return additionalInfo; + } + + + @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + public User tenantId(@Nullable TenantId tenantId) { this.tenantId = tenantId; return this; @@ -348,30 +372,6 @@ public void setVersion(@Nullable Long version) { } - public User additionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - return this; - } - - /** - * Additional parameters of the user. May include: 'defaultDashboardId' (string, UUID of the default dashboard), 'defaultDashboardFullscreen' (boolean), 'homeDashboardId' (string, UUID of the home dashboard), 'homeDashboardHideToolbar' (boolean), 'lang' (string, user locale, e.g. 'en_US'), 'authProviderName' (string, name of the authentication provider). - * @return additionalInfo - */ - @Nullable - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public com.fasterxml.jackson.databind.JsonNode getAdditionalInfo() { - return additionalInfo; - } - - - @JsonProperty(value = JSON_PROPERTY_ADDITIONAL_INFO, required = false) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setAdditionalInfo(@Nullable com.fasterxml.jackson.databind.JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - - /** * Duplicates the email of the user, readonly * @return name @@ -400,6 +400,7 @@ public boolean equals(Object o) { User user = (User) o; return Objects.equals(this.id, user.id) && Objects.equals(this.createdTime, user.createdTime) && + Objects.equals(this.additionalInfo, user.additionalInfo) && Objects.equals(this.tenantId, user.tenantId) && Objects.equals(this.customerId, user.customerId) && Objects.equals(this.email, user.email) && @@ -408,13 +409,12 @@ public boolean equals(Object o) { Objects.equals(this.lastName, user.lastName) && Objects.equals(this.phone, user.phone) && Objects.equals(this.version, user.version) && - Objects.equals(this.additionalInfo, user.additionalInfo) && Objects.equals(this.name, user.name); } @Override public int hashCode() { - return Objects.hash(id, createdTime, tenantId, customerId, email, authority, firstName, lastName, phone, version, additionalInfo, name); + return Objects.hash(id, createdTime, additionalInfo, tenantId, customerId, email, authority, firstName, lastName, phone, version, name); } @Override @@ -423,6 +423,7 @@ public String toString() { sb.append("class User {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" tenantId: ").append(toIndentedString(tenantId)).append("\n"); sb.append(" customerId: ").append(toIndentedString(customerId)).append("\n"); sb.append(" email: ").append(toIndentedString(email)).append("\n"); @@ -431,7 +432,6 @@ public String toString() { sb.append(" lastName: ").append(toIndentedString(lastName)).append("\n"); sb.append(" phone: ").append(toIndentedString(phone)).append("\n"); sb.append(" version: ").append(toIndentedString(version)).append("\n"); - sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append("}"); return sb.toString(); @@ -490,6 +490,11 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%screatedTime%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getCreatedTime())))); } + // add `additionalInfo` to the URL query string + if (getAdditionalInfo() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); + } + // add `tenantId` to the URL query string if (getTenantId() != null) { joiner.add(getTenantId().toUrlQueryString(prefix + "tenantId" + suffix)); @@ -530,11 +535,6 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sversion%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getVersion())))); } - // add `additionalInfo` to the URL query string - if (getAdditionalInfo() != null) { - joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo())))); - } - // add `name` to the URL query string if (getName() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sname%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getName()))));