fixed ShortCustomerInfo openapi schema, refactoring

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

@@ -15,13 +15,29 @@
  */
 package org.thingsboard.server.common.data;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+@JsonPropertyOrder({
+        "emailEnabled",
+        "smsEnabled",
+        "notificationEnabled",
+        "oauthEnabled",
+        "twoFaEnabled"
+})
+@Schema
 @Data
 public class FeaturesInfo {
-    boolean emailEnabled;
-    boolean smsEnabled;
-    boolean notificationEnabled;
-    boolean oauthEnabled;
-    boolean twoFaEnabled;
+    @JsonProperty("emailEnabled")
+    boolean isEmailEnabled;
+    @JsonProperty("smsEnabled")
+    boolean isSmsEnabled;
+    @JsonProperty("notificationEnabled")
+    boolean isNotificationEnabled;
+    @JsonProperty("oauthEnabled")
+    boolean isOauthEnabled;
+    @JsonProperty("twoFaEnabled")
+    boolean isTwoFaEnabled;
 }

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

@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.common.data;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -39,9 +40,15 @@ public class ShortCustomerInfo {
     @NoXss
     private String title;
 
+    @JsonProperty("isPublic")
     @Schema(description = "Indicates special 'Public' customer used to embed dashboards on public websites.")
-    @Getter @Setter
-    private boolean isPublic;
+    private boolean publicCustomer;
+
+    @JsonProperty("isPublic")
+    public boolean isPublic() { return publicCustomer; }
+
+    @JsonProperty("isPublic")
+    public void setPublic(boolean publicCustomer) { this.publicCustomer = publicCustomer; }
 
     @Override
     public boolean equals(Object o) {

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

@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.common.data;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -23,6 +24,7 @@ import java.util.List;
 @Data
 public class SystemInfo {
     @Schema(description = "Is monolith.")
+    @JsonProperty("monolith")
     private boolean isMonolith;
     @Schema(description = "System data.")
     private List<SystemInfoData> systemData;

common/data/src/main/java/org/thingsboard/server/common/data/query/RelationsQueryFilter.java

@@ -15,16 +15,17 @@
  */
 package org.thingsboard.server.common.data.query;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.relation.EntitySearchDirection;
 import org.thingsboard.server.common.data.relation.RelationEntityTypeFilter;
 
 import java.util.List;
 import java.util.Set;
 
+@Schema
 @Data
 public class RelationsQueryFilter implements EntityFilter {
 
@@ -34,6 +35,7 @@ public class RelationsQueryFilter implements EntityFilter {
     }
 
     private AliasEntityId rootEntity;
+    @JsonProperty("multiRoot")
     private boolean isMultiRoot;
     private EntityType multiRootEntitiesType;
     private Set<String> multiRootEntityIds;