Merge pull request #16025 from thingsboard/rc

Merge rc into master

common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/LwM2MBootstrapClientCredential.java

@@ -19,7 +19,18 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import io.swagger.v3.oas.annotations.media.DiscriminatorMapping;
+import io.swagger.v3.oas.annotations.media.Schema;
 
+@Schema(
+        discriminatorProperty = "securityMode",
+        discriminatorMapping = {
+                @DiscriminatorMapping(value = "NO_SEC", schema = NoSecBootstrapClientCredential.class),
+                @DiscriminatorMapping(value = "PSK", schema = PSKBootstrapClientCredential.class),
+                @DiscriminatorMapping(value = "RPK", schema = RPKBootstrapClientCredential.class),
+                @DiscriminatorMapping(value = "X509", schema = X509BootstrapClientCredential.class)
+        }
+)
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
         property = "securityMode")

common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/LwM2MClientCredential.java

@@ -19,7 +19,18 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import io.swagger.v3.oas.annotations.media.DiscriminatorMapping;
+import io.swagger.v3.oas.annotations.media.Schema;
 
+@Schema(
+        discriminatorProperty = "securityConfigClientMode",
+        discriminatorMapping = {
+                @DiscriminatorMapping(value = "NO_SEC", schema = NoSecClientCredential.class),
+                @DiscriminatorMapping(value = "PSK", schema = PSKClientCredential.class),
+                @DiscriminatorMapping(value = "RPK", schema = RPKClientCredential.class),
+                @DiscriminatorMapping(value = "X509", schema = X509ClientCredential.class)
+        }
+)
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
         property = "securityConfigClientMode")

common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MBootstrapServerCredential.java

@@ -19,10 +19,21 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import io.swagger.v3.oas.annotations.media.DiscriminatorMapping;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode;
 
 import java.io.Serializable;
 
+@Schema(
+        discriminatorProperty = "securityMode",
+        discriminatorMapping = {
+                @DiscriminatorMapping(value = "NO_SEC", schema = NoSecLwM2MBootstrapServerCredential.class),
+                @DiscriminatorMapping(value = "PSK", schema = PSKLwM2MBootstrapServerCredential.class),
+                @DiscriminatorMapping(value = "RPK", schema = RPKLwM2MBootstrapServerCredential.class),
+                @DiscriminatorMapping(value = "X509", schema = X509LwM2MBootstrapServerCredential.class)
+        }
+)
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
         property = "securityMode")

common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java

@@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import io.swagger.v3.oas.annotations.media.DiscriminatorMapping;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.experimental.SuperBuilder;
@@ -29,6 +31,12 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.job.JobType;
 
 @Data
+@Schema(
+        discriminatorProperty = "jobType",
+        discriminatorMapping = {
+                @DiscriminatorMapping(value = "DUMMY", schema = DummyTask.class)
+        }
+)
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "jobType")
 @JsonSubTypes({

common/data/src/main/java/org/thingsboard/server/common/data/job/task/TaskResult.java

@@ -20,12 +20,20 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import io.swagger.v3.oas.annotations.media.DiscriminatorMapping;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.thingsboard.server.common.data.job.JobType;
 
 @Data
 @NoArgsConstructor
+@Schema(
+        discriminatorProperty = "jobType",
+        discriminatorMapping = {
+                @DiscriminatorMapping(value = "DUMMY", schema = DummyTaskResult.class)
+        }
+)
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "jobType")
 @JsonSubTypes({