diff --git a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java index 9ce762e645..ea51470288 100644 --- a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java +++ b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java @@ -20,6 +20,7 @@ import com.fasterxml.jackson.databind.JsonNode; import io.swagger.v3.core.converter.AnnotatedType; import io.swagger.v3.core.converter.ModelConverter; import io.swagger.v3.core.converter.ModelConverters; +import io.swagger.v3.core.jackson.ModelResolver; import io.swagger.v3.core.util.Json; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; @@ -83,6 +84,10 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; @Profile("!test") public class SwaggerConfiguration { + static { + ModelResolver.enumsAsRef = true; + } + public static final String LOGIN_ENDPOINT = "/api/auth/login"; public static final String REFRESH_TOKEN_ENDPOINT = "/api/auth/token"; @@ -276,12 +281,18 @@ public class SwaggerConfiguration { .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) - .addSchemas("ThingsboardCredentialsExpiredResponse", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(ThingsboardCredentialsExpiredResponse.class)).schema); + .addSchemas("ThingsboardCredentialsExpiredResponse", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(ThingsboardCredentialsExpiredResponse.class)).schema) + .addSchemas("ThingsboardErrorCode", errorCodeSchema); } private RouterOperationCustomizer routerOperationCustomizer(SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer) { diff --git a/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java b/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java index 96464668b6..b65b87c6f3 100644 --- a/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java +++ b/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java @@ -22,12 +22,15 @@ import org.thingsboard.server.common.data.exception.ThingsboardErrorCode; @Schema public class ThingsboardErrorResponse { // HTTP Response Status Code + @Schema private final HttpStatus status; // General Error message + @Schema private final String message; // Error code + @Schema private final ThingsboardErrorCode errorCode; private final long timestamp; diff --git a/application/src/main/java/org/thingsboard/server/service/security/model/SecurityUser.java b/application/src/main/java/org/thingsboard/server/service/security/model/SecurityUser.java index d2fc54807a..7639338747 100644 --- a/application/src/main/java/org/thingsboard/server/service/security/model/SecurityUser.java +++ b/application/src/main/java/org/thingsboard/server/service/security/model/SecurityUser.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.service.security.model; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import org.springframework.security.core.GrantedAuthority; @@ -27,6 +28,7 @@ import java.util.UUID; import java.util.stream.Collectors; import java.util.stream.Stream; +@Schema public class SecurityUser extends User { private static final long serialVersionUID = -797397440703066079L; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ApiFeature.java b/common/data/src/main/java/org/thingsboard/server/common/data/ApiFeature.java index 723ad829b6..335b9efd16 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/ApiFeature.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/ApiFeature.java @@ -15,10 +15,8 @@ */ package org.thingsboard.server.common.data; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; -@Schema(enumAsRef = true) public enum ApiFeature { TRANSPORT("transportApiState", "Device API"), DB("dbApiState", "Telemetry persistence"), diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ApiUsageStateValue.java b/common/data/src/main/java/org/thingsboard/server/common/data/ApiUsageStateValue.java index f05458358a..aa639f9c14 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/ApiUsageStateValue.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/ApiUsageStateValue.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum ApiUsageStateValue { ENABLED, WARNING, DISABLED; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/CoapDeviceType.java b/common/data/src/main/java/org/thingsboard/server/common/data/CoapDeviceType.java index b506867f93..c8862784b0 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/CoapDeviceType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/CoapDeviceType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum CoapDeviceType { DEFAULT, EFENTO diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileProvisionType.java b/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileProvisionType.java index 898cf8e752..10317a1eec 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileProvisionType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileProvisionType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum DeviceProfileProvisionType { DISABLED, ALLOW_CREATE_NEW_DEVICES, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileType.java b/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileType.java index e6e22e946b..cd7a18c9e7 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum DeviceProfileType { DEFAULT } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/DeviceTransportType.java b/common/data/src/main/java/org/thingsboard/server/common/data/DeviceTransportType.java index 0fac7e7bf7..c06ee27c18 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/DeviceTransportType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/DeviceTransportType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum DeviceTransportType { DEFAULT, MQTT, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java b/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java index b2d259f906..a95208e457 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.common.data; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import org.apache.commons.lang3.StringUtils; @@ -23,7 +22,6 @@ import java.util.Arrays; import java.util.EnumSet; import java.util.List; -@Schema(enumAsRef = true) public enum EntityType { TENANT(1), CUSTOMER(2), diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ResourceSubType.java b/common/data/src/main/java/org/thingsboard/server/common/data/ResourceSubType.java index e19c9308ed..ac7b7466f5 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/ResourceSubType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/ResourceSubType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum ResourceSubType { IMAGE, SCADA_SYMBOL, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ResourceType.java b/common/data/src/main/java/org/thingsboard/server/common/data/ResourceType.java index ae6262878e..df73ea73c8 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/ResourceType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/ResourceType.java @@ -15,11 +15,9 @@ */ package org.thingsboard.server.common.data; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.RequiredArgsConstructor; -@Schema(enumAsRef = true) @RequiredArgsConstructor public enum ResourceType { LWM2M_MODEL("application/xml", false, false), diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/TenantProfileType.java b/common/data/src/main/java/org/thingsboard/server/common/data/TenantProfileType.java index 8d79a7f149..7965ce719c 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/TenantProfileType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/TenantProfileType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum TenantProfileType { DEFAULT } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/TransportPayloadType.java b/common/data/src/main/java/org/thingsboard/server/common/data/TransportPayloadType.java index 9354d57fc7..fbae54d0d3 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/TransportPayloadType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/TransportPayloadType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum TransportPayloadType { JSON, PROTOBUF diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java index f3950adff5..fec8f13dfd 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java @@ -45,7 +45,7 @@ public class AlarmComment extends BaseData implements HasName { private AlarmId alarmId; @Schema(description = "JSON object with User id.", accessMode = Schema.AccessMode.READ_ONLY) 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", accessMode = Schema.AccessMode.READ_ONLY) + @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) @NoXss diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCommentType.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCommentType.java index 9a944a0c42..3265d69d7e 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCommentType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCommentType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.alarm; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum AlarmCommentType { SYSTEM, OTHER; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmSearchStatus.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmSearchStatus.java index 962e5a581f..b49fb4212a 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmSearchStatus.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmSearchStatus.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.alarm; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum AlarmSearchStatus { ANY, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmSeverity.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmSeverity.java index f1f345724d..e7776ce286 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmSeverity.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmSeverity.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.alarm; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum AlarmSeverity { CRITICAL, MAJOR, MINOR, WARNING, INDETERMINATE; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmStatus.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmStatus.java index cd7c59d423..1fd7f45a8b 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmStatus.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmStatus.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.alarm; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum AlarmStatus { ACTIVE_UNACK, ACTIVE_ACK, CLEARED_UNACK, CLEARED_ACK; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/CalculatedFieldType.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/CalculatedFieldType.java index 8a7e8256ac..c533aad712 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/CalculatedFieldType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/CalculatedFieldType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.cf; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum CalculatedFieldType { SIMPLE, SCRIPT diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/ArgumentType.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/ArgumentType.java index acddcc44cd..36a5306a4c 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/ArgumentType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/ArgumentType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.cf.configuration; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum ArgumentType { TS_LATEST, ATTRIBUTE, TS_ROLLING diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CalculatedFieldConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CalculatedFieldConfiguration.java index 167d9178ee..958f03fb31 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CalculatedFieldConfiguration.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CalculatedFieldConfiguration.java @@ -57,24 +57,12 @@ public interface CalculatedFieldConfiguration { @JsonIgnore CalculatedFieldType getType(); - @Schema( - description = "Arguments/parameters for the calculated field", - example = "{\"param1\": {\"type\": \"STRING\", \"value\": \"example\"}}" - ) Map getArguments(); - @Schema( - description = "Expression or formula for calculating the field value", - requiredMode = Schema.RequiredMode.REQUIRED, - example = "value1 + value2" - ) String getExpression(); void setExpression(String expression); - @Schema( - description = "Output configuration for the calculated field result" - ) Output getOutput(); @JsonIgnore diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DefaultDeviceConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DefaultDeviceConfiguration.java index c605ffff9e..8cd9887212 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DefaultDeviceConfiguration.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DefaultDeviceConfiguration.java @@ -25,7 +25,7 @@ public class DefaultDeviceConfiguration implements DeviceConfiguration { private static final long serialVersionUID = -2225378639573611325L; - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Device profile type") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public DeviceProfileType getType() { return DeviceProfileType.DEFAULT; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/PowerMode.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/PowerMode.java index e2f2c082ad..28a673365d 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/PowerMode.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/PowerMode.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.device.data; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum PowerMode { PSM, DRX, E_DRX } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmConditionSpecType.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmConditionSpecType.java index 1cea3646eb..f8ce5947ed 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmConditionSpecType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmConditionSpecType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.device.profile; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum AlarmConditionSpecType { SIMPLE, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmScheduleType.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmScheduleType.java index a90beabf45..56148844fa 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmScheduleType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmScheduleType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.device.profile; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum AlarmScheduleType { ANY_TIME, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AllowCreateNewDevicesDeviceProfileProvisionConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AllowCreateNewDevicesDeviceProfileProvisionConfiguration.java index 53a359bb9f..988a9cf0d4 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AllowCreateNewDevicesDeviceProfileProvisionConfiguration.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AllowCreateNewDevicesDeviceProfileProvisionConfiguration.java @@ -26,7 +26,7 @@ public class AllowCreateNewDevicesDeviceProfileProvisionConfiguration implements private final String provisionDeviceSecret; @Override - @Schema(description = "Device profile provision type", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) public DeviceProfileProvisionType getType() { return DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration.java index 8fb596a953..7398832974 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration.java @@ -25,7 +25,7 @@ public class CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration imple private final String provisionDeviceSecret; - @Schema(description = "Device profile provision type", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public DeviceProfileProvisionType getType() { return DeviceProfileProvisionType.CHECK_PRE_PROVISIONED_DEVICES; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CoapDeviceProfileTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CoapDeviceProfileTransportConfiguration.java index 6cd95ba929..b8ab359999 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CoapDeviceProfileTransportConfiguration.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CoapDeviceProfileTransportConfiguration.java @@ -29,7 +29,7 @@ public class CoapDeviceProfileTransportConfiguration implements DeviceProfileTra @Schema private PowerSavingConfiguration clientSettings; - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the device transport") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public DeviceTransportType getType() { return DeviceTransportType.COAP; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CoapDeviceTypeConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CoapDeviceTypeConfiguration.java index 3ebcdd4f27..ba5cc1b8b4 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CoapDeviceTypeConfiguration.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CoapDeviceTypeConfiguration.java @@ -43,7 +43,7 @@ import java.io.Serializable; @JsonSubTypes.Type(value = EfentoCoapDeviceTypeConfiguration.class, name = "EFENTO")}) public interface CoapDeviceTypeConfiguration extends Serializable { - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "CoAP device type") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @JsonIgnore CoapDeviceType getCoapDeviceType(); diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultCoapDeviceTypeConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultCoapDeviceTypeConfiguration.java index 0beff3750a..05c11a8d45 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultCoapDeviceTypeConfiguration.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultCoapDeviceTypeConfiguration.java @@ -29,7 +29,7 @@ public class DefaultCoapDeviceTypeConfiguration implements CoapDeviceTypeConfigu private TransportPayloadTypeConfiguration transportPayloadTypeConfiguration; @Override - @Schema(description = "CoAP device type", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) public CoapDeviceType getCoapDeviceType() { return CoapDeviceType.DEFAULT; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileConfiguration.java index 895bb4ac93..294e97ec30 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileConfiguration.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileConfiguration.java @@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.DeviceProfileType; @Data public class DefaultDeviceProfileConfiguration implements DeviceProfileConfiguration { - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Device profile type") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public DeviceProfileType getType() { return DeviceProfileType.DEFAULT; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileTransportConfiguration.java index d204ab2ffd..320bbd6948 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileTransportConfiguration.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileTransportConfiguration.java @@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.DeviceTransportType; @Data public class DefaultDeviceProfileTransportConfiguration implements DeviceProfileTransportConfiguration { - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the device transport") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public DeviceTransportType getType() { return DeviceTransportType.DEFAULT; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileConfiguration.java index 6b3108be26..799b0ff562 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileConfiguration.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileConfiguration.java @@ -41,7 +41,7 @@ import java.io.Serializable; @JsonSubTypes.Type(value = DefaultDeviceProfileConfiguration.class, name = "DEFAULT")}) public interface DeviceProfileConfiguration extends Serializable { - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Device profile type") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @JsonIgnore DeviceProfileType getType(); diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DisabledDeviceProfileProvisionConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DisabledDeviceProfileProvisionConfiguration.java index 139fe88645..86a69e164d 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DisabledDeviceProfileProvisionConfiguration.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DisabledDeviceProfileProvisionConfiguration.java @@ -26,7 +26,7 @@ public class DisabledDeviceProfileProvisionConfiguration implements DeviceProfil private final String provisionDeviceSecret; @Override - @Schema(description = "Device profile provision type", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) public DeviceProfileProvisionType getType() { return DeviceProfileProvisionType.DISABLED; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DurationAlarmConditionSpec.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DurationAlarmConditionSpec.java index c6336b823d..f0ead0c3df 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DurationAlarmConditionSpec.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DurationAlarmConditionSpec.java @@ -33,7 +33,7 @@ public class DurationAlarmConditionSpec implements AlarmConditionSpec { private FilterPredicateValue predicate; @Override - @Schema(description = "Type of the Alarm Condition Specification", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) public AlarmConditionSpecType getType() { return AlarmConditionSpecType.DURATION; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/EfentoCoapDeviceTypeConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/EfentoCoapDeviceTypeConfiguration.java index 456c2b17ee..f15be1fe11 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/EfentoCoapDeviceTypeConfiguration.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/EfentoCoapDeviceTypeConfiguration.java @@ -26,7 +26,7 @@ public class EfentoCoapDeviceTypeConfiguration implements CoapDeviceTypeConfigur private static final long serialVersionUID = -8523081152598707064L; @Override - @Schema(description = "CoAP device type", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) public CoapDeviceType getCoapDeviceType() { return CoapDeviceType.EFENTO; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/JsonTransportPayloadConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/JsonTransportPayloadConfiguration.java index 6b9affb20a..6654e9febf 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/JsonTransportPayloadConfiguration.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/JsonTransportPayloadConfiguration.java @@ -23,9 +23,7 @@ import org.thingsboard.server.common.data.TransportPayloadType; @Schema public class JsonTransportPayloadConfiguration implements TransportPayloadTypeConfiguration { - @Schema( - description = "Transport payload type", requiredMode = Schema.RequiredMode.REQUIRED - ) + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public TransportPayloadType getTransportPayloadType() { return TransportPayloadType.JSON; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SimpleAlarmConditionSpec.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SimpleAlarmConditionSpec.java index abc14c90e0..def1cb707c 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SimpleAlarmConditionSpec.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SimpleAlarmConditionSpec.java @@ -24,7 +24,7 @@ import lombok.Data; @JsonIgnoreProperties(ignoreUnknown = true) public class SimpleAlarmConditionSpec implements AlarmConditionSpec { @Override - @Schema(description = "Type of the Alarm Condition Specification", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) public AlarmConditionSpecType getType() { return AlarmConditionSpecType.SIMPLE; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SnmpDeviceProfileTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SnmpDeviceProfileTransportConfiguration.java index 04802abbf4..edbb0a0738 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SnmpDeviceProfileTransportConfiguration.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SnmpDeviceProfileTransportConfiguration.java @@ -32,7 +32,7 @@ public class SnmpDeviceProfileTransportConfiguration implements DeviceProfileTra @ArraySchema(schema = @Schema(implementation = SnmpCommunicationConfig.class)) private List communicationConfigs; - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the device transport") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public DeviceTransportType getType() { return DeviceTransportType.SNMP; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/TransportPayloadTypeConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/TransportPayloadTypeConfiguration.java index 8175e09934..9414b9d596 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/TransportPayloadTypeConfiguration.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/TransportPayloadTypeConfiguration.java @@ -43,10 +43,8 @@ import java.io.Serializable; @JsonSubTypes.Type(value = ProtoTransportPayloadConfiguration.class, name = "PROTOBUF")}) public interface TransportPayloadTypeConfiguration extends Serializable { + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @JsonIgnore - @Schema( - description = "Transport payload type", requiredMode = Schema.RequiredMode.REQUIRED - ) TransportPayloadType getTransportPayloadType(); } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/X509CertificateChainProvisionConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/X509CertificateChainProvisionConfiguration.java index a20e5d73e3..b704e56e5c 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/X509CertificateChainProvisionConfiguration.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/X509CertificateChainProvisionConfiguration.java @@ -30,7 +30,7 @@ public class X509CertificateChainProvisionConfiguration implements DeviceProfile private boolean allowCreateNewDevicesByX509Certificate; @Override - @Schema(description = "Device profile provision type", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) public DeviceProfileProvisionType getType() { return DeviceProfileProvisionType.X509_CERTIFICATE_CHAIN; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/TelemetryObserveStrategy.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/TelemetryObserveStrategy.java index b9409dbd37..53dafe19b7 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/TelemetryObserveStrategy.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/TelemetryObserveStrategy.java @@ -15,10 +15,8 @@ */ package org.thingsboard.server.common.data.device.profile.lwm2m; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; -@Schema(enumAsRef = true) public enum TelemetryObserveStrategy { SINGLE("One resource equals one single observe request", 0), diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/event/EventType.java b/common/data/src/main/java/org/thingsboard/server/common/data/event/EventType.java index 90ecf264f4..416e711ed2 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/event/EventType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/event/EventType.java @@ -15,10 +15,8 @@ */ package org.thingsboard.server.common.data.event; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; -@Schema(enumAsRef = true) public enum EventType { ERROR("error_event", "ERROR"), LC_EVENT("lc_event", "LC_EVENT"), diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/exception/ThingsboardErrorCode.java b/common/data/src/main/java/org/thingsboard/server/common/data/exception/ThingsboardErrorCode.java index 4974b550e4..9b154158a9 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/exception/ThingsboardErrorCode.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/exception/ThingsboardErrorCode.java @@ -16,7 +16,9 @@ package org.thingsboard.server.common.data.exception; import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.v3.oas.annotations.media.Schema; +@Schema public enum ThingsboardErrorCode { GENERAL(2), diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/exception/ThingsboardException.java b/common/data/src/main/java/org/thingsboard/server/common/data/exception/ThingsboardException.java index 7e0c7a69cc..b0c4199030 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/exception/ThingsboardException.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/exception/ThingsboardException.java @@ -15,10 +15,14 @@ */ package org.thingsboard.server.common.data.exception; +import io.swagger.v3.oas.annotations.media.Schema; + +@Schema public class ThingsboardException extends Exception { private static final long serialVersionUID = 1L; + @Schema private ThingsboardErrorCode errorCode; public ThingsboardException() { diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTaskType.java b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTaskType.java index 3e7fdef060..7988526bdf 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTaskType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTaskType.java @@ -15,11 +15,9 @@ */ package org.thingsboard.server.common.data.housekeeper; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.RequiredArgsConstructor; -@Schema(enumAsRef = true) @RequiredArgsConstructor @Getter public enum HousekeeperTaskType { diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/job/JobStatus.java b/common/data/src/main/java/org/thingsboard/server/common/data/job/JobStatus.java index fbcfc1361e..f15cc34b9d 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/job/JobStatus.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/job/JobStatus.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.job; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum JobStatus { QUEUED, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/job/JobType.java b/common/data/src/main/java/org/thingsboard/server/common/data/job/JobType.java index 089b30ebf9..623dacfabb 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/job/JobType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/job/JobType.java @@ -15,11 +15,9 @@ */ package org.thingsboard.server.common.data.job; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.RequiredArgsConstructor; -@Schema(enumAsRef = true) @RequiredArgsConstructor @Getter public enum JobType { diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/kv/DataType.java b/common/data/src/main/java/org/thingsboard/server/common/data/kv/DataType.java index 3e92fa8db3..925cc73898 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/kv/DataType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/kv/DataType.java @@ -18,7 +18,7 @@ package org.thingsboard.server.common.data.kv; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; -@Schema(enumAsRef = true) +@Schema public enum DataType { BOOLEAN(0), diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/kv/IntervalType.java b/common/data/src/main/java/org/thingsboard/server/common/data/kv/IntervalType.java index 6503d5e029..f88c02b592 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/kv/IntervalType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/kv/IntervalType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.kv; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum IntervalType { MILLISECONDS, WEEK/*Sunday-Saturday*/, WEEK_ISO/*Monday-Sunday*/, MONTH, QUARTER diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/limit/LimitedApi.java b/common/data/src/main/java/org/thingsboard/server/common/data/limit/LimitedApi.java index ab9f124918..e6c59ce7a7 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/limit/LimitedApi.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/limit/LimitedApi.java @@ -15,14 +15,12 @@ */ package org.thingsboard.server.common.data.limit; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration; import java.util.Optional; import java.util.function.Function; -@Schema(enumAsRef = true) @Getter public enum LimitedApi { diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/mail/MailOauth2Provider.java b/common/data/src/main/java/org/thingsboard/server/common/data/mail/MailOauth2Provider.java index 09e093cc8a..c58906b7bc 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/mail/MailOauth2Provider.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/mail/MailOauth2Provider.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.mail; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum MailOauth2Provider { GOOGLE("Google"), OFFICE_365("Office 365"), SENDGRID("SendGrid"), CUSTOM("Custom"); diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/app/MobileAppStatus.java b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/app/MobileAppStatus.java index ee1413e7ea..9372ef0c31 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/app/MobileAppStatus.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/app/MobileAppStatus.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.mobile.app; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum MobileAppStatus { DRAFT, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/DefaultPageId.java b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/DefaultPageId.java index 65208a345c..2591914167 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/DefaultPageId.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/DefaultPageId.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.mobile.layout; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum DefaultPageId { HOME, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/MobilePageType.java b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/MobilePageType.java index 3e4395e53d..c77165921d 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/MobilePageType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/MobilePageType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.mobile.layout; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum MobilePageType { DEFAULT, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/qrCodeSettings/BadgePosition.java b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/qrCodeSettings/BadgePosition.java index 464293c362..20420e3971 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/qrCodeSettings/BadgePosition.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/qrCodeSettings/BadgePosition.java @@ -16,9 +16,6 @@ package org.thingsboard.server.common.data.mobile.qrCodeSettings; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum BadgePosition { RIGHT, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationDeliveryMethod.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationDeliveryMethod.java index 398453b572..750606c06d 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationDeliveryMethod.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationDeliveryMethod.java @@ -15,11 +15,9 @@ */ package org.thingsboard.server.common.data.notification; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.RequiredArgsConstructor; -@Schema(enumAsRef = true) @RequiredArgsConstructor public enum NotificationDeliveryMethod { diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationStatus.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationStatus.java index c0ce206389..b2cb54582e 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationStatus.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationStatus.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.notification; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum NotificationStatus { SENT, READ diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationType.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationType.java index 4610d7b29d..921a972225 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationType.java @@ -15,12 +15,10 @@ */ package org.thingsboard.server.common.data.notification; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -@Schema(enumAsRef = true) @AllArgsConstructor @NoArgsConstructor public enum NotificationType { diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/ResourcesShortageTrigger.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/ResourcesShortageTrigger.java index b3472fff4b..7511fd7f2a 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/ResourcesShortageTrigger.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/ResourcesShortageTrigger.java @@ -67,7 +67,7 @@ public class ResourcesShortageTrigger implements NotificationRuleTrigger { return NotificationRuleTriggerType.RESOURCES_SHORTAGE; } - @Schema(enumAsRef = true) + @Schema public enum Resource { CPU, RAM, STORAGE } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmAssignmentNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmAssignmentNotificationRuleTriggerConfig.java index a4714024ab..52c637c17b 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmAssignmentNotificationRuleTriggerConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmAssignmentNotificationRuleTriggerConfig.java @@ -50,7 +50,7 @@ public class AlarmAssignmentNotificationRuleTriggerConfig implements Notificatio return NotificationRuleTriggerType.ALARM_ASSIGNMENT; } - @Schema(enumAsRef = true) + @Schema public enum Action { ASSIGNED, UNASSIGNED } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmNotificationRuleTriggerConfig.java index bb16215b8f..f40eb7ac0b 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmNotificationRuleTriggerConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmNotificationRuleTriggerConfig.java @@ -46,7 +46,7 @@ public class AlarmNotificationRuleTriggerConfig implements NotificationRuleTrigg private ClearRule clearRule; @Override - @Schema(description = "Type of the notification rule trigger") + @Schema public NotificationRuleTriggerType getTriggerType() { return NotificationRuleTriggerType.ALARM; } @@ -56,7 +56,7 @@ public class AlarmNotificationRuleTriggerConfig implements NotificationRuleTrigg private Set alarmStatuses; } - @Schema(enumAsRef = true) + @Schema public enum AlarmAction { CREATED, SEVERITY_CHANGED, ACKNOWLEDGED, CLEARED } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/ApiUsageLimitNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/ApiUsageLimitNotificationRuleTriggerConfig.java index 973e8d5f6a..89f493fda2 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/ApiUsageLimitNotificationRuleTriggerConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/ApiUsageLimitNotificationRuleTriggerConfig.java @@ -39,7 +39,7 @@ public class ApiUsageLimitNotificationRuleTriggerConfig implements NotificationR private Set notifyOn; @Override - @Schema(description = "Type of the notification rule trigger") + @Schema public NotificationRuleTriggerType getTriggerType() { return NotificationRuleTriggerType.API_USAGE_LIMIT; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/DeviceActivityNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/DeviceActivityNotificationRuleTriggerConfig.java index 0eaf7a9b51..9ded46cb74 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/DeviceActivityNotificationRuleTriggerConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/DeviceActivityNotificationRuleTriggerConfig.java @@ -42,12 +42,12 @@ public class DeviceActivityNotificationRuleTriggerConfig implements Notification private Set notifyOn; @Override - @Schema(description = "Type of the notification rule trigger") + @Schema public NotificationRuleTriggerType getTriggerType() { return NotificationRuleTriggerType.DEVICE_ACTIVITY; } - @Schema(enumAsRef = true) + @Schema public enum DeviceEvent { ACTIVE, INACTIVE } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeCommunicationFailureNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeCommunicationFailureNotificationRuleTriggerConfig.java index 2250369164..912e104075 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeCommunicationFailureNotificationRuleTriggerConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeCommunicationFailureNotificationRuleTriggerConfig.java @@ -36,7 +36,7 @@ public class EdgeCommunicationFailureNotificationRuleTriggerConfig implements No private Set edges; // if empty - all edges @Override - @Schema(description = "Type of the notification rule trigger") + @Schema public NotificationRuleTriggerType getTriggerType() { return NotificationRuleTriggerType.EDGE_COMMUNICATION_FAILURE; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeConnectionNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeConnectionNotificationRuleTriggerConfig.java index 30356d7dfc..9c0c6ea5be 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeConnectionNotificationRuleTriggerConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeConnectionNotificationRuleTriggerConfig.java @@ -38,12 +38,12 @@ public class EdgeConnectionNotificationRuleTriggerConfig implements Notification private Set notifyOn; @Override - @Schema(description = "Type of the notification rule trigger") + @Schema public NotificationRuleTriggerType getTriggerType() { return NotificationRuleTriggerType.EDGE_CONNECTION; } - @Schema(enumAsRef = true) + @Schema public enum EdgeConnectivityEvent { CONNECTED, DISCONNECTED } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EntitiesLimitNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EntitiesLimitNotificationRuleTriggerConfig.java index 6fe1b1327a..ef88b92c68 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EntitiesLimitNotificationRuleTriggerConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EntitiesLimitNotificationRuleTriggerConfig.java @@ -39,7 +39,7 @@ public class EntitiesLimitNotificationRuleTriggerConfig implements NotificationR private float threshold; // in percents, @Override - @Schema(description = "Type of the notification rule trigger") + @Schema public NotificationRuleTriggerType getTriggerType() { return NotificationRuleTriggerType.ENTITIES_LIMIT; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EntityActionNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EntityActionNotificationRuleTriggerConfig.java index 6865976b0b..59e8b1ec37 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EntityActionNotificationRuleTriggerConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EntityActionNotificationRuleTriggerConfig.java @@ -39,7 +39,7 @@ public class EntityActionNotificationRuleTriggerConfig implements NotificationRu private boolean deleted; @Override - @Schema(description = "Type of the notification rule trigger") + @Schema public NotificationRuleTriggerType getTriggerType() { return NotificationRuleTriggerType.ENTITY_ACTION; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NewPlatformVersionNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NewPlatformVersionNotificationRuleTriggerConfig.java index fe50d09365..0aca73a729 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NewPlatformVersionNotificationRuleTriggerConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NewPlatformVersionNotificationRuleTriggerConfig.java @@ -23,7 +23,7 @@ import lombok.Data; public class NewPlatformVersionNotificationRuleTriggerConfig implements NotificationRuleTriggerConfig { @Override - @Schema(description = "Type of the notification rule trigger") + @Schema public NotificationRuleTriggerType getTriggerType() { return NotificationRuleTriggerType.NEW_PLATFORM_VERSION; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerType.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerType.java index 9dacc7be86..ca34472b45 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerType.java @@ -15,11 +15,9 @@ */ package org.thingsboard.server.common.data.notification.rule.trigger.config; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; @Getter -@Schema(enumAsRef = true) public enum NotificationRuleTriggerType { ENTITY_ACTION, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/RateLimitsNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/RateLimitsNotificationRuleTriggerConfig.java index 33baf11617..8119a7a6cc 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/RateLimitsNotificationRuleTriggerConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/RateLimitsNotificationRuleTriggerConfig.java @@ -37,7 +37,7 @@ public class RateLimitsNotificationRuleTriggerConfig implements NotificationRule private Set apis; @Override - @Schema(description = "Type of the notification rule trigger") + @Schema public NotificationRuleTriggerType getTriggerType() { return NotificationRuleTriggerType.RATE_LIMITS; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/ResourcesShortageNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/ResourcesShortageNotificationRuleTriggerConfig.java index ded3cdabd5..77640e3411 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/ResourcesShortageNotificationRuleTriggerConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/ResourcesShortageNotificationRuleTriggerConfig.java @@ -42,7 +42,7 @@ public class ResourcesShortageNotificationRuleTriggerConfig implements Notificat private float storageThreshold; // in percents @Override - @Schema(description = "Type of the notification rule trigger") + @Schema public NotificationRuleTriggerType getTriggerType() { return NotificationRuleTriggerType.RESOURCES_SHORTAGE; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig.java index 0d280264fb..437458cacd 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig.java @@ -45,7 +45,7 @@ public class RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig impl private boolean onlyRuleNodeLifecycleFailures; @Override - @Schema(description = "Type of the notification rule trigger") + @Schema public NotificationRuleTriggerType getTriggerType() { return NotificationRuleTriggerType.RULE_ENGINE_COMPONENT_LIFECYCLE_EVENT; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/TaskProcessingFailureNotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/TaskProcessingFailureNotificationRuleTriggerConfig.java index 1a70298385..65000e75a6 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/TaskProcessingFailureNotificationRuleTriggerConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/TaskProcessingFailureNotificationRuleTriggerConfig.java @@ -25,7 +25,7 @@ import lombok.Data; public class TaskProcessingFailureNotificationRuleTriggerConfig implements NotificationRuleTriggerConfig { @Override - @Schema(description = "Type of the notification rule trigger", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) public NotificationRuleTriggerType getTriggerType() { return NotificationRuleTriggerType.TASK_PROCESSING_FAILURE; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/MobileAppNotificationDeliveryMethodConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/MobileAppNotificationDeliveryMethodConfig.java index 409e0dd465..2dc162118a 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/MobileAppNotificationDeliveryMethodConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/MobileAppNotificationDeliveryMethodConfig.java @@ -28,7 +28,7 @@ public class MobileAppNotificationDeliveryMethodConfig implements NotificationDe @NotEmpty private String firebaseServiceAccountCredentials; - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the notification delivery method") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public NotificationDeliveryMethod getMethod() { return NotificationDeliveryMethod.MOBILE_APP; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/SlackNotificationDeliveryMethodConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/SlackNotificationDeliveryMethodConfig.java index 74a73037ae..0e969a9a10 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/SlackNotificationDeliveryMethodConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/SlackNotificationDeliveryMethodConfig.java @@ -27,7 +27,7 @@ public class SlackNotificationDeliveryMethodConfig implements NotificationDelive @NotEmpty private String botToken; - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the notification delivery method") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public NotificationDeliveryMethod getMethod() { return NotificationDeliveryMethod.SLACK; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/MicrosoftTeamsNotificationTargetConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/MicrosoftTeamsNotificationTargetConfig.java index 28a9513d08..eede7b56db 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/MicrosoftTeamsNotificationTargetConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/MicrosoftTeamsNotificationTargetConfig.java @@ -32,7 +32,7 @@ public class MicrosoftTeamsNotificationTargetConfig extends NotificationTargetCo private String channelName; private Boolean useOldApi = Boolean.TRUE; - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the notification target") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public NotificationTargetType getType() { return NotificationTargetType.MICROSOFT_TEAMS; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/NotificationTargetType.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/NotificationTargetType.java index 7544a2c7e3..9a71a95c7e 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/NotificationTargetType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/NotificationTargetType.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.common.data.notification.targets; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod; @@ -23,7 +22,6 @@ import org.thingsboard.server.common.data.notification.NotificationDeliveryMetho import java.util.Arrays; import java.util.Set; -@Schema(enumAsRef = true) @RequiredArgsConstructor public enum NotificationTargetType { diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedTenantAdministratorsFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedTenantAdministratorsFilter.java index 49ac94dff1..2958c48dcc 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedTenantAdministratorsFilter.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedTenantAdministratorsFilter.java @@ -22,7 +22,7 @@ import lombok.Data; @Data public class AffectedTenantAdministratorsFilter implements UsersFilter { - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the users filter") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public UsersFilterType getType() { return UsersFilterType.AFFECTED_TENANT_ADMINISTRATORS; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedUserFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedUserFilter.java index 21760792cb..d93c8f8feb 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedUserFilter.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedUserFilter.java @@ -22,7 +22,7 @@ import lombok.Data; @Data public class AffectedUserFilter implements UsersFilter { - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the users filter") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public UsersFilterType getType() { return UsersFilterType.AFFECTED_USER; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AllUsersFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AllUsersFilter.java index 5b68d04331..d76268d97b 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AllUsersFilter.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AllUsersFilter.java @@ -22,7 +22,7 @@ import lombok.Data; @Data public class AllUsersFilter implements UsersFilter { - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the users filter") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public UsersFilterType getType() { return UsersFilterType.ALL_USERS; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/CustomerUsersFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/CustomerUsersFilter.java index 557c788723..546a9a652d 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/CustomerUsersFilter.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/CustomerUsersFilter.java @@ -28,7 +28,7 @@ public class CustomerUsersFilter implements UsersFilter { @NotNull private UUID customerId; - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the users filter") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public UsersFilterType getType() { return UsersFilterType.CUSTOMER_USERS; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/OriginatorEntityOwnerUsersFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/OriginatorEntityOwnerUsersFilter.java index 92b5bcfed3..7f66665f3b 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/OriginatorEntityOwnerUsersFilter.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/OriginatorEntityOwnerUsersFilter.java @@ -22,7 +22,7 @@ import lombok.Data; @Data public class OriginatorEntityOwnerUsersFilter implements UsersFilter { - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the users filter") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public UsersFilterType getType() { return UsersFilterType.ORIGINATOR_ENTITY_OWNER_USERS; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/PlatformUsersNotificationTargetConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/PlatformUsersNotificationTargetConfig.java index 70fcf0a852..4709a5f79a 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/PlatformUsersNotificationTargetConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/PlatformUsersNotificationTargetConfig.java @@ -33,7 +33,7 @@ public class PlatformUsersNotificationTargetConfig extends NotificationTargetCon @Valid private UsersFilter usersFilter; - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the notification target") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public NotificationTargetType getType() { return NotificationTargetType.PLATFORM_USERS; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/SystemAdministratorsFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/SystemAdministratorsFilter.java index 8d5b5e2537..83373e9781 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/SystemAdministratorsFilter.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/SystemAdministratorsFilter.java @@ -22,7 +22,7 @@ import lombok.Data; @Data public class SystemAdministratorsFilter implements UsersFilter { - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the users filter") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public UsersFilterType getType() { return UsersFilterType.SYSTEM_ADMINISTRATORS; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/TenantAdministratorsFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/TenantAdministratorsFilter.java index bb6fbe5587..11682791bf 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/TenantAdministratorsFilter.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/TenantAdministratorsFilter.java @@ -31,7 +31,7 @@ public class TenantAdministratorsFilter implements UsersFilter { @ArraySchema(schema = @Schema(implementation = UUID.class)) private Set tenantProfilesIds; - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the users filter") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public UsersFilterType getType() { return UsersFilterType.TENANT_ADMINISTRATORS; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UserListFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UserListFilter.java index 4635ca3bd1..0ca54bf493 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UserListFilter.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UserListFilter.java @@ -31,7 +31,7 @@ public class UserListFilter implements UsersFilter { @NotEmpty private List usersIds; - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the users filter") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public UsersFilterType getType() { return UsersFilterType.USER_LIST; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UsersFilterType.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UsersFilterType.java index 0f497cd463..d9dae29b76 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UsersFilterType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UsersFilterType.java @@ -15,12 +15,10 @@ */ package org.thingsboard.server.common.data.notification.targets.platform; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -@Schema(enumAsRef = true) @AllArgsConstructor @NoArgsConstructor @Getter diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/slack/SlackConversationType.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/slack/SlackConversationType.java index e9baa94206..ae8fd410a6 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/slack/SlackConversationType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/slack/SlackConversationType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.notification.targets.slack; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum SlackConversationType { DIRECT, PUBLIC_CHANNEL, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MicrosoftTeamsDeliveryMethodNotificationTemplate.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MicrosoftTeamsDeliveryMethodNotificationTemplate.java index 78bbd13229..7dc3cb9e65 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MicrosoftTeamsDeliveryMethodNotificationTemplate.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MicrosoftTeamsDeliveryMethodNotificationTemplate.java @@ -31,17 +31,11 @@ import java.util.UUID; @ToString(callSuper = true) public class MicrosoftTeamsDeliveryMethodNotificationTemplate extends DeliveryMethodNotificationTemplate implements HasSubject { - @Schema( - description = "The header or title shown at the top of the Teams message card.", - example = "System Alert: High CPU Usage" - ) + @Schema private String subject; - @Schema( - description = "The hex color code for the accent bar on the left side of the Teams card.", - example = "0078D7" - ) + @Schema private String themeColor; - @Schema(description = "Configuration for an optional call-to-action button within the Teams message.") + @Schema private Button button; private final List templatableValues = List.of( @@ -93,7 +87,7 @@ public class MicrosoftTeamsDeliveryMethodNotificationTemplate extends DeliveryMe this.setEntityIdInState = other.setEntityIdInState; } - @Schema(enumAsRef = true) + @Schema public enum LinkType { LINK, DASHBOARD } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/MapperType.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/MapperType.java index d59ad14812..fe8971a618 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/MapperType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/MapperType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.oauth2; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum MapperType { BASIC, CUSTOM, GITHUB, APPLE; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/PlatformType.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/PlatformType.java index 76b1160c50..3589bf55b7 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/PlatformType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/PlatformType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.oauth2; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum PlatformType { WEB, ANDROID, IOS } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/SchemeType.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/SchemeType.java index e9e10b2136..e836bb0193 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/SchemeType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/SchemeType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.oauth2; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum SchemeType { HTTP, HTTPS, MIXED; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/TenantNameStrategyType.java b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/TenantNameStrategyType.java index 666e0e3713..83ed211d6e 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/TenantNameStrategyType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/oauth2/TenantNameStrategyType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.oauth2; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum TenantNameStrategyType { DOMAIN, EMAIL, CUSTOM; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ota/ChecksumAlgorithm.java b/common/data/src/main/java/org/thingsboard/server/common/data/ota/ChecksumAlgorithm.java index 49b0a504cf..b4817dee68 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/ota/ChecksumAlgorithm.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/ota/ChecksumAlgorithm.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.ota; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum ChecksumAlgorithm { MD5, SHA256, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ota/OtaPackageType.java b/common/data/src/main/java/org/thingsboard/server/common/data/ota/OtaPackageType.java index 37eee5ae26..d2fd190635 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/ota/OtaPackageType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/ota/OtaPackageType.java @@ -15,10 +15,8 @@ */ package org.thingsboard.server.common.data.ota; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; -@Schema(enumAsRef = true) public enum OtaPackageType { FIRMWARE("fw"), SOFTWARE("sw"); diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ota/OtaPackageUpdateStatus.java b/common/data/src/main/java/org/thingsboard/server/common/data/ota/OtaPackageUpdateStatus.java index 51a406705c..219010b95f 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/ota/OtaPackageUpdateStatus.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/ota/OtaPackageUpdateStatus.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.ota; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum OtaPackageUpdateStatus { QUEUED, INITIATED, DOWNLOADING, DOWNLOADED, VERIFIED, UPDATING, UPDATED, FAILED } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleEvent.java b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleEvent.java index d528cf4c3d..4a4c5d89bb 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleEvent.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleEvent.java @@ -15,14 +15,12 @@ */ package org.thingsboard.server.common.data.plugin; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.RequiredArgsConstructor; import java.io.Serializable; import java.util.Arrays; -@Schema(enumAsRef = true) @RequiredArgsConstructor public enum ComponentLifecycleEvent implements Serializable { diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleState.java b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleState.java index 0450604d4d..f6fa9111ac 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleState.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleState.java @@ -15,12 +15,9 @@ */ package org.thingsboard.server.common.data.plugin; -import io.swagger.v3.oas.annotations.media.Schema; - /** * @author Andrew Shvayka */ -@Schema(enumAsRef = true) public enum ComponentLifecycleState { ACTIVE, SUSPENDED } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentScope.java b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentScope.java index 40d64d8911..eb7361ddba 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentScope.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentScope.java @@ -15,12 +15,9 @@ */ package org.thingsboard.server.common.data.plugin; -import io.swagger.v3.oas.annotations.media.Schema; - /** * @author Andrew Shvayka */ -@Schema(enumAsRef = true) public enum ComponentScope { SYSTEM, TENANT } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentType.java b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentType.java index debe419e01..a0389520a5 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentType.java @@ -15,12 +15,9 @@ */ package org.thingsboard.server.common.data.plugin; -import io.swagger.v3.oas.annotations.media.Schema; - /** * @author Andrew Shvayka */ -@Schema(enumAsRef = true) public enum ComponentType { ENRICHMENT, FILTER, TRANSFORMATION, ACTION, EXTERNAL, FLOW diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/AliasEntityType.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/AliasEntityType.java index e50abd6556..e7ae298d20 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/query/AliasEntityType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/AliasEntityType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.query; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum AliasEntityType { CURRENT_CUSTOMER, CURRENT_TENANT, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/BooleanFilterPredicate.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/BooleanFilterPredicate.java index 33bccbcabf..796fb850f9 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/query/BooleanFilterPredicate.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/BooleanFilterPredicate.java @@ -31,7 +31,7 @@ public class BooleanFilterPredicate implements SimpleKeyFilterPredicate return FilterPredicateType.BOOLEAN; } - @Schema(enumAsRef = true) + @Schema public enum BooleanOperation { EQUAL, NOT_EQUAL diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/ComplexFilterPredicate.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/ComplexFilterPredicate.java index 521d30cc72..91feaa1e71 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/query/ComplexFilterPredicate.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/ComplexFilterPredicate.java @@ -35,7 +35,7 @@ public class ComplexFilterPredicate implements KeyFilterPredicate { return FilterPredicateType.COMPLEX; } - @Schema(enumAsRef = true) + @Schema public enum ComplexOperation { AND, OR diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/DynamicValueSourceType.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/DynamicValueSourceType.java index da47712dcc..5150e49516 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/query/DynamicValueSourceType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/DynamicValueSourceType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.query; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum DynamicValueSourceType { CURRENT_TENANT, CURRENT_CUSTOMER, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityDataSortOrder.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityDataSortOrder.java index b1f353b233..54e52fbc06 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityDataSortOrder.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityDataSortOrder.java @@ -35,7 +35,7 @@ public class EntityDataSortOrder { this.direction = direction; } - @Schema(enumAsRef = true) + @Schema public enum Direction { ASC, DESC } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityFilterType.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityFilterType.java index 123db07844..b31a03f863 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityFilterType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityFilterType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.query; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum EntityFilterType { SINGLE_ENTITY("singleEntity"), ENTITY_LIST("entityList"), diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityKeyValueType.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityKeyValueType.java index e47660b4de..fa6e60e7aa 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityKeyValueType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityKeyValueType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.query; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum EntityKeyValueType { STRING, NUMERIC, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/NumericFilterPredicate.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/NumericFilterPredicate.java index 6f86f601be..70b010e443 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/query/NumericFilterPredicate.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/NumericFilterPredicate.java @@ -31,7 +31,7 @@ public class NumericFilterPredicate implements SimpleKeyFilterPredicate return FilterPredicateType.NUMERIC; } - @Schema(enumAsRef = true) + @Schema public enum NumericOperation { EQUAL, NOT_EQUAL, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/StringFilterPredicate.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/StringFilterPredicate.java index 271647d7ad..21d555c5c3 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/query/StringFilterPredicate.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/StringFilterPredicate.java @@ -34,7 +34,6 @@ public class StringFilterPredicate implements SimpleKeyFilterPredicate { return FilterPredicateType.STRING; } - @Schema(enumAsRef = true) public enum StringOperation { EQUAL, NOT_EQUAL, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/queue/ProcessingStrategyType.java b/common/data/src/main/java/org/thingsboard/server/common/data/queue/ProcessingStrategyType.java index 461ad5d5a3..35a2f09b59 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/queue/ProcessingStrategyType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/queue/ProcessingStrategyType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.queue; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum ProcessingStrategyType { SKIP_ALL_FAILURES, SKIP_ALL_FAILURES_AND_TIMED_OUT, RETRY_ALL, RETRY_FAILED, RETRY_TIMED_OUT, RETRY_FAILED_AND_TIMED_OUT } \ No newline at end of file diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/queue/SubmitStrategyType.java b/common/data/src/main/java/org/thingsboard/server/common/data/queue/SubmitStrategyType.java index 96f9c85d45..ed04a1b3da 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/queue/SubmitStrategyType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/queue/SubmitStrategyType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.queue; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum SubmitStrategyType { BURST, BATCH, SEQUENTIAL_BY_ORIGINATOR, SEQUENTIAL_BY_TENANT, SEQUENTIAL } \ No newline at end of file diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/relation/EntitySearchDirection.java b/common/data/src/main/java/org/thingsboard/server/common/data/relation/EntitySearchDirection.java index a5421cbcc3..912c8dcc59 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/relation/EntitySearchDirection.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/relation/EntitySearchDirection.java @@ -15,12 +15,9 @@ */ package org.thingsboard.server.common.data.relation; -import io.swagger.v3.oas.annotations.media.Schema; - /** * Created by ashvayka on 02.05.17. */ -@Schema(enumAsRef = true) public enum EntitySearchDirection { FROM, TO; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/relation/RelationTypeGroup.java b/common/data/src/main/java/org/thingsboard/server/common/data/relation/RelationTypeGroup.java index 8d384012f1..b5cd6e7a56 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/relation/RelationTypeGroup.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/relation/RelationTypeGroup.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.relation; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum RelationTypeGroup { COMMON, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rpc/RpcStatus.java b/common/data/src/main/java/org/thingsboard/server/common/data/rpc/RpcStatus.java index ac00625f5b..b731fbe125 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/rpc/RpcStatus.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/rpc/RpcStatus.java @@ -15,10 +15,8 @@ */ package org.thingsboard.server.common.data.rpc; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; -@Schema(enumAsRef = true) public enum RpcStatus { QUEUED(true), diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainType.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainType.java index 531612fac2..4d6ddb137f 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.rule; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum RuleChainType { CORE, EDGE } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleType.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleType.java index 36a0035028..c04cf03f38 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleType.java @@ -15,15 +15,12 @@ */ package org.thingsboard.server.common.data.rule; -import io.swagger.v3.oas.annotations.media.Schema; - /** * Defines origin of the rule. * * @author ashvayka * */ -@Schema(enumAsRef = true) public enum RuleType { SYSTEM, USER; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/Scope.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/Scope.java index 33416cf712..6687c6fde3 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/Scope.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/Scope.java @@ -15,15 +15,12 @@ */ package org.thingsboard.server.common.data.rule; -import io.swagger.v3.oas.annotations.media.Schema; - /** * Defines scope of the rule execution in the actor system * * @author ashvayka * */ -@Schema(enumAsRef = true) public enum Scope { SYSTEM, TENANT, CUSTOMER, DEVICE, RULE; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/script/ScriptLanguage.java b/common/data/src/main/java/org/thingsboard/server/common/data/script/ScriptLanguage.java index 8d993eec31..f1a0a7b8ff 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/script/ScriptLanguage.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/script/ScriptLanguage.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.script; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum ScriptLanguage { JS, TBEL } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/Authority.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/Authority.java index 1294572db2..171bb18077 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/security/Authority.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/Authority.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.security; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum Authority { SYS_ADMIN(0), diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/DeviceCredentialsType.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/DeviceCredentialsType.java index a9d94d6010..3ae2a0380f 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/security/DeviceCredentialsType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/DeviceCredentialsType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.security; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum DeviceCredentialsType { ACCESS_TOKEN, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/AccountTwoFaSettings.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/AccountTwoFaSettings.java index 915b918ae1..79114edba7 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/AccountTwoFaSettings.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/AccountTwoFaSettings.java @@ -24,9 +24,6 @@ import java.util.LinkedHashMap; @Data @Schema(description = "Account Two-Factor Authentication Settings") public class AccountTwoFaSettings { - @Schema( - description = "Map of Two-Factor Authentication provider configurations, keyed by provider type", - example = "{\"TOTP\": {...}, \"SMS\": {...}, \"EMAIL\": {...}}" - ) + @Schema private LinkedHashMap configs; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/BackupCodeTwoFaAccountConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/BackupCodeTwoFaAccountConfig.java index e997eede48..3b34a75250 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/BackupCodeTwoFaAccountConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/BackupCodeTwoFaAccountConfig.java @@ -32,7 +32,7 @@ public class BackupCodeTwoFaAccountConfig extends TwoFaAccountConfig { @NotEmpty private Set codes; - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Two-Factor Authentication provider type") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public TwoFaProviderType getProviderType() { return TwoFaProviderType.BACKUP_CODE; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/EmailTwoFaAccountConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/EmailTwoFaAccountConfig.java index b3fcdb1400..8b0b359164 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/EmailTwoFaAccountConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/EmailTwoFaAccountConfig.java @@ -31,7 +31,7 @@ public class EmailTwoFaAccountConfig extends OtpBasedTwoFaAccountConfig { @Email private String email; - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Two-Factor Authentication provider type") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public TwoFaProviderType getProviderType() { return TwoFaProviderType.EMAIL; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/SmsTwoFaAccountConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/SmsTwoFaAccountConfig.java index bf720e28b1..a9d7fe6561 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/SmsTwoFaAccountConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/SmsTwoFaAccountConfig.java @@ -31,7 +31,7 @@ public class SmsTwoFaAccountConfig extends OtpBasedTwoFaAccountConfig { @Pattern(regexp = "^\\+[1-9]\\d{1,14}$", message = "is not of E.164 format") private String phoneNumber; - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Two-Factor Authentication provider type") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public TwoFaProviderType getProviderType() { return TwoFaProviderType.SMS; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/TotpTwoFaAccountConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/TotpTwoFaAccountConfig.java index 614f5c908c..7711d09186 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/TotpTwoFaAccountConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/TotpTwoFaAccountConfig.java @@ -31,7 +31,7 @@ public class TotpTwoFaAccountConfig extends TwoFaAccountConfig { @Pattern(regexp = "otpauth://totp/(\\S+?):(\\S+?)\\?issuer=(\\S+?)&secret=(\\w+?)", message = "is invalid") private String authUrl; - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Two-Factor Authentication provider type") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public TwoFaProviderType getProviderType() { return TwoFaProviderType.TOTP; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/BackupCodeTwoFaProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/BackupCodeTwoFaProviderConfig.java index d6d23512e4..baf55f42cb 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/BackupCodeTwoFaProviderConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/BackupCodeTwoFaProviderConfig.java @@ -27,7 +27,7 @@ public class BackupCodeTwoFaProviderConfig implements TwoFaProviderConfig { private int codesQuantity; @Override - @Schema(description = "Two-Factor Authentication provider type", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) public TwoFaProviderType getProviderType() { return TwoFaProviderType.BACKUP_CODE; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/EmailTwoFaProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/EmailTwoFaProviderConfig.java index 632c325a2d..2d823c6697 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/EmailTwoFaProviderConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/EmailTwoFaProviderConfig.java @@ -25,7 +25,7 @@ import lombok.EqualsAndHashCode; public class EmailTwoFaProviderConfig extends OtpBasedTwoFaProviderConfig { @Override - @Schema(description = "Two-Factor Authentication provider type", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) public TwoFaProviderType getProviderType() { return TwoFaProviderType.EMAIL; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/SmsTwoFaProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/SmsTwoFaProviderConfig.java index 0392397197..e859e8b00d 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/SmsTwoFaProviderConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/SmsTwoFaProviderConfig.java @@ -31,7 +31,7 @@ public class SmsTwoFaProviderConfig extends OtpBasedTwoFaProviderConfig { private String smsVerificationMessageTemplate; @Override - @Schema(description = "Two-Factor Authentication provider type", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) public TwoFaProviderType getProviderType() { return TwoFaProviderType.SMS; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/TotpTwoFaProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/TotpTwoFaProviderConfig.java index b97c7c2dda..f32b820a53 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/TotpTwoFaProviderConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/TotpTwoFaProviderConfig.java @@ -27,7 +27,7 @@ public class TotpTwoFaProviderConfig implements TwoFaProviderConfig { private String issuerName; @Override - @Schema(description = "Two-Factor Authentication provider type", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) public TwoFaProviderType getProviderType() { return TwoFaProviderType.TOTP; } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/TwoFaProviderType.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/TwoFaProviderType.java index 40319f917b..fb31135ee5 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/TwoFaProviderType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/TwoFaProviderType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.security.model.mfa.provider; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum TwoFaProviderType { TOTP, SMS, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/settings/UserDashboardAction.java b/common/data/src/main/java/org/thingsboard/server/common/data/settings/UserDashboardAction.java index 9923728baa..9a3e568971 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/settings/UserDashboardAction.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/settings/UserDashboardAction.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.settings; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum UserDashboardAction { VISIT, STAR, UNSTAR diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/settings/UserSettingsType.java b/common/data/src/main/java/org/thingsboard/server/common/data/settings/UserSettingsType.java index 8c6d523f21..2ecf296a30 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/settings/UserSettingsType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/settings/UserSettingsType.java @@ -15,10 +15,8 @@ */ package org.thingsboard.server.common.data.settings; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; -@Schema(enumAsRef = true) public enum UserSettingsType { GENERAL, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmsProviderType.java b/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmsProviderType.java index b169a32c5b..3046098e57 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmsProviderType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmsProviderType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.sms.config; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum SmsProviderType { AWS_SNS, TWILIO, diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/ComplexVersionCreateRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/ComplexVersionCreateRequest.java index 0912686d47..32d3b6bf4b 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/ComplexVersionCreateRequest.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/ComplexVersionCreateRequest.java @@ -31,7 +31,7 @@ public class ComplexVersionCreateRequest extends VersionCreateRequest { private SyncStrategy syncStrategy; private Map entityTypes; - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the version to create") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public VersionCreateRequestType getType() { return VersionCreateRequestType.COMPLEX; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/SingleEntityVersionCreateRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/SingleEntityVersionCreateRequest.java index 95eb6e604d..e768d3d0e9 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/SingleEntityVersionCreateRequest.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/SingleEntityVersionCreateRequest.java @@ -28,7 +28,7 @@ public class SingleEntityVersionCreateRequest extends VersionCreateRequest { private EntityId entityId; private VersionCreateConfig config; - @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the version to create") + @Schema(requiredMode = Schema.RequiredMode.REQUIRED) @Override public VersionCreateRequestType getType() { return VersionCreateRequestType.SINGLE_ENTITY; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/SyncStrategy.java b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/SyncStrategy.java index 32e7eb4a42..4d1305ac23 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/SyncStrategy.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/SyncStrategy.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.sync.vc.request.create; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum SyncStrategy { MERGE, OVERWRITE diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/VersionCreateRequestType.java b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/VersionCreateRequestType.java index 26d6d6209f..97d73b76b1 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/VersionCreateRequestType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/VersionCreateRequestType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.sync.vc.request.create; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum VersionCreateRequestType { SINGLE_ENTITY, COMPLEX diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/load/VersionLoadRequestType.java b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/load/VersionLoadRequestType.java index 447a16c7f7..14092b1742 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/load/VersionLoadRequestType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/load/VersionLoadRequestType.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.sync.vc.request.load; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum VersionLoadRequestType { SINGLE_ENTITY, ENTITY_TYPE diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/transport/snmp/AuthenticationProtocol.java b/common/data/src/main/java/org/thingsboard/server/common/data/transport/snmp/AuthenticationProtocol.java index 6bb9e5a757..3ac372e7b4 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/transport/snmp/AuthenticationProtocol.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/transport/snmp/AuthenticationProtocol.java @@ -15,12 +15,9 @@ */ package org.thingsboard.server.common.data.transport.snmp; -import io.swagger.v3.oas.annotations.media.Schema; - import java.util.Arrays; import java.util.Optional; -@Schema(enumAsRef = true) public enum AuthenticationProtocol { SHA_1("1.3.6.1.6.3.10.1.1.3"), SHA_224("1.3.6.1.6.3.10.1.1.4"), diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/transport/snmp/PrivacyProtocol.java b/common/data/src/main/java/org/thingsboard/server/common/data/transport/snmp/PrivacyProtocol.java index de960057ae..d152dbf827 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/transport/snmp/PrivacyProtocol.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/transport/snmp/PrivacyProtocol.java @@ -15,12 +15,9 @@ */ package org.thingsboard.server.common.data.transport.snmp; -import io.swagger.v3.oas.annotations.media.Schema; - import java.util.Arrays; import java.util.Optional; -@Schema(enumAsRef = true) public enum PrivacyProtocol { DES("1.3.6.1.6.3.10.1.2.2"), AES_128("1.3.6.1.6.3.10.1.2.4"), diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/transport/snmp/SnmpCommunicationSpec.java b/common/data/src/main/java/org/thingsboard/server/common/data/transport/snmp/SnmpCommunicationSpec.java index e26d0a7170..796b199825 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/transport/snmp/SnmpCommunicationSpec.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/transport/snmp/SnmpCommunicationSpec.java @@ -15,11 +15,9 @@ */ package org.thingsboard.server.common.data.transport.snmp; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Getter; -@Schema(enumAsRef = true) @AllArgsConstructor @Getter public enum SnmpCommunicationSpec { diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/widget/DeprecatedFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/widget/DeprecatedFilter.java index c65467f6f6..d30f22b18e 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/widget/DeprecatedFilter.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/widget/DeprecatedFilter.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.common.data.widget; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(enumAsRef = true) public enum DeprecatedFilter { ALL, ACTUAL,