Update CE OpenAPI spec in master (from master)

Author: ViacheslavKlimov

ce/docs/DeviceProfile.md

@@ -242,7 +242,7 @@ A JSON value representing the device profile.
 | epmax | Long |  | [optional] |
 
 #### TelemetryObserveStrategy (enum)
-`SINGLE_0_ONE_RESOURCE_EQUALS_ONE_SINGLE_OBSERVE_REQUEST` | `COMPOSITE_ALL_1_ALL_RESOURCES_IN_ONE_COMPOSITE_OBSERVE_REQUEST` | `COMPOSITE_BY_OBJECT_2_GROUPED_COMPOSITE_OBSERVE_REQUESTS_BY_OBJECT`
+`SINGLE` | `COMPOSITE_ALL` | `COMPOSITE_BY_OBJECT`
 
 #### PowerMode (enum)
 `PSM` | `DRX` | `E_DRX`

ce/docs/DeviceProfileData.md

@@ -203,7 +203,7 @@
 | epmax | Long |  | [optional] |
 
 #### TelemetryObserveStrategy (enum)
-`SINGLE_0_ONE_RESOURCE_EQUALS_ONE_SINGLE_OBSERVE_REQUEST` | `COMPOSITE_ALL_1_ALL_RESOURCES_IN_ONE_COMPOSITE_OBSERVE_REQUEST` | `COMPOSITE_BY_OBJECT_2_GROUPED_COMPOSITE_OBSERVE_REQUESTS_BY_OBJECT`
+`SINGLE` | `COMPOSITE_ALL` | `COMPOSITE_BY_OBJECT`
 
 #### PowerMode (enum)
 `PSM` | `DRX` | `E_DRX`

ce/docs/DeviceProfileTransportConfiguration.md

@@ -174,7 +174,7 @@ Configuration for device profile transport
 | epmax | Long |  | [optional] |
 
 #### TelemetryObserveStrategy (enum)
-`SINGLE_0_ONE_RESOURCE_EQUALS_ONE_SINGLE_OBSERVE_REQUEST` | `COMPOSITE_ALL_1_ALL_RESOURCES_IN_ONE_COMPOSITE_OBSERVE_REQUEST` | `COMPOSITE_BY_OBJECT_2_GROUPED_COMPOSITE_OBSERVE_REQUESTS_BY_OBJECT`
+`SINGLE` | `COMPOSITE_ALL` | `COMPOSITE_BY_OBJECT`
 
 #### SnmpCommunicationSpec (enum)
 `TELEMETRY_QUERYING` | `CLIENT_ATTRIBUTES_QUERYING` | `SHARED_ATTRIBUTES_SETTING` | `TO_DEVICE_RPC_REQUEST` | `TO_SERVER_RPC_REQUEST`

ce/docs/Lwm2mDeviceProfileTransportConfiguration.md

@@ -71,7 +71,7 @@
 | epmax | Long |  | [optional] |
 
 #### TelemetryObserveStrategy (enum)
-`SINGLE_0_ONE_RESOURCE_EQUALS_ONE_SINGLE_OBSERVE_REQUEST` | `COMPOSITE_ALL_1_ALL_RESOURCES_IN_ONE_COMPOSITE_OBSERVE_REQUEST` | `COMPOSITE_BY_OBJECT_2_GROUPED_COMPOSITE_OBSERVE_REQUESTS_BY_OBJECT`
+`SINGLE` | `COMPOSITE_ALL` | `COMPOSITE_BY_OBJECT`
 
 #### PowerMode (enum)
 `PSM` | `DRX` | `E_DRX`

ce/docs/PageDataDeviceProfile.md

@@ -248,7 +248,7 @@
 | epmax | Long |  | [optional] |
 
 #### TelemetryObserveStrategy (enum)
-`SINGLE_0_ONE_RESOURCE_EQUALS_ONE_SINGLE_OBSERVE_REQUEST` | `COMPOSITE_ALL_1_ALL_RESOURCES_IN_ONE_COMPOSITE_OBSERVE_REQUEST` | `COMPOSITE_BY_OBJECT_2_GROUPED_COMPOSITE_OBSERVE_REQUESTS_BY_OBJECT`
+`SINGLE` | `COMPOSITE_ALL` | `COMPOSITE_BY_OBJECT`
 
 #### PowerMode (enum)
 `PSM` | `DRX` | `E_DRX`

ce/docs/TelemetryMappingConfiguration.md

@@ -36,7 +36,7 @@
 | epmax | Long |  | [optional] |
 
 #### TelemetryObserveStrategy (enum)
-`SINGLE_0_ONE_RESOURCE_EQUALS_ONE_SINGLE_OBSERVE_REQUEST` | `COMPOSITE_ALL_1_ALL_RESOURCES_IN_ONE_COMPOSITE_OBSERVE_REQUEST` | `COMPOSITE_BY_OBJECT_2_GROUPED_COMPOSITE_OBSERVE_REQUESTS_BY_OBJECT`
+`SINGLE` | `COMPOSITE_ALL` | `COMPOSITE_BY_OBJECT`
 
 #### LwM2mVersion
 | Name | Type | Description | Notes |

ce/docs/TelemetryObserveStrategy.md

@@ -3,14 +3,16 @@
 
 `org.thingsboard.client.model.TelemetryObserveStrategy`
 
+Observation strategy for telemetry. SINGLE (0): one resource equals one single observe request. COMPOSITE_ALL (1): all resources in one composite observe request. COMPOSITE_BY_OBJECT (2): grouped composite observe requests by object.
+
 ## Enum Values
 
 
-* `SINGLE_0_ONE_RESOURCE_EQUALS_ONE_SINGLE_OBSERVE_REQUEST` (value: `"SINGLE (0): One resource equals one single observe request"`)
+* `SINGLE` (value: `"SINGLE"`)
 
-* `COMPOSITE_ALL_1_ALL_RESOURCES_IN_ONE_COMPOSITE_OBSERVE_REQUEST` (value: `"COMPOSITE_ALL (1): All resources in one composite observe request"`)
+* `COMPOSITE_ALL` (value: `"COMPOSITE_ALL"`)
 
-* `COMPOSITE_BY_OBJECT_2_GROUPED_COMPOSITE_OBSERVE_REQUESTS_BY_OBJECT` (value: `"COMPOSITE_BY_OBJECT (2): Grouped composite observe requests by object"`)
+* `COMPOSITE_BY_OBJECT` (value: `"COMPOSITE_BY_OBJECT"`)
 
 
 

ce/spec/openapi.json

@@ -16,7 +16,7 @@
   },
   "servers": [
     {
-      "url": "http://localhost:8080",
+      "url": "http://localhost:40947",
       "description": "Generated server url"
     }
   ],
@@ -99744,10 +99744,11 @@
       },
       "TelemetryObserveStrategy": {
         "type": "string",
+        "description": "Observation strategy for telemetry. SINGLE (0): one resource equals one single observe request. COMPOSITE_ALL (1): all resources in one composite observe request. COMPOSITE_BY_OBJECT (2): grouped composite observe requests by object.",
         "enum": [
-          "SINGLE (0): One resource equals one single observe request",
-          "COMPOSITE_ALL (1): All resources in one composite observe request",
-          "COMPOSITE_BY_OBJECT (2): Grouped composite observe requests by object"
+          "SINGLE",
+          "COMPOSITE_ALL",
+          "COMPOSITE_BY_OBJECT"
         ]
       },
       "TelemetryQueryingSnmpCommunicationConfig": {

ce/src/main/java/org/thingsboard/client/ApiClient.java

@@ -173,7 +173,7 @@ public static List<Pair> parameterToPairs(
   public ApiClient() {
     this.builder = createDefaultHttpClientBuilder();
     this.mapper = createDefaultObjectMapper();
-    updateBaseUri("http://localhost:8080");
+    updateBaseUri("http://localhost:40947");
     interceptor = null;
     readTimeout = null;
     connectTimeout = null;
@@ -191,7 +191,7 @@ public ApiClient() {
   public ApiClient(HttpClient.Builder builder, ObjectMapper mapper, String baseUri) {
     this.builder = builder;
     this.mapper = mapper;
-    updateBaseUri(baseUri != null ? baseUri : "http://localhost:8080");
+    updateBaseUri(baseUri != null ? baseUri : "http://localhost:40947");
     interceptor = null;
     readTimeout = null;
     connectTimeout = null;

ce/src/main/java/org/thingsboard/client/model/TelemetryObserveStrategy.java

@@ -28,15 +28,15 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 
 /**
- * Gets or Sets TelemetryObserveStrategy
+ * Observation strategy for telemetry. SINGLE (0): one resource equals one single observe request. COMPOSITE_ALL (1): all resources in one composite observe request. COMPOSITE_BY_OBJECT (2): grouped composite observe requests by object.
  */
 public enum TelemetryObserveStrategy {
 
-  SINGLE_0_ONE_RESOURCE_EQUALS_ONE_SINGLE_OBSERVE_REQUEST("SINGLE (0): One resource equals one single observe request"),
+  SINGLE("SINGLE"),
 
-  COMPOSITE_ALL_1_ALL_RESOURCES_IN_ONE_COMPOSITE_OBSERVE_REQUEST("COMPOSITE_ALL (1): All resources in one composite observe request"),
+  COMPOSITE_ALL("COMPOSITE_ALL"),
 
-  COMPOSITE_BY_OBJECT_2_GROUPED_COMPOSITE_OBSERVE_REQUESTS_BY_OBJECT("COMPOSITE_BY_OBJECT (2): Grouped composite observe requests by object");
+  COMPOSITE_BY_OBJECT("COMPOSITE_BY_OBJECT");
 
   private String value;