Skip to content

Commit 7a5f9f4

Browse files
author
TeamCity
committed
Update PAAS OpenAPI spec (from develop/4.4)
1 parent 1afbb8a commit 7a5f9f4

22 files changed

Lines changed: 382 additions & 382 deletions

‎paas/docs/CalculatedFieldConfiguration.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
| Name | Type | Description | Notes |
99
|------------ | ------------- | ------------- | -------------|
10-
| **aiGenerated** | **Boolean** | | [optional] |
1110
| **output** | **Output** | | [optional] |
11+
| **aiGenerated** | **Boolean** | | [optional] |
1212
| **type** | **String** | | |
1313

1414

‎paas/docs/ReportTemplateConfig.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
| Name | Type | Description | Notes |
99
|------------ | ------------- | ------------- | -------------|
1010
| **format** | **TbReportFormat** | Report format | |
11-
| **entityAliases** | **List\<EntityAlias\>** | | [optional] |
1211
| **filters** | **List\<Filter\>** | | [optional] |
1312
| **namePattern** | **String** | | [optional] |
1413
| **components** | **List\<ReportComponent\>** | | [optional] |
1514
| **timeDataPattern** | **String** | | [optional] |
15+
| **entityAliases** | **List\<EntityAlias\>** | | [optional] |
1616

1717

1818

‎paas/docs/ReportTimeSeriesChartSettings.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
| **legendLabelColor** | **String** | | [optional] |
2424
| **legendValueFont** | **Font** | | [optional] |
2525
| **legendValueColor** | **String** | | [optional] |
26-
| **xaxis** | **TimeSeriesChartXAxisSettings** | | [optional] |
2726
| **yaxes** | **Map\<String, TimeSeriesChartYAxisSettings\>** | | [optional] |
27+
| **xaxis** | **TimeSeriesChartXAxisSettings** | | [optional] |
2828
| **thresholds** | **List\<TimeSeriesChartThreshold\>** | | [optional] |
2929
| **grid** | **TimeSeriesChartGridSettings** | | [optional] |
3030
| **yAxes** | **Map\<String, TimeSeriesChartYAxisSettings\>** | | [optional] |

‎paas/docs/SelfRegistrationParams.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
|------------ | ------------- | ------------- | -------------|
1010
| **permissions** | **List\<GroupPermission\>** | | [optional] |
1111
| **type** | **SelfRegistrationType** | | |
12-
| **showPrivacyPolicy** | **Boolean** | | [optional] |
13-
| **showTermsOfUse** | **Boolean** | | [optional] |
1412
| **title** | **String** | | [optional] |
1513
| **enabled** | **Boolean** | | [optional] |
1614
| **homeDashboard** | **HomeDashboardParams** | | [optional] |
@@ -21,6 +19,8 @@
2119
| **customerTitlePrefix** | **String** | | [optional] |
2220
| **customMenuId** | **CustomMenuId** | | [optional] |
2321
| **customerGroupId** | **EntityGroupId** | | [optional] |
22+
| **showPrivacyPolicy** | **Boolean** | | [optional] |
23+
| **showTermsOfUse** | **Boolean** | | [optional] |
2424

2525

2626

‎paas/spec/openapi.json‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -71857,10 +71857,10 @@
7185771857
"$ref": "#/components/schemas/ThingsboardErrorResponse"
7185871858
},
7185971859
"examples": {
71860-
"account-disabled": {
71861-
"summary": "Disabled account",
71860+
"authentication-failed": {
71861+
"summary": "General authentication error",
7186271862
"value": {
71863-
"message": "User account is not active",
71863+
"message": "Authentication failed",
7186471864
"errorCode": 10,
7186571865
"status": 401,
7186671866
"subscriptionErrorCode": null,
@@ -71869,10 +71869,10 @@
7186971869
"timestamp": 1609459200000
7187071870
}
7187171871
},
71872-
"authentication-failed": {
71873-
"summary": "General authentication error",
71872+
"account-disabled": {
71873+
"summary": "Disabled account",
7187471874
"value": {
71875-
"message": "Authentication failed",
71875+
"message": "User account is not active",
7187671876
"errorCode": 10,
7187771877
"status": 401,
7187871878
"subscriptionErrorCode": null,
@@ -71881,11 +71881,11 @@
7188171881
"timestamp": 1609459200000
7188271882
}
7188371883
},
71884-
"token-expired": {
71885-
"summary": "JWT token expired",
71884+
"bad-credentials": {
71885+
"summary": "Bad credentials",
7188671886
"value": {
71887-
"message": "Token has expired",
71888-
"errorCode": 11,
71887+
"message": "Invalid username or password",
71888+
"errorCode": 10,
7188971889
"status": 401,
7189071890
"subscriptionErrorCode": null,
7189171891
"subscriptionEntry": null,
@@ -71905,11 +71905,11 @@
7190571905
"timestamp": 1609459200000
7190671906
}
7190771907
},
71908-
"bad-credentials": {
71909-
"summary": "Bad credentials",
71908+
"token-expired": {
71909+
"summary": "JWT token expired",
7191071910
"value": {
71911-
"message": "Invalid username or password",
71912-
"errorCode": 10,
71911+
"message": "Token has expired",
71912+
"errorCode": 11,
7191371913
"status": 401,
7191471914
"subscriptionErrorCode": null,
7191571915
"subscriptionEntry": null,
@@ -71988,10 +71988,10 @@
7198871988
"$ref": "#/components/schemas/ThingsboardErrorResponse"
7198971989
},
7199071990
"examples": {
71991-
"account-disabled": {
71992-
"summary": "Disabled account",
71991+
"authentication-failed": {
71992+
"summary": "General authentication error",
7199371993
"value": {
71994-
"message": "User account is not active",
71994+
"message": "Authentication failed",
7199571995
"errorCode": 10,
7199671996
"status": 401,
7199771997
"subscriptionErrorCode": null,
@@ -72000,10 +72000,10 @@
7200072000
"timestamp": 1609459200000
7200172001
}
7200272002
},
72003-
"authentication-failed": {
72004-
"summary": "General authentication error",
72003+
"account-disabled": {
72004+
"summary": "Disabled account",
7200572005
"value": {
72006-
"message": "Authentication failed",
72006+
"message": "User account is not active",
7200772007
"errorCode": 10,
7200872008
"status": 401,
7200972009
"subscriptionErrorCode": null,
@@ -72012,11 +72012,11 @@
7201272012
"timestamp": 1609459200000
7201372013
}
7201472014
},
72015-
"token-expired": {
72016-
"summary": "JWT token expired",
72015+
"bad-credentials": {
72016+
"summary": "Bad credentials",
7201772017
"value": {
72018-
"message": "Token has expired",
72019-
"errorCode": 11,
72018+
"message": "Invalid username or password",
72019+
"errorCode": 10,
7202072020
"status": 401,
7202172021
"subscriptionErrorCode": null,
7202272022
"subscriptionEntry": null,
@@ -72036,11 +72036,11 @@
7203672036
"timestamp": 1609459200000
7203772037
}
7203872038
},
72039-
"bad-credentials": {
72040-
"summary": "Bad credentials",
72039+
"token-expired": {
72040+
"summary": "JWT token expired",
7204172041
"value": {
72042-
"message": "Invalid username or password",
72043-
"errorCode": 10,
72042+
"message": "Token has expired",
72043+
"errorCode": 11,
7204472044
"status": 401,
7204572045
"subscriptionErrorCode": null,
7204672046
"subscriptionEntry": null,
@@ -134706,12 +134706,12 @@
134706134706
}
134707134707
},
134708134708
"properties": {
134709-
"aiGenerated": {
134710-
"type": "boolean"
134711-
},
134712134709
"output": {
134713134710
"$ref": "#/components/schemas/Output"
134714134711
},
134712+
"aiGenerated": {
134713+
"type": "boolean"
134714+
},
134715134715
"type": {
134716134716
"type": "string"
134717134717
}
@@ -150706,12 +150706,6 @@
150706150706
"$ref": "#/components/schemas/TbReportFormat",
150707150707
"description": "Report format"
150708150708
},
150709-
"entityAliases": {
150710-
"type": "array",
150711-
"items": {
150712-
"$ref": "#/components/schemas/EntityAlias"
150713-
}
150714-
},
150715150709
"filters": {
150716150710
"type": "array",
150717150711
"items": {
@@ -150729,6 +150723,12 @@
150729150723
},
150730150724
"timeDataPattern": {
150731150725
"type": "string"
150726+
},
150727+
"entityAliases": {
150728+
"type": "array",
150729+
"items": {
150730+
"$ref": "#/components/schemas/EntityAlias"
150731+
}
150732150732
}
150733150733
},
150734150734
"required": [
@@ -150902,15 +150902,15 @@
150902150902
"legendValueColor": {
150903150903
"type": "string"
150904150904
},
150905-
"xaxis": {
150906-
"$ref": "#/components/schemas/TimeSeriesChartXAxisSettings"
150907-
},
150908150905
"yaxes": {
150909150906
"type": "object",
150910150907
"additionalProperties": {
150911150908
"$ref": "#/components/schemas/TimeSeriesChartYAxisSettings"
150912150909
}
150913150910
},
150911+
"xaxis": {
150912+
"$ref": "#/components/schemas/TimeSeriesChartXAxisSettings"
150913+
},
150914150914
"thresholds": {
150915150915
"type": "array",
150916150916
"items": {
@@ -152664,12 +152664,6 @@
152664152664
"type": {
152665152665
"$ref": "#/components/schemas/SelfRegistrationType"
152666152666
},
152667-
"showPrivacyPolicy": {
152668-
"type": "boolean"
152669-
},
152670-
"showTermsOfUse": {
152671-
"type": "boolean"
152672-
},
152673152667
"title": {
152674152668
"type": "string"
152675152669
},
@@ -152702,6 +152696,12 @@
152702152696
},
152703152697
"customerGroupId": {
152704152698
"$ref": "#/components/schemas/EntityGroupId"
152699+
},
152700+
"showPrivacyPolicy": {
152701+
"type": "boolean"
152702+
},
152703+
"showTermsOfUse": {
152704+
"type": "boolean"
152705152705
}
152706152706
},
152707152707
"required": [

‎paas/src/main/java/org/thingsboard/client/model/AlarmCalculatedFieldConfiguration.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -316,14 +316,14 @@ public void setPropagateRelationTypes(@javax.annotation.Nullable List<String> pr
316316

317317

318318
@Override
319-
public AlarmCalculatedFieldConfiguration aiGenerated(@javax.annotation.Nullable Boolean aiGenerated) {
320-
this.setAiGenerated(aiGenerated);
319+
public AlarmCalculatedFieldConfiguration output(@javax.annotation.Nullable Output output) {
320+
this.setOutput(output);
321321
return this;
322322
}
323323

324324
@Override
325-
public AlarmCalculatedFieldConfiguration output(@javax.annotation.Nullable Output output) {
326-
this.setOutput(output);
325+
public AlarmCalculatedFieldConfiguration aiGenerated(@javax.annotation.Nullable Boolean aiGenerated) {
326+
this.setAiGenerated(aiGenerated);
327327
return this;
328328
}
329329

@@ -421,16 +421,16 @@ public String toUrlQueryString(String prefix) {
421421

422422
StringJoiner joiner = new StringJoiner("&");
423423

424-
// add `aiGenerated` to the URL query string
425-
if (getAiGenerated() != null) {
426-
joiner.add(String.format(java.util.Locale.ROOT, "%saiGenerated%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAiGenerated()))));
427-
}
428-
429424
// add `output` to the URL query string
430425
if (getOutput() != null) {
431426
joiner.add(getOutput().toUrlQueryString(prefix + "output" + suffix));
432427
}
433428

429+
// add `aiGenerated` to the URL query string
430+
if (getAiGenerated() != null) {
431+
joiner.add(String.format(java.util.Locale.ROOT, "%saiGenerated%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAiGenerated()))));
432+
}
433+
434434
// add `type` to the URL query string
435435
if (getType() != null) {
436436
joiner.add(String.format(java.util.Locale.ROOT, "%stype%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getType()))));

0 commit comments

Comments
 (0)