Merge pull request #8706 from imbeacon/fix/swagger-models

Fixes for models in Swagger

common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationId.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -28,6 +29,7 @@ public class NotificationId extends UUIDBased implements EntityId {
         super(id);
     }
 
+    @ApiModelProperty(position = 2, required = true, value = "string", example = "NOTIFICATION", allowableValues = "NOTIFICATION")
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION;

common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRequestId.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -28,6 +29,7 @@ public class NotificationRequestId extends UUIDBased implements EntityId {
         super(id);
     }
 
+    @ApiModelProperty(position = 2, required = true, value = "string", example = "NOTIFICATION_REQUEST", allowableValues = "NOTIFICATION_REQUEST")
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION_REQUEST;

common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationRuleId.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -28,6 +29,7 @@ public class NotificationRuleId extends UUIDBased implements EntityId {
         super(id);
     }
 
+    @ApiModelProperty(position = 2, required = true, value = "string", example = "NOTIFICATION_RULE", allowableValues = "NOTIFICATION_RULE")
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION_RULE;

common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationTargetId.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -28,6 +29,7 @@ public class NotificationTargetId extends UUIDBased implements EntityId {
         super(id);
     }
 
+    @ApiModelProperty(position = 2, required = true, value = "string", example = "NOTIFICATION_TARGET", allowableValues = "NOTIFICATION_TARGET")
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION_TARGET;

common/data/src/main/java/org/thingsboard/server/common/data/id/NotificationTemplateId.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -28,6 +29,7 @@ public class NotificationTemplateId extends UUIDBased implements EntityId {
         super(id);
     }
 
+    @ApiModelProperty(position = 2, required = true, value = "string", example = "NOTIFICATION_TEMPLATE", allowableValues = "NOTIFICATION_TEMPLATE")
     @Override
     public EntityType getEntityType() {
         return EntityType.NOTIFICATION_TEMPLATE;

common/data/src/main/java/org/thingsboard/server/common/data/id/QueueId.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.id;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
 import org.thingsboard.server.common.data.EntityType;
 
 import java.util.UUID;
@@ -34,6 +35,7 @@ public class QueueId extends UUIDBased implements EntityId {
         return new QueueId(UUID.fromString(queueId));
     }
 
+    @ApiModelProperty(position = 2, required = true, value = "string", example = "QUEUE", allowableValues = "QUEUE")
     @Override
     public EntityType getEntityType() {
         return EntityType.QUEUE;