Browse Source

updated SwaggerConfiguration, deleted redundant @Schema(enumAsRef = true)

pull/14929/head
dashevchenko 8 months ago
parent
commit
9c01eefceb
  1. 13
      application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
  2. 3
      application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java
  3. 2
      application/src/main/java/org/thingsboard/server/service/security/model/SecurityUser.java
  4. 2
      common/data/src/main/java/org/thingsboard/server/common/data/ApiFeature.java
  5. 3
      common/data/src/main/java/org/thingsboard/server/common/data/ApiUsageStateValue.java
  6. 3
      common/data/src/main/java/org/thingsboard/server/common/data/CoapDeviceType.java
  7. 3
      common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileProvisionType.java
  8. 3
      common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileType.java
  9. 3
      common/data/src/main/java/org/thingsboard/server/common/data/DeviceTransportType.java
  10. 2
      common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
  11. 3
      common/data/src/main/java/org/thingsboard/server/common/data/ResourceSubType.java
  12. 2
      common/data/src/main/java/org/thingsboard/server/common/data/ResourceType.java
  13. 3
      common/data/src/main/java/org/thingsboard/server/common/data/TenantProfileType.java
  14. 3
      common/data/src/main/java/org/thingsboard/server/common/data/TransportPayloadType.java
  15. 2
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java
  16. 3
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCommentType.java
  17. 3
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmSearchStatus.java
  18. 3
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmSeverity.java
  19. 3
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmStatus.java
  20. 3
      common/data/src/main/java/org/thingsboard/server/common/data/cf/CalculatedFieldType.java
  21. 3
      common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/ArgumentType.java
  22. 12
      common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CalculatedFieldConfiguration.java
  23. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/data/DefaultDeviceConfiguration.java
  24. 3
      common/data/src/main/java/org/thingsboard/server/common/data/device/data/PowerMode.java
  25. 3
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmConditionSpecType.java
  26. 3
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmScheduleType.java
  27. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AllowCreateNewDevicesDeviceProfileProvisionConfiguration.java
  28. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration.java
  29. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CoapDeviceProfileTransportConfiguration.java
  30. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CoapDeviceTypeConfiguration.java
  31. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultCoapDeviceTypeConfiguration.java
  32. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileConfiguration.java
  33. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileTransportConfiguration.java
  34. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileConfiguration.java
  35. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DisabledDeviceProfileProvisionConfiguration.java
  36. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DurationAlarmConditionSpec.java
  37. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/EfentoCoapDeviceTypeConfiguration.java
  38. 4
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/JsonTransportPayloadConfiguration.java
  39. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SimpleAlarmConditionSpec.java
  40. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SnmpDeviceProfileTransportConfiguration.java
  41. 4
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/TransportPayloadTypeConfiguration.java
  42. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/X509CertificateChainProvisionConfiguration.java
  43. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/TelemetryObserveStrategy.java
  44. 2
      common/data/src/main/java/org/thingsboard/server/common/data/event/EventType.java
  45. 2
      common/data/src/main/java/org/thingsboard/server/common/data/exception/ThingsboardErrorCode.java
  46. 4
      common/data/src/main/java/org/thingsboard/server/common/data/exception/ThingsboardException.java
  47. 2
      common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTaskType.java
  48. 3
      common/data/src/main/java/org/thingsboard/server/common/data/job/JobStatus.java
  49. 2
      common/data/src/main/java/org/thingsboard/server/common/data/job/JobType.java
  50. 2
      common/data/src/main/java/org/thingsboard/server/common/data/kv/DataType.java
  51. 3
      common/data/src/main/java/org/thingsboard/server/common/data/kv/IntervalType.java
  52. 2
      common/data/src/main/java/org/thingsboard/server/common/data/limit/LimitedApi.java
  53. 3
      common/data/src/main/java/org/thingsboard/server/common/data/mail/MailOauth2Provider.java
  54. 3
      common/data/src/main/java/org/thingsboard/server/common/data/mobile/app/MobileAppStatus.java
  55. 3
      common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/DefaultPageId.java
  56. 3
      common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/MobilePageType.java
  57. 3
      common/data/src/main/java/org/thingsboard/server/common/data/mobile/qrCodeSettings/BadgePosition.java
  58. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationDeliveryMethod.java
  59. 3
      common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationStatus.java
  60. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationType.java
  61. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/ResourcesShortageTrigger.java
  62. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmAssignmentNotificationRuleTriggerConfig.java
  63. 4
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmNotificationRuleTriggerConfig.java
  64. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/ApiUsageLimitNotificationRuleTriggerConfig.java
  65. 4
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/DeviceActivityNotificationRuleTriggerConfig.java
  66. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeCommunicationFailureNotificationRuleTriggerConfig.java
  67. 4
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeConnectionNotificationRuleTriggerConfig.java
  68. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EntitiesLimitNotificationRuleTriggerConfig.java
  69. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EntityActionNotificationRuleTriggerConfig.java
  70. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NewPlatformVersionNotificationRuleTriggerConfig.java
  71. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerType.java
  72. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/RateLimitsNotificationRuleTriggerConfig.java
  73. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/ResourcesShortageNotificationRuleTriggerConfig.java
  74. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig.java
  75. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/TaskProcessingFailureNotificationRuleTriggerConfig.java
  76. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/MobileAppNotificationDeliveryMethodConfig.java
  77. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/SlackNotificationDeliveryMethodConfig.java
  78. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/MicrosoftTeamsNotificationTargetConfig.java
  79. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/NotificationTargetType.java
  80. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedTenantAdministratorsFilter.java
  81. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedUserFilter.java
  82. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AllUsersFilter.java
  83. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/CustomerUsersFilter.java
  84. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/OriginatorEntityOwnerUsersFilter.java
  85. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/PlatformUsersNotificationTargetConfig.java
  86. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/SystemAdministratorsFilter.java
  87. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/TenantAdministratorsFilter.java
  88. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UserListFilter.java
  89. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UsersFilterType.java
  90. 3
      common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/slack/SlackConversationType.java
  91. 14
      common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MicrosoftTeamsDeliveryMethodNotificationTemplate.java
  92. 3
      common/data/src/main/java/org/thingsboard/server/common/data/oauth2/MapperType.java
  93. 3
      common/data/src/main/java/org/thingsboard/server/common/data/oauth2/PlatformType.java
  94. 3
      common/data/src/main/java/org/thingsboard/server/common/data/oauth2/SchemeType.java
  95. 3
      common/data/src/main/java/org/thingsboard/server/common/data/oauth2/TenantNameStrategyType.java
  96. 3
      common/data/src/main/java/org/thingsboard/server/common/data/ota/ChecksumAlgorithm.java
  97. 2
      common/data/src/main/java/org/thingsboard/server/common/data/ota/OtaPackageType.java
  98. 3
      common/data/src/main/java/org/thingsboard/server/common/data/ota/OtaPackageUpdateStatus.java
  99. 2
      common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleEvent.java
  100. 3
      common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleState.java

13
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.AnnotatedType;
import io.swagger.v3.core.converter.ModelConverter; import io.swagger.v3.core.converter.ModelConverter;
import io.swagger.v3.core.converter.ModelConverters; 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.core.util.Json;
import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
@ -83,6 +84,10 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
@Profile("!test") @Profile("!test")
public class SwaggerConfiguration { public class SwaggerConfiguration {
static {
ModelResolver.enumsAsRef = true;
}
public static final String LOGIN_ENDPOINT = "/api/auth/login"; public static final String LOGIN_ENDPOINT = "/api/auth/login";
public static final String REFRESH_TOKEN_ENDPOINT = "/api/auth/token"; public static final String REFRESH_TOKEN_ENDPOINT = "/api/auth/token";
@ -276,12 +281,18 @@ public class SwaggerConfiguration {
.description("Arbitrary JSON object or primitive value") .description("Arbitrary JSON object or primitive value")
.additionalProperties(true) .additionalProperties(true)
.example(JacksonUtil.newObjectNode()); .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() openAPI.getComponents()
.addSchemas("JsonNode", jsonNodeSchema) .addSchemas("JsonNode", jsonNodeSchema)
.addSchemas("LoginRequest", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(LoginRequest.class)).schema) .addSchemas("LoginRequest", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(LoginRequest.class)).schema)
.addSchemas("LoginResponse", ModelConverters.getInstance().readAllAsResolvedSchema(new AnnotatedType().type(LoginResponse.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("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) { private RouterOperationCustomizer routerOperationCustomizer(SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {

3
application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java

@ -22,12 +22,15 @@ import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
@Schema @Schema
public class ThingsboardErrorResponse { public class ThingsboardErrorResponse {
// HTTP Response Status Code // HTTP Response Status Code
@Schema
private final HttpStatus status; private final HttpStatus status;
// General Error message // General Error message
@Schema
private final String message; private final String message;
// Error code // Error code
@Schema
private final ThingsboardErrorCode errorCode; private final ThingsboardErrorCode errorCode;
private final long timestamp; private final long timestamp;

2
application/src/main/java/org/thingsboard/server/service/security/model/SecurityUser.java

@ -15,6 +15,7 @@
*/ */
package org.thingsboard.server.service.security.model; package org.thingsboard.server.service.security.model;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
@ -27,6 +28,7 @@ import java.util.UUID;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@Schema
public class SecurityUser extends User { public class SecurityUser extends User {
private static final long serialVersionUID = -797397440703066079L; private static final long serialVersionUID = -797397440703066079L;

2
common/data/src/main/java/org/thingsboard/server/common/data/ApiFeature.java

@ -15,10 +15,8 @@
*/ */
package org.thingsboard.server.common.data; package org.thingsboard.server.common.data;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter; import lombok.Getter;
@Schema(enumAsRef = true)
public enum ApiFeature { public enum ApiFeature {
TRANSPORT("transportApiState", "Device API"), TRANSPORT("transportApiState", "Device API"),
DB("dbApiState", "Telemetry persistence"), DB("dbApiState", "Telemetry persistence"),

3
common/data/src/main/java/org/thingsboard/server/common/data/ApiUsageStateValue.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data; package org.thingsboard.server.common.data;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum ApiUsageStateValue { public enum ApiUsageStateValue {
ENABLED, WARNING, DISABLED; ENABLED, WARNING, DISABLED;

3
common/data/src/main/java/org/thingsboard/server/common/data/CoapDeviceType.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data; package org.thingsboard.server.common.data;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum CoapDeviceType { public enum CoapDeviceType {
DEFAULT, DEFAULT,
EFENTO EFENTO

3
common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileProvisionType.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data; package org.thingsboard.server.common.data;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum DeviceProfileProvisionType { public enum DeviceProfileProvisionType {
DISABLED, DISABLED,
ALLOW_CREATE_NEW_DEVICES, ALLOW_CREATE_NEW_DEVICES,

3
common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfileType.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data; package org.thingsboard.server.common.data;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum DeviceProfileType { public enum DeviceProfileType {
DEFAULT DEFAULT
} }

3
common/data/src/main/java/org/thingsboard/server/common/data/DeviceTransportType.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data; package org.thingsboard.server.common.data;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum DeviceTransportType { public enum DeviceTransportType {
DEFAULT, DEFAULT,
MQTT, MQTT,

2
common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java

@ -15,7 +15,6 @@
*/ */
package org.thingsboard.server.common.data; package org.thingsboard.server.common.data;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter; import lombok.Getter;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -23,7 +22,6 @@ import java.util.Arrays;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.List; import java.util.List;
@Schema(enumAsRef = true)
public enum EntityType { public enum EntityType {
TENANT(1), TENANT(1),
CUSTOMER(2), CUSTOMER(2),

3
common/data/src/main/java/org/thingsboard/server/common/data/ResourceSubType.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data; package org.thingsboard.server.common.data;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum ResourceSubType { public enum ResourceSubType {
IMAGE, IMAGE,
SCADA_SYMBOL, SCADA_SYMBOL,

2
common/data/src/main/java/org/thingsboard/server/common/data/ResourceType.java

@ -15,11 +15,9 @@
*/ */
package org.thingsboard.server.common.data; package org.thingsboard.server.common.data;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@Schema(enumAsRef = true)
@RequiredArgsConstructor @RequiredArgsConstructor
public enum ResourceType { public enum ResourceType {
LWM2M_MODEL("application/xml", false, false), LWM2M_MODEL("application/xml", false, false),

3
common/data/src/main/java/org/thingsboard/server/common/data/TenantProfileType.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data; package org.thingsboard.server.common.data;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum TenantProfileType { public enum TenantProfileType {
DEFAULT DEFAULT
} }

3
common/data/src/main/java/org/thingsboard/server/common/data/TransportPayloadType.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data; package org.thingsboard.server.common.data;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum TransportPayloadType { public enum TransportPayloadType {
JSON, JSON,
PROTOBUF PROTOBUF

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

@ -45,7 +45,7 @@ public class AlarmComment extends BaseData<AlarmCommentId> implements HasName {
private AlarmId alarmId; private AlarmId alarmId;
@Schema(description = "JSON object with User id.", accessMode = Schema.AccessMode.READ_ONLY) @Schema(description = "JSON object with User id.", accessMode = Schema.AccessMode.READ_ONLY)
private UserId userId; 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; private AlarmCommentType type;
@Schema(description = "JSON object with text of comment.", implementation = JsonNode.class) @Schema(description = "JSON object with text of comment.", implementation = JsonNode.class)
@NoXss @NoXss

3
common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCommentType.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data.alarm; package org.thingsboard.server.common.data.alarm;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum AlarmCommentType { public enum AlarmCommentType {
SYSTEM, OTHER; SYSTEM, OTHER;

3
common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmSearchStatus.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data.alarm; package org.thingsboard.server.common.data.alarm;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum AlarmSearchStatus { public enum AlarmSearchStatus {
ANY, ANY,

3
common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmSeverity.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data.alarm; package org.thingsboard.server.common.data.alarm;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum AlarmSeverity { public enum AlarmSeverity {
CRITICAL, MAJOR, MINOR, WARNING, INDETERMINATE; CRITICAL, MAJOR, MINOR, WARNING, INDETERMINATE;

3
common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmStatus.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data.alarm; package org.thingsboard.server.common.data.alarm;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum AlarmStatus { public enum AlarmStatus {
ACTIVE_UNACK, ACTIVE_ACK, CLEARED_UNACK, CLEARED_ACK; ACTIVE_UNACK, ACTIVE_ACK, CLEARED_UNACK, CLEARED_ACK;

3
common/data/src/main/java/org/thingsboard/server/common/data/cf/CalculatedFieldType.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data.cf; package org.thingsboard.server.common.data.cf;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum CalculatedFieldType { public enum CalculatedFieldType {
SIMPLE, SCRIPT SIMPLE, SCRIPT

3
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; package org.thingsboard.server.common.data.cf.configuration;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum ArgumentType { public enum ArgumentType {
TS_LATEST, ATTRIBUTE, TS_ROLLING TS_LATEST, ATTRIBUTE, TS_ROLLING

12
common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CalculatedFieldConfiguration.java

@ -57,24 +57,12 @@ public interface CalculatedFieldConfiguration {
@JsonIgnore @JsonIgnore
CalculatedFieldType getType(); CalculatedFieldType getType();
@Schema(
description = "Arguments/parameters for the calculated field",
example = "{\"param1\": {\"type\": \"STRING\", \"value\": \"example\"}}"
)
Map<String, Argument> getArguments(); Map<String, Argument> getArguments();
@Schema(
description = "Expression or formula for calculating the field value",
requiredMode = Schema.RequiredMode.REQUIRED,
example = "value1 + value2"
)
String getExpression(); String getExpression();
void setExpression(String expression); void setExpression(String expression);
@Schema(
description = "Output configuration for the calculated field result"
)
Output getOutput(); Output getOutput();
@JsonIgnore @JsonIgnore

2
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; private static final long serialVersionUID = -2225378639573611325L;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Device profile type") @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override @Override
public DeviceProfileType getType() { public DeviceProfileType getType() {
return DeviceProfileType.DEFAULT; return DeviceProfileType.DEFAULT;

3
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; package org.thingsboard.server.common.data.device.data;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum PowerMode { public enum PowerMode {
PSM, DRX, E_DRX PSM, DRX, E_DRX
} }

3
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; package org.thingsboard.server.common.data.device.profile;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum AlarmConditionSpecType { public enum AlarmConditionSpecType {
SIMPLE, SIMPLE,

3
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; package org.thingsboard.server.common.data.device.profile;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum AlarmScheduleType { public enum AlarmScheduleType {
ANY_TIME, ANY_TIME,

2
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; private final String provisionDeviceSecret;
@Override @Override
@Schema(description = "Device profile provision type", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
public DeviceProfileProvisionType getType() { public DeviceProfileProvisionType getType() {
return DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES; return DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES;
} }

2
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; private final String provisionDeviceSecret;
@Schema(description = "Device profile provision type", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override @Override
public DeviceProfileProvisionType getType() { public DeviceProfileProvisionType getType() {
return DeviceProfileProvisionType.CHECK_PRE_PROVISIONED_DEVICES; return DeviceProfileProvisionType.CHECK_PRE_PROVISIONED_DEVICES;

2
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CoapDeviceProfileTransportConfiguration.java

@ -29,7 +29,7 @@ public class CoapDeviceProfileTransportConfiguration implements DeviceProfileTra
@Schema @Schema
private PowerSavingConfiguration clientSettings; private PowerSavingConfiguration clientSettings;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the device transport") @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override @Override
public DeviceTransportType getType() { public DeviceTransportType getType() {
return DeviceTransportType.COAP; return DeviceTransportType.COAP;

2
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")}) @JsonSubTypes.Type(value = EfentoCoapDeviceTypeConfiguration.class, name = "EFENTO")})
public interface CoapDeviceTypeConfiguration extends Serializable { public interface CoapDeviceTypeConfiguration extends Serializable {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "CoAP device type") @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@JsonIgnore @JsonIgnore
CoapDeviceType getCoapDeviceType(); CoapDeviceType getCoapDeviceType();

2
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; private TransportPayloadTypeConfiguration transportPayloadTypeConfiguration;
@Override @Override
@Schema(description = "CoAP device type", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
public CoapDeviceType getCoapDeviceType() { public CoapDeviceType getCoapDeviceType() {
return CoapDeviceType.DEFAULT; return CoapDeviceType.DEFAULT;
} }

2
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 @Data
public class DefaultDeviceProfileConfiguration implements DeviceProfileConfiguration { public class DefaultDeviceProfileConfiguration implements DeviceProfileConfiguration {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Device profile type") @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override @Override
public DeviceProfileType getType() { public DeviceProfileType getType() {
return DeviceProfileType.DEFAULT; return DeviceProfileType.DEFAULT;

2
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 @Data
public class DefaultDeviceProfileTransportConfiguration implements DeviceProfileTransportConfiguration { public class DefaultDeviceProfileTransportConfiguration implements DeviceProfileTransportConfiguration {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the device transport") @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override @Override
public DeviceTransportType getType() { public DeviceTransportType getType() {
return DeviceTransportType.DEFAULT; return DeviceTransportType.DEFAULT;

2
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")}) @JsonSubTypes.Type(value = DefaultDeviceProfileConfiguration.class, name = "DEFAULT")})
public interface DeviceProfileConfiguration extends Serializable { public interface DeviceProfileConfiguration extends Serializable {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Device profile type") @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@JsonIgnore @JsonIgnore
DeviceProfileType getType(); DeviceProfileType getType();

2
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; private final String provisionDeviceSecret;
@Override @Override
@Schema(description = "Device profile provision type", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
public DeviceProfileProvisionType getType() { public DeviceProfileProvisionType getType() {
return DeviceProfileProvisionType.DISABLED; return DeviceProfileProvisionType.DISABLED;
} }

2
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<Long> predicate; private FilterPredicateValue<Long> predicate;
@Override @Override
@Schema(description = "Type of the Alarm Condition Specification", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
public AlarmConditionSpecType getType() { public AlarmConditionSpecType getType() {
return AlarmConditionSpecType.DURATION; return AlarmConditionSpecType.DURATION;
} }

2
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; private static final long serialVersionUID = -8523081152598707064L;
@Override @Override
@Schema(description = "CoAP device type", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
public CoapDeviceType getCoapDeviceType() { public CoapDeviceType getCoapDeviceType() {
return CoapDeviceType.EFENTO; return CoapDeviceType.EFENTO;
} }

4
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 @Schema
public class JsonTransportPayloadConfiguration implements TransportPayloadTypeConfiguration { public class JsonTransportPayloadConfiguration implements TransportPayloadTypeConfiguration {
@Schema( @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
description = "Transport payload type", requiredMode = Schema.RequiredMode.REQUIRED
)
@Override @Override
public TransportPayloadType getTransportPayloadType() { public TransportPayloadType getTransportPayloadType() {
return TransportPayloadType.JSON; return TransportPayloadType.JSON;

2
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SimpleAlarmConditionSpec.java

@ -24,7 +24,7 @@ import lombok.Data;
@JsonIgnoreProperties(ignoreUnknown = true) @JsonIgnoreProperties(ignoreUnknown = true)
public class SimpleAlarmConditionSpec implements AlarmConditionSpec { public class SimpleAlarmConditionSpec implements AlarmConditionSpec {
@Override @Override
@Schema(description = "Type of the Alarm Condition Specification", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
public AlarmConditionSpecType getType() { public AlarmConditionSpecType getType() {
return AlarmConditionSpecType.SIMPLE; return AlarmConditionSpecType.SIMPLE;
} }

2
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)) @ArraySchema(schema = @Schema(implementation = SnmpCommunicationConfig.class))
private List<SnmpCommunicationConfig> communicationConfigs; private List<SnmpCommunicationConfig> communicationConfigs;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the device transport") @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override @Override
public DeviceTransportType getType() { public DeviceTransportType getType() {
return DeviceTransportType.SNMP; return DeviceTransportType.SNMP;

4
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")}) @JsonSubTypes.Type(value = ProtoTransportPayloadConfiguration.class, name = "PROTOBUF")})
public interface TransportPayloadTypeConfiguration extends Serializable { public interface TransportPayloadTypeConfiguration extends Serializable {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@JsonIgnore @JsonIgnore
@Schema(
description = "Transport payload type", requiredMode = Schema.RequiredMode.REQUIRED
)
TransportPayloadType getTransportPayloadType(); TransportPayloadType getTransportPayloadType();
} }

2
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; private boolean allowCreateNewDevicesByX509Certificate;
@Override @Override
@Schema(description = "Device profile provision type", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
public DeviceProfileProvisionType getType() { public DeviceProfileProvisionType getType() {
return DeviceProfileProvisionType.X509_CERTIFICATE_CHAIN; return DeviceProfileProvisionType.X509_CERTIFICATE_CHAIN;
} }

2
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; package org.thingsboard.server.common.data.device.profile.lwm2m;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter; import lombok.Getter;
@Schema(enumAsRef = true)
public enum TelemetryObserveStrategy { public enum TelemetryObserveStrategy {
SINGLE("One resource equals one single observe request", 0), SINGLE("One resource equals one single observe request", 0),

2
common/data/src/main/java/org/thingsboard/server/common/data/event/EventType.java

@ -15,10 +15,8 @@
*/ */
package org.thingsboard.server.common.data.event; package org.thingsboard.server.common.data.event;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter; import lombok.Getter;
@Schema(enumAsRef = true)
public enum EventType { public enum EventType {
ERROR("error_event", "ERROR"), ERROR("error_event", "ERROR"),
LC_EVENT("lc_event", "LC_EVENT"), LC_EVENT("lc_event", "LC_EVENT"),

2
common/data/src/main/java/org/thingsboard/server/common/data/exception/ThingsboardErrorCode.java

@ -16,7 +16,9 @@
package org.thingsboard.server.common.data.exception; package org.thingsboard.server.common.data.exception;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema
public enum ThingsboardErrorCode { public enum ThingsboardErrorCode {
GENERAL(2), GENERAL(2),

4
common/data/src/main/java/org/thingsboard/server/common/data/exception/ThingsboardException.java

@ -15,10 +15,14 @@
*/ */
package org.thingsboard.server.common.data.exception; package org.thingsboard.server.common.data.exception;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema
public class ThingsboardException extends Exception { public class ThingsboardException extends Exception {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Schema
private ThingsboardErrorCode errorCode; private ThingsboardErrorCode errorCode;
public ThingsboardException() { public ThingsboardException() {

2
common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTaskType.java

@ -15,11 +15,9 @@
*/ */
package org.thingsboard.server.common.data.housekeeper; package org.thingsboard.server.common.data.housekeeper;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@Schema(enumAsRef = true)
@RequiredArgsConstructor @RequiredArgsConstructor
@Getter @Getter
public enum HousekeeperTaskType { public enum HousekeeperTaskType {

3
common/data/src/main/java/org/thingsboard/server/common/data/job/JobStatus.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data.job; package org.thingsboard.server.common.data.job;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum JobStatus { public enum JobStatus {
QUEUED, QUEUED,

2
common/data/src/main/java/org/thingsboard/server/common/data/job/JobType.java

@ -15,11 +15,9 @@
*/ */
package org.thingsboard.server.common.data.job; package org.thingsboard.server.common.data.job;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@Schema(enumAsRef = true)
@RequiredArgsConstructor @RequiredArgsConstructor
@Getter @Getter
public enum JobType { public enum JobType {

2
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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter; import lombok.Getter;
@Schema(enumAsRef = true) @Schema
public enum DataType { public enum DataType {
BOOLEAN(0), BOOLEAN(0),

3
common/data/src/main/java/org/thingsboard/server/common/data/kv/IntervalType.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data.kv; package org.thingsboard.server.common.data.kv;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum IntervalType { public enum IntervalType {
MILLISECONDS, WEEK/*Sunday-Saturday*/, WEEK_ISO/*Monday-Sunday*/, MONTH, QUARTER MILLISECONDS, WEEK/*Sunday-Saturday*/, WEEK_ISO/*Monday-Sunday*/, MONTH, QUARTER

2
common/data/src/main/java/org/thingsboard/server/common/data/limit/LimitedApi.java

@ -15,14 +15,12 @@
*/ */
package org.thingsboard.server.common.data.limit; package org.thingsboard.server.common.data.limit;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter; import lombok.Getter;
import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration; import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
import java.util.Optional; import java.util.Optional;
import java.util.function.Function; import java.util.function.Function;
@Schema(enumAsRef = true)
@Getter @Getter
public enum LimitedApi { public enum LimitedApi {

3
common/data/src/main/java/org/thingsboard/server/common/data/mail/MailOauth2Provider.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data.mail; package org.thingsboard.server.common.data.mail;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum MailOauth2Provider { public enum MailOauth2Provider {
GOOGLE("Google"), OFFICE_365("Office 365"), SENDGRID("SendGrid"), CUSTOM("Custom"); GOOGLE("Google"), OFFICE_365("Office 365"), SENDGRID("SendGrid"), CUSTOM("Custom");

3
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; package org.thingsboard.server.common.data.mobile.app;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum MobileAppStatus { public enum MobileAppStatus {
DRAFT, DRAFT,

3
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; package org.thingsboard.server.common.data.mobile.layout;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum DefaultPageId { public enum DefaultPageId {
HOME, HOME,

3
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; package org.thingsboard.server.common.data.mobile.layout;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum MobilePageType { public enum MobilePageType {
DEFAULT, DEFAULT,

3
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; package org.thingsboard.server.common.data.mobile.qrCodeSettings;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum BadgePosition { public enum BadgePosition {
RIGHT, RIGHT,

2
common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationDeliveryMethod.java

@ -15,11 +15,9 @@
*/ */
package org.thingsboard.server.common.data.notification; package org.thingsboard.server.common.data.notification;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@Schema(enumAsRef = true)
@RequiredArgsConstructor @RequiredArgsConstructor
public enum NotificationDeliveryMethod { public enum NotificationDeliveryMethod {

3
common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationStatus.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data.notification; package org.thingsboard.server.common.data.notification;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum NotificationStatus { public enum NotificationStatus {
SENT, SENT,
READ READ

2
common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationType.java

@ -15,12 +15,10 @@
*/ */
package org.thingsboard.server.common.data.notification; package org.thingsboard.server.common.data.notification;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@Schema(enumAsRef = true)
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public enum NotificationType { public enum NotificationType {

2
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; return NotificationRuleTriggerType.RESOURCES_SHORTAGE;
} }
@Schema(enumAsRef = true) @Schema
public enum Resource { public enum Resource {
CPU, RAM, STORAGE CPU, RAM, STORAGE
} }

2
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; return NotificationRuleTriggerType.ALARM_ASSIGNMENT;
} }
@Schema(enumAsRef = true) @Schema
public enum Action { public enum Action {
ASSIGNED, UNASSIGNED ASSIGNED, UNASSIGNED
} }

4
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; private ClearRule clearRule;
@Override @Override
@Schema(description = "Type of the notification rule trigger") @Schema
public NotificationRuleTriggerType getTriggerType() { public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.ALARM; return NotificationRuleTriggerType.ALARM;
} }
@ -56,7 +56,7 @@ public class AlarmNotificationRuleTriggerConfig implements NotificationRuleTrigg
private Set<AlarmSearchStatus> alarmStatuses; private Set<AlarmSearchStatus> alarmStatuses;
} }
@Schema(enumAsRef = true) @Schema
public enum AlarmAction { public enum AlarmAction {
CREATED, SEVERITY_CHANGED, ACKNOWLEDGED, CLEARED CREATED, SEVERITY_CHANGED, ACKNOWLEDGED, CLEARED
} }

2
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<ApiUsageStateValue> notifyOn; private Set<ApiUsageStateValue> notifyOn;
@Override @Override
@Schema(description = "Type of the notification rule trigger") @Schema
public NotificationRuleTriggerType getTriggerType() { public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.API_USAGE_LIMIT; return NotificationRuleTriggerType.API_USAGE_LIMIT;
} }

4
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<DeviceEvent> notifyOn; private Set<DeviceEvent> notifyOn;
@Override @Override
@Schema(description = "Type of the notification rule trigger") @Schema
public NotificationRuleTriggerType getTriggerType() { public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.DEVICE_ACTIVITY; return NotificationRuleTriggerType.DEVICE_ACTIVITY;
} }
@Schema(enumAsRef = true) @Schema
public enum DeviceEvent { public enum DeviceEvent {
ACTIVE, INACTIVE ACTIVE, INACTIVE
} }

2
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<UUID> edges; // if empty - all edges private Set<UUID> edges; // if empty - all edges
@Override @Override
@Schema(description = "Type of the notification rule trigger") @Schema
public NotificationRuleTriggerType getTriggerType() { public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.EDGE_COMMUNICATION_FAILURE; return NotificationRuleTriggerType.EDGE_COMMUNICATION_FAILURE;
} }

4
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<EdgeConnectivityEvent> notifyOn; private Set<EdgeConnectivityEvent> notifyOn;
@Override @Override
@Schema(description = "Type of the notification rule trigger") @Schema
public NotificationRuleTriggerType getTriggerType() { public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.EDGE_CONNECTION; return NotificationRuleTriggerType.EDGE_CONNECTION;
} }
@Schema(enumAsRef = true) @Schema
public enum EdgeConnectivityEvent { public enum EdgeConnectivityEvent {
CONNECTED, DISCONNECTED CONNECTED, DISCONNECTED
} }

2
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, private float threshold; // in percents,
@Override @Override
@Schema(description = "Type of the notification rule trigger") @Schema
public NotificationRuleTriggerType getTriggerType() { public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.ENTITIES_LIMIT; return NotificationRuleTriggerType.ENTITIES_LIMIT;
} }

2
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; private boolean deleted;
@Override @Override
@Schema(description = "Type of the notification rule trigger") @Schema
public NotificationRuleTriggerType getTriggerType() { public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.ENTITY_ACTION; return NotificationRuleTriggerType.ENTITY_ACTION;
} }

2
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 { public class NewPlatformVersionNotificationRuleTriggerConfig implements NotificationRuleTriggerConfig {
@Override @Override
@Schema(description = "Type of the notification rule trigger") @Schema
public NotificationRuleTriggerType getTriggerType() { public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.NEW_PLATFORM_VERSION; return NotificationRuleTriggerType.NEW_PLATFORM_VERSION;
} }

2
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; package org.thingsboard.server.common.data.notification.rule.trigger.config;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter; import lombok.Getter;
@Getter @Getter
@Schema(enumAsRef = true)
public enum NotificationRuleTriggerType { public enum NotificationRuleTriggerType {
ENTITY_ACTION, ENTITY_ACTION,

2
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<LimitedApi> apis; private Set<LimitedApi> apis;
@Override @Override
@Schema(description = "Type of the notification rule trigger") @Schema
public NotificationRuleTriggerType getTriggerType() { public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.RATE_LIMITS; return NotificationRuleTriggerType.RATE_LIMITS;
} }

2
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 private float storageThreshold; // in percents
@Override @Override
@Schema(description = "Type of the notification rule trigger") @Schema
public NotificationRuleTriggerType getTriggerType() { public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.RESOURCES_SHORTAGE; return NotificationRuleTriggerType.RESOURCES_SHORTAGE;
} }

2
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; private boolean onlyRuleNodeLifecycleFailures;
@Override @Override
@Schema(description = "Type of the notification rule trigger") @Schema
public NotificationRuleTriggerType getTriggerType() { public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.RULE_ENGINE_COMPONENT_LIFECYCLE_EVENT; return NotificationRuleTriggerType.RULE_ENGINE_COMPONENT_LIFECYCLE_EVENT;
} }

2
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 { public class TaskProcessingFailureNotificationRuleTriggerConfig implements NotificationRuleTriggerConfig {
@Override @Override
@Schema(description = "Type of the notification rule trigger", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
public NotificationRuleTriggerType getTriggerType() { public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.TASK_PROCESSING_FAILURE; return NotificationRuleTriggerType.TASK_PROCESSING_FAILURE;
} }

2
common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/MobileAppNotificationDeliveryMethodConfig.java

@ -28,7 +28,7 @@ public class MobileAppNotificationDeliveryMethodConfig implements NotificationDe
@NotEmpty @NotEmpty
private String firebaseServiceAccountCredentials; private String firebaseServiceAccountCredentials;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the notification delivery method") @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override @Override
public NotificationDeliveryMethod getMethod() { public NotificationDeliveryMethod getMethod() {
return NotificationDeliveryMethod.MOBILE_APP; return NotificationDeliveryMethod.MOBILE_APP;

2
common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/SlackNotificationDeliveryMethodConfig.java

@ -27,7 +27,7 @@ public class SlackNotificationDeliveryMethodConfig implements NotificationDelive
@NotEmpty @NotEmpty
private String botToken; private String botToken;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the notification delivery method") @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override @Override
public NotificationDeliveryMethod getMethod() { public NotificationDeliveryMethod getMethod() {
return NotificationDeliveryMethod.SLACK; return NotificationDeliveryMethod.SLACK;

2
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 String channelName;
private Boolean useOldApi = Boolean.TRUE; private Boolean useOldApi = Boolean.TRUE;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the notification target") @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override @Override
public NotificationTargetType getType() { public NotificationTargetType getType() {
return NotificationTargetType.MICROSOFT_TEAMS; return NotificationTargetType.MICROSOFT_TEAMS;

2
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; package org.thingsboard.server.common.data.notification.targets;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod; 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.Arrays;
import java.util.Set; import java.util.Set;
@Schema(enumAsRef = true)
@RequiredArgsConstructor @RequiredArgsConstructor
public enum NotificationTargetType { public enum NotificationTargetType {

2
common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedTenantAdministratorsFilter.java

@ -22,7 +22,7 @@ import lombok.Data;
@Data @Data
public class AffectedTenantAdministratorsFilter implements UsersFilter { public class AffectedTenantAdministratorsFilter implements UsersFilter {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the users filter") @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override @Override
public UsersFilterType getType() { public UsersFilterType getType() {
return UsersFilterType.AFFECTED_TENANT_ADMINISTRATORS; return UsersFilterType.AFFECTED_TENANT_ADMINISTRATORS;

2
common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedUserFilter.java

@ -22,7 +22,7 @@ import lombok.Data;
@Data @Data
public class AffectedUserFilter implements UsersFilter { public class AffectedUserFilter implements UsersFilter {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the users filter") @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override @Override
public UsersFilterType getType() { public UsersFilterType getType() {
return UsersFilterType.AFFECTED_USER; return UsersFilterType.AFFECTED_USER;

2
common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AllUsersFilter.java

@ -22,7 +22,7 @@ import lombok.Data;
@Data @Data
public class AllUsersFilter implements UsersFilter { public class AllUsersFilter implements UsersFilter {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the users filter") @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override @Override
public UsersFilterType getType() { public UsersFilterType getType() {
return UsersFilterType.ALL_USERS; return UsersFilterType.ALL_USERS;

2
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 @NotNull
private UUID customerId; private UUID customerId;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the users filter") @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override @Override
public UsersFilterType getType() { public UsersFilterType getType() {
return UsersFilterType.CUSTOMER_USERS; return UsersFilterType.CUSTOMER_USERS;

2
common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/OriginatorEntityOwnerUsersFilter.java

@ -22,7 +22,7 @@ import lombok.Data;
@Data @Data
public class OriginatorEntityOwnerUsersFilter implements UsersFilter { public class OriginatorEntityOwnerUsersFilter implements UsersFilter {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the users filter") @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override @Override
public UsersFilterType getType() { public UsersFilterType getType() {
return UsersFilterType.ORIGINATOR_ENTITY_OWNER_USERS; return UsersFilterType.ORIGINATOR_ENTITY_OWNER_USERS;

2
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 @Valid
private UsersFilter usersFilter; private UsersFilter usersFilter;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the notification target") @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override @Override
public NotificationTargetType getType() { public NotificationTargetType getType() {
return NotificationTargetType.PLATFORM_USERS; return NotificationTargetType.PLATFORM_USERS;

2
common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/SystemAdministratorsFilter.java

@ -22,7 +22,7 @@ import lombok.Data;
@Data @Data
public class SystemAdministratorsFilter implements UsersFilter { public class SystemAdministratorsFilter implements UsersFilter {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the users filter") @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override @Override
public UsersFilterType getType() { public UsersFilterType getType() {
return UsersFilterType.SYSTEM_ADMINISTRATORS; return UsersFilterType.SYSTEM_ADMINISTRATORS;

2
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)) @ArraySchema(schema = @Schema(implementation = UUID.class))
private Set<UUID> tenantProfilesIds; private Set<UUID> tenantProfilesIds;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the users filter") @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override @Override
public UsersFilterType getType() { public UsersFilterType getType() {
return UsersFilterType.TENANT_ADMINISTRATORS; return UsersFilterType.TENANT_ADMINISTRATORS;

2
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 @NotEmpty
private List<UUID> usersIds; private List<UUID> usersIds;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the users filter") @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override @Override
public UsersFilterType getType() { public UsersFilterType getType() {
return UsersFilterType.USER_LIST; return UsersFilterType.USER_LIST;

2
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; package org.thingsboard.server.common.data.notification.targets.platform;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@Schema(enumAsRef = true)
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@Getter @Getter

3
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; package org.thingsboard.server.common.data.notification.targets.slack;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum SlackConversationType { public enum SlackConversationType {
DIRECT, DIRECT,
PUBLIC_CHANNEL, PUBLIC_CHANNEL,

14
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) @ToString(callSuper = true)
public class MicrosoftTeamsDeliveryMethodNotificationTemplate extends DeliveryMethodNotificationTemplate implements HasSubject { public class MicrosoftTeamsDeliveryMethodNotificationTemplate extends DeliveryMethodNotificationTemplate implements HasSubject {
@Schema( @Schema
description = "The header or title shown at the top of the Teams message card.",
example = "System Alert: High CPU Usage"
)
private String subject; private String subject;
@Schema( @Schema
description = "The hex color code for the accent bar on the left side of the Teams card.",
example = "0078D7"
)
private String themeColor; private String themeColor;
@Schema(description = "Configuration for an optional call-to-action button within the Teams message.") @Schema
private Button button; private Button button;
private final List<TemplatableValue> templatableValues = List.of( private final List<TemplatableValue> templatableValues = List.of(
@ -93,7 +87,7 @@ public class MicrosoftTeamsDeliveryMethodNotificationTemplate extends DeliveryMe
this.setEntityIdInState = other.setEntityIdInState; this.setEntityIdInState = other.setEntityIdInState;
} }
@Schema(enumAsRef = true) @Schema
public enum LinkType { public enum LinkType {
LINK, DASHBOARD LINK, DASHBOARD
} }

3
common/data/src/main/java/org/thingsboard/server/common/data/oauth2/MapperType.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data.oauth2; package org.thingsboard.server.common.data.oauth2;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum MapperType { public enum MapperType {
BASIC, CUSTOM, GITHUB, APPLE; BASIC, CUSTOM, GITHUB, APPLE;
} }

3
common/data/src/main/java/org/thingsboard/server/common/data/oauth2/PlatformType.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data.oauth2; package org.thingsboard.server.common.data.oauth2;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum PlatformType { public enum PlatformType {
WEB, ANDROID, IOS WEB, ANDROID, IOS
} }

3
common/data/src/main/java/org/thingsboard/server/common/data/oauth2/SchemeType.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data.oauth2; package org.thingsboard.server.common.data.oauth2;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum SchemeType { public enum SchemeType {
HTTP, HTTPS, MIXED; HTTP, HTTPS, MIXED;
} }

3
common/data/src/main/java/org/thingsboard/server/common/data/oauth2/TenantNameStrategyType.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data.oauth2; package org.thingsboard.server.common.data.oauth2;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum TenantNameStrategyType { public enum TenantNameStrategyType {
DOMAIN, EMAIL, CUSTOM; DOMAIN, EMAIL, CUSTOM;
} }

3
common/data/src/main/java/org/thingsboard/server/common/data/ota/ChecksumAlgorithm.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data.ota; package org.thingsboard.server.common.data.ota;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum ChecksumAlgorithm { public enum ChecksumAlgorithm {
MD5, MD5,
SHA256, SHA256,

2
common/data/src/main/java/org/thingsboard/server/common/data/ota/OtaPackageType.java

@ -15,10 +15,8 @@
*/ */
package org.thingsboard.server.common.data.ota; package org.thingsboard.server.common.data.ota;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter; import lombok.Getter;
@Schema(enumAsRef = true)
public enum OtaPackageType { public enum OtaPackageType {
FIRMWARE("fw"), SOFTWARE("sw"); FIRMWARE("fw"), SOFTWARE("sw");

3
common/data/src/main/java/org/thingsboard/server/common/data/ota/OtaPackageUpdateStatus.java

@ -15,9 +15,6 @@
*/ */
package org.thingsboard.server.common.data.ota; package org.thingsboard.server.common.data.ota;
import io.swagger.v3.oas.annotations.media.Schema;
@Schema(enumAsRef = true)
public enum OtaPackageUpdateStatus { public enum OtaPackageUpdateStatus {
QUEUED, INITIATED, DOWNLOADING, DOWNLOADED, VERIFIED, UPDATING, UPDATED, FAILED QUEUED, INITIATED, DOWNLOADING, DOWNLOADED, VERIFIED, UPDATING, UPDATED, FAILED
} }

2
common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleEvent.java

@ -15,14 +15,12 @@
*/ */
package org.thingsboard.server.common.data.plugin; package org.thingsboard.server.common.data.plugin;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import java.io.Serializable; import java.io.Serializable;
import java.util.Arrays; import java.util.Arrays;
@Schema(enumAsRef = true)
@RequiredArgsConstructor @RequiredArgsConstructor
public enum ComponentLifecycleEvent implements Serializable { public enum ComponentLifecycleEvent implements Serializable {

3
common/data/src/main/java/org/thingsboard/server/common/data/plugin/ComponentLifecycleState.java

@ -15,12 +15,9 @@
*/ */
package org.thingsboard.server.common.data.plugin; package org.thingsboard.server.common.data.plugin;
import io.swagger.v3.oas.annotations.media.Schema;
/** /**
* @author Andrew Shvayka * @author Andrew Shvayka
*/ */
@Schema(enumAsRef = true)
public enum ComponentLifecycleState { public enum ComponentLifecycleState {
ACTIVE, SUSPENDED ACTIVE, SUSPENDED
} }

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save