improvements fro JsonNode

application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java

@@ -303,18 +303,12 @@ public class SwaggerConfiguration {
     }
 
     private void addDefaultSchemas(OpenAPI openAPI) {
-        Schema<?> jsonNodeSchema = new Schema<>()
-                .type("object")
-                .description("Arbitrary JSON object or primitive value")
-                .additionalProperties(true)
-                .example(JacksonUtil.newObjectNode());
         Schema<?> errorCodeSchema = new Schema<>()
                 .type("integer")
                 .description("Platform error code")
                 ._enum(Arrays.asList(2, 10, 11, 15, 20, 30, 31, 32, 33, 34, 35, 40, 45, 46));
         openAPI.getComponents().addSchemas("ThingsboardErrorCode", errorCodeSchema);
         openAPI.getComponents()
-                .addSchemas("JsonNode", jsonNodeSchema)
                 .addSchemas("LoginRequest", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(LoginRequest.class)).schema)
                 .addSchemas("LoginResponse", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(LoginResponse.class)).schema)
                 .addSchemas("ThingsboardErrorResponse", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(ThingsboardErrorResponse.class)).schema)

application/src/main/java/org/thingsboard/server/controller/DeviceConnectivityController.java

@@ -76,7 +76,7 @@ public class DeviceConnectivityController extends BaseController {
                             description = "OK",
                             content = @Content(
                                     mediaType = MediaType.APPLICATION_JSON_VALUE,
-                                    schema = @Schema(ref = "#/components/schemas/JsonNode"),
+                                    schema = @Schema(implementation = JsonNode.class),
                                     examples = {
                                             @ExampleObject(
                                                     name = "http",

common/data/src/main/java/org/thingsboard/server/common/data/BaseDataWithAdditionalInfo.java

@@ -40,7 +40,7 @@ import java.util.function.Supplier;
 public abstract class BaseDataWithAdditionalInfo<I extends UUIDBased> extends BaseData<I> implements HasAdditionalInfo {
 
     @NoXss
-    @Schema(implementation = JsonNode.class)
+    @Schema
     private transient JsonNode additionalInfo;
     @JsonIgnore
     private byte[] additionalInfoBytes;

common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java

@@ -47,7 +47,7 @@ public class AlarmComment extends BaseData<AlarmCommentId> implements HasName {
     private UserId userId;
     @Schema(description = "Defines origination of comment. System type means comment was created by TB. OTHER type means comment was created by user.", example = "SYSTEM/OTHER")
     private AlarmCommentType type;
-    @Schema(description = "JSON object with text of comment.", implementation = JsonNode.class)
+    @Schema(description = "JSON object with text of comment.")
     @NoXss
     @Length(fieldName = "comment", max = 10000)
     @EqualsAndHashCode.Include

common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelation.java

@@ -103,7 +103,7 @@ public class EntityRelation implements HasVersion, Serializable, EdqsObject {
         this.version = entityRelation.getVersion();
     }
 
-    @Schema(description = "Additional parameters of the relation", implementation = JsonNode.class)
+    @Schema(description = "Additional parameters of the relation")
     public JsonNode getAdditionalInfo() {
         return BaseDataWithAdditionalInfo.getJson(() -> additionalInfo, () -> additionalInfoBytes);
     }

common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java

@@ -61,7 +61,7 @@ public class RuleNode extends BaseDataWithAdditionalInfo<RuleNodeId> implements
     private String queueName;
     @Schema(description = "Version of rule node configuration. ", example = "0")
     private int configurationVersion;
-    @Schema(description = "JSON with the rule node configuration. Structure depends on the rule node implementation.", implementation = JsonNode.class)
+    @Schema(description = "JSON with the rule node configuration. Structure depends on the rule node implementation.")
     private JsonNode configuration;
 
     private RuleNodeId externalId;
@@ -105,7 +105,7 @@ public class RuleNode extends BaseDataWithAdditionalInfo<RuleNodeId> implements
         return super.getCreatedTime();
     }
 
-    @Schema(description = "Additional parameters of the rule node. Contains 'layoutX' and 'layoutY' properties for visualization.", implementation = JsonNode.class)
+    @Schema(description = "Additional parameters of the rule node. Contains 'layoutX' and 'layoutY' properties for visualization.")
     @Override
     public JsonNode getAdditionalInfo() {
         return super.getAdditionalInfo();

common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/WidgetsBundleExportData.java

@@ -32,7 +32,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class WidgetsBundleExportData extends EntityExportData<WidgetsBundle> {
 
-    @ArraySchema(schema = @Schema(description = "List of widgets in the bundle", implementation = JsonNode.class))
+    @ArraySchema(schema = @Schema(description = "List of widgets in the bundle"))
     @JsonProperty(index = 3)
     private List<ObjectNode> widgets;