Browse Source

swagger annotation improvements

pull/14929/head
dashevchenko 3 months ago
parent
commit
992a4a8007
  1. 35
      application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
  2. 3
      application/src/main/java/org/thingsboard/server/controller/BaseController.java
  3. 2
      common/data/src/main/java/org/thingsboard/server/common/data/TbResource.java
  4. 1
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/AlarmCondition.java
  5. 1
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/DurationAlarmCondition.java
  6. 1
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/RepeatingAlarmCondition.java
  7. 1
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/SimpleAlarmCondition.java
  8. 1
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/AlarmConditionExpression.java
  9. 2
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/SimpleAlarmConditionExpression.java
  10. 2
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/TbelAlarmConditionExpression.java
  11. 1
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/predicate/BooleanFilterPredicate.java
  12. 1
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/predicate/ComplexFilterPredicate.java
  13. 1
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/predicate/KeyFilterPredicate.java
  14. 1
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/predicate/NoDataFilterPredicate.java
  15. 1
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/predicate/NumericFilterPredicate.java
  16. 1
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/predicate/StringFilterPredicate.java
  17. 1
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/schedule/AnyTimeSchedule.java
  18. 1
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/schedule/CustomTimeSchedule.java
  19. 1
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/schedule/SpecificTimeSchedule.java
  20. 1
      common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AlarmCalculatedFieldConfiguration.java
  21. 4
      common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CalculatedFieldConfiguration.java
  22. 1
      common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CfArgumentDynamicSourceConfiguration.java
  23. 1
      common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/Output.java
  24. 1
      common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/AggInput.java
  25. 1
      common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/RelatedEntitiesAggregationCalculatedFieldConfiguration.java
  26. 1
      common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/EntityAggregationCalculatedFieldConfiguration.java
  27. 1
      common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/AggInterval.java
  28. 1
      common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/geofencing/GeofencingCalculatedFieldConfiguration.java
  29. 1
      common/data/src/main/java/org/thingsboard/server/common/data/device/data/DeviceTransportConfiguration.java
  30. 1
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmConditionSpec.java
  31. 1
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmSchedule.java
  32. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AnyTimeSchedule.java
  33. 1
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CoapDeviceProfileTransportConfiguration.java
  34. 1
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CoapDeviceTypeConfiguration.java
  35. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CustomTimeSchedule.java
  36. 1
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileTransportConfiguration.java
  37. 1
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileConfiguration.java
  38. 1
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileProvisionConfiguration.java
  39. 1
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileTransportConfiguration.java
  40. 1
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/Lwm2mDeviceProfileTransportConfiguration.java
  41. 1
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/MqttDeviceProfileTransportConfiguration.java
  42. 1
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SnmpDeviceProfileTransportConfiguration.java
  43. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SpecificTimeSchedule.java
  44. 1
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/TransportPayloadTypeConfiguration.java
  45. 4
      common/data/src/main/java/org/thingsboard/server/common/data/exception/ThingsboardException.java
  46. 1
      common/data/src/main/java/org/thingsboard/server/common/data/job/DummyJobConfiguration.java
  47. 3
      common/data/src/main/java/org/thingsboard/server/common/data/job/DummyJobResult.java
  48. 1
      common/data/src/main/java/org/thingsboard/server/common/data/job/JobResult.java
  49. 1
      common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/MobilePage.java
  50. 1
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmAssignmentNotificationRuleTriggerConfig.java
  51. 1
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmCommentNotificationRuleTriggerConfig.java
  52. 1
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmNotificationRuleTriggerConfig.java
  53. 1
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/ApiUsageLimitNotificationRuleTriggerConfig.java
  54. 1
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/DeviceActivityNotificationRuleTriggerConfig.java
  55. 1
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeCommunicationFailureNotificationRuleTriggerConfig.java
  56. 2
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeConnectionNotificationRuleTriggerConfig.java
  57. 1
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EntitiesLimitNotificationRuleTriggerConfig.java
  58. 1
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EntityActionNotificationRuleTriggerConfig.java
  59. 1
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NewPlatformVersionNotificationRuleTriggerConfig.java
  60. 1
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/RateLimitsNotificationRuleTriggerConfig.java
  61. 1
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/ResourcesShortageNotificationRuleTriggerConfig.java
  62. 1
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig.java
  63. 1
      common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/TaskProcessingFailureNotificationRuleTriggerConfig.java
  64. 1
      common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/NotificationDeliveryMethodConfig.java
  65. 1
      common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/NotificationTargetConfig.java
  66. 1
      common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UsersFilter.java
  67. 1
      common/data/src/main/java/org/thingsboard/server/common/data/notification/template/DeliveryMethodNotificationTemplate.java
  68. 2
      common/data/src/main/java/org/thingsboard/server/common/data/query/ApiUsageStateFilter.java
  69. 2
      common/data/src/main/java/org/thingsboard/server/common/data/query/AssetSearchQueryFilter.java
  70. 2
      common/data/src/main/java/org/thingsboard/server/common/data/query/AssetTypeFilter.java
  71. 2
      common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceSearchQueryFilter.java
  72. 2
      common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceTypeFilter.java
  73. 2
      common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeSearchQueryFilter.java
  74. 2
      common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeTypeFilter.java
  75. 1
      common/data/src/main/java/org/thingsboard/server/common/data/query/EntityFilter.java
  76. 2
      common/data/src/main/java/org/thingsboard/server/common/data/query/EntityListFilter.java
  77. 2
      common/data/src/main/java/org/thingsboard/server/common/data/query/EntityNameFilter.java
  78. 2
      common/data/src/main/java/org/thingsboard/server/common/data/query/EntityTypeFilter.java
  79. 2
      common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewSearchQueryFilter.java
  80. 2
      common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewTypeFilter.java
  81. 1
      common/data/src/main/java/org/thingsboard/server/common/data/query/KeyFilterPredicate.java
  82. 2
      common/data/src/main/java/org/thingsboard/server/common/data/query/RelationsQueryFilter.java
  83. 2
      common/data/src/main/java/org/thingsboard/server/common/data/query/SingleEntityFilter.java
  84. 2
      common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelation.java
  85. 5
      common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java
  86. 1
      common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/TwoFaAccountConfig.java
  87. 4
      common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/TwoFaProviderConfig.java
  88. 1
      common/data/src/main/java/org/thingsboard/server/common/data/sms/config/AwsSnsSmsProviderConfiguration.java
  89. 1
      common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmppSmsProviderConfiguration.java
  90. 1
      common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmsProviderConfiguration.java
  91. 1
      common/data/src/main/java/org/thingsboard/server/common/data/sms/config/TwilioSmsProviderConfiguration.java
  92. 1
      common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
  93. 3
      common/transport/http/src/main/java/org/thingsboard/server/transport/http/DeviceApiController.java

35
application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java

@ -235,7 +235,6 @@ public class SwaggerConfiguration {
operation.responses(loginResponses);
operation.addTagsItem("Thingsboard");
var pathItem = new PathItem().post(operation);
openAPI.path(LOGIN_ENDPOINT, pathItem);
}
@ -259,7 +258,6 @@ public class SwaggerConfiguration {
operation.responses(loginResponses);
operation.addTagsItem("Thingsboard");
var pathItem = new PathItem().post(operation);
openAPI.path(REFRESH_TOKEN_ENDPOINT, pathItem);
}
@ -320,34 +318,6 @@ public class SwaggerConfiguration {
.addSchemas("ThingsboardErrorCode", errorCodeSchema);
}
private RouterOperationCustomizer routerOperationCustomizer(SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
return (routerOperation, handlerMethod) -> {
String[] pNames = localSpringDocParameterNameDiscoverer.getParameterNames(handlerMethod.getMethod());
String[] reflectionParametersNames = Arrays.stream(handlerMethod.getMethod().getParameters()).map(java.lang.reflect.Parameter::getName).toArray(String[]::new);
if (pNames == null || Arrays.stream(pNames).anyMatch(Objects::isNull)) {
pNames = reflectionParametersNames;
}
MethodParameter[] parameters = handlerMethod.getMethodParameters();
List<String> requestParams = new ArrayList<>();
for (var i = 0; i < parameters.length; i++) {
var methodParameter = parameters[i];
RequestParam requestParam = methodParameter.getParameterAnnotation(RequestParam.class);
if (requestParam != null) {
String pName = StringUtils.isNotBlank(requestParam.value()) ? requestParam.value() :
pNames[i];
if (StringUtils.isNotBlank(pName)) {
requestParams.add(pName);
}
}
}
if (!requestParams.isEmpty()) {
var path = routerOperation.getPath() + "{?" + String.join(",", requestParams) + "}";
routerOperation.setPath(path);
}
return routerOperation;
};
}
private OperationCustomizer operationCustomizer() {
return (operation, handlerMethod) -> {
if (StringUtils.isBlank(operation.getSummary())) {
@ -425,6 +395,11 @@ public class SwaggerConfiguration {
});
}
// Set JsonNode schema last so model scanning cannot overwrite it
openAPI.getComponents().addSchemas("JsonNode", new Schema<>()
.description("A value representing the any type (object or primitive)")
.example(JacksonUtil.newObjectNode()));
var sortedSchemas = new TreeMap<>(openAPI.getComponents().getSchemas());
openAPI.getComponents().setSchemas(new LinkedHashMap<>(sortedSchemas));
};

3
application/src/main/java/org/thingsboard/server/controller/BaseController.java

@ -224,9 +224,6 @@ import static org.thingsboard.server.controller.UserController.YOU_DON_T_HAVE_PE
import static org.thingsboard.server.dao.service.Validator.validateId;
@TbCoreComponent
@Tag(
name = "Thingsboard"
)
public abstract class BaseController {
protected static final String HOME_DASHBOARD_ID = "homeDashboardId";

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

@ -37,10 +37,8 @@ public class TbResource extends TbResourceInfo {
@Serial
private static final long serialVersionUID = 7379609705527272306L;
@JsonIgnore
private byte[] data;
@JsonIgnore
private byte[] preview;
public TbResource() {

1
common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/AlarmCondition.java

@ -76,7 +76,6 @@ public abstract class AlarmCondition {
return true;
}
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@JsonIgnore
public abstract AlarmConditionType getType();

1
common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/DurationAlarmCondition.java

@ -37,6 +37,7 @@ public class DurationAlarmCondition extends AlarmCondition {
@NotNull
private AlarmConditionValue<Long> value;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public AlarmConditionType getType() {
return AlarmConditionType.DURATION;

1
common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/RepeatingAlarmCondition.java

@ -32,6 +32,7 @@ public class RepeatingAlarmCondition extends AlarmCondition {
@NotNull
private AlarmConditionValue<Integer> count;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public AlarmConditionType getType() {
return AlarmConditionType.REPEATING;

1
common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/SimpleAlarmCondition.java

@ -20,6 +20,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
@Schema(name = "AlarmRuleSimpleCondition", allOf = AlarmCondition.class)
public class SimpleAlarmCondition extends AlarmCondition {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public AlarmConditionType getType() {
return AlarmConditionType.SIMPLE;

1
common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/AlarmConditionExpression.java

@ -38,7 +38,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
})
public interface AlarmConditionExpression {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@JsonIgnore
AlarmConditionExpressionType getType();

2
common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/SimpleAlarmConditionExpression.java

@ -15,6 +15,7 @@
*/
package org.thingsboard.server.common.data.alarm.rule.condition.expression;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotEmpty;
import lombok.AllArgsConstructor;
@ -34,6 +35,7 @@ public class SimpleAlarmConditionExpression implements AlarmConditionExpression
private List<AlarmConditionFilter> filters;
private ComplexOperation operation;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public AlarmConditionExpressionType getType() {
return AlarmConditionExpressionType.SIMPLE;

2
common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/TbelAlarmConditionExpression.java

@ -15,6 +15,7 @@
*/
package org.thingsboard.server.common.data.alarm.rule.condition.expression;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
import lombok.Data;
@ -28,6 +29,7 @@ public class TbelAlarmConditionExpression implements AlarmConditionExpression {
@NotBlank
private String expression;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public AlarmConditionExpressionType getType() {
return AlarmConditionExpressionType.TBEL;

1
common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/predicate/BooleanFilterPredicate.java

@ -31,6 +31,7 @@ public class BooleanFilterPredicate implements SimpleKeyFilterPredicate<Boolean>
@NotNull
private AlarmConditionValue<Boolean> value;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, ref = "#/components/schemas/AlarmRuleFilterPredicateType")
@Override
public FilterPredicateType getType() {
return FilterPredicateType.BOOLEAN;

1
common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/predicate/ComplexFilterPredicate.java

@ -30,6 +30,7 @@ public class ComplexFilterPredicate implements KeyFilterPredicate {
@ArraySchema(schema = @Schema(ref = "#/components/schemas/AlarmRuleKeyFilterPredicate"))
private List<KeyFilterPredicate> predicates;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, ref = "#/components/schemas/AlarmRuleFilterPredicateType")
@Override
public FilterPredicateType getType() {
return FilterPredicateType.COMPLEX;

1
common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/predicate/KeyFilterPredicate.java

@ -46,7 +46,6 @@ import java.io.Serializable;
})
public interface KeyFilterPredicate extends Serializable {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, ref = "#/components/schemas/AlarmRuleFilterPredicateType")
@JsonIgnore
FilterPredicateType getType();

1
common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/predicate/NoDataFilterPredicate.java

@ -37,6 +37,7 @@ public class NoDataFilterPredicate implements KeyFilterPredicate {
@NotNull
private AlarmConditionValue<Long> duration;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, ref = "#/components/schemas/AlarmRuleFilterPredicateType")
@Override
public FilterPredicateType getType() {
return FilterPredicateType.NO_DATA;

1
common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/predicate/NumericFilterPredicate.java

@ -35,6 +35,7 @@ public class NumericFilterPredicate implements SimpleKeyFilterPredicate<Double>
@NotNull
private AlarmConditionValue<Double> value;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, ref = "#/components/schemas/AlarmRuleFilterPredicateType")
@Override
public FilterPredicateType getType() {
return FilterPredicateType.NUMERIC;

1
common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/predicate/StringFilterPredicate.java

@ -32,6 +32,7 @@ public class StringFilterPredicate implements SimpleKeyFilterPredicate<String> {
private AlarmConditionValue<String> value;
private boolean ignoreCase;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, ref = "#/components/schemas/AlarmRuleFilterPredicateType")
@Override
public FilterPredicateType getType() {
return FilterPredicateType.STRING;

1
common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/schedule/AnyTimeSchedule.java

@ -20,6 +20,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
@Schema(name = "AlarmRuleAnyTimeSchedule", allOf = AlarmSchedule.class)
public class AnyTimeSchedule implements AlarmSchedule {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public AlarmScheduleType getType() {
return AlarmScheduleType.ANY_TIME;

1
common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/schedule/CustomTimeSchedule.java

@ -28,6 +28,7 @@ public class CustomTimeSchedule implements AlarmSchedule {
private String timezone;
private List<CustomTimeScheduleItem> items;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public AlarmScheduleType getType() {
return AlarmScheduleType.CUSTOM;

1
common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/schedule/SpecificTimeSchedule.java

@ -30,6 +30,7 @@ public class SpecificTimeSchedule implements AlarmSchedule {
private long startsOn;
private long endsOn;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public AlarmScheduleType getType() {
return AlarmScheduleType.SPECIFIC_TIME;

1
common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AlarmCalculatedFieldConfiguration.java

@ -53,6 +53,7 @@ public class AlarmCalculatedFieldConfiguration implements ArgumentsBasedCalculat
private boolean propagateToTenant;
private List<String> propagateRelationTypes;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public CalculatedFieldType getType() {
return CalculatedFieldType.ALARM;

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

@ -65,10 +65,6 @@ import java.util.stream.Collectors;
@JsonIgnoreProperties(ignoreUnknown = true)
public interface CalculatedFieldConfiguration {
@Schema(
description = "Type of calculated field configuration",
requiredMode = Schema.RequiredMode.REQUIRED
)
@JsonIgnore
CalculatedFieldType getType();

1
common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CfArgumentDynamicSourceConfiguration.java

@ -41,7 +41,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
@JsonIgnoreProperties(ignoreUnknown = true)
public interface CfArgumentDynamicSourceConfiguration {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@JsonIgnore
CFArgumentDynamicSourceType getType();

1
common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/Output.java

@ -46,7 +46,6 @@ import java.util.Objects;
@JsonIgnoreProperties(ignoreUnknown = true)
public interface Output {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@JsonIgnore
OutputType getType();

1
common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/AggInput.java

@ -41,7 +41,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
@JsonIgnoreProperties(ignoreUnknown = true)
public interface AggInput {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@JsonIgnore
String getType();

1
common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/RelatedEntitiesAggregationCalculatedFieldConfiguration.java

@ -51,6 +51,7 @@ public class RelatedEntitiesAggregationCalculatedFieldConfiguration implements A
private Integer scheduledUpdateInterval;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public CalculatedFieldType getType() {
return CalculatedFieldType.RELATED_ENTITIES_AGGREGATION;

1
common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/EntityAggregationCalculatedFieldConfiguration.java

@ -52,6 +52,7 @@ public class EntityAggregationCalculatedFieldConfiguration implements ArgumentsB
@NotNull
private Output output;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public CalculatedFieldType getType() {
return CalculatedFieldType.ENTITY_AGGREGATION;

1
common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/AggInterval.java

@ -56,7 +56,6 @@ import java.time.ZonedDateTime;
@JsonIgnoreProperties(ignoreUnknown = true)
public interface AggInterval {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@JsonIgnore
AggIntervalType getType();

1
common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/geofencing/GeofencingCalculatedFieldConfiguration.java

@ -63,6 +63,7 @@ public class GeofencingCalculatedFieldConfiguration implements ArgumentsBasedCal
return output.getType() == OutputType.TIME_SERIES;
}
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public CalculatedFieldType getType() {
return CalculatedFieldType.GEOFENCING;

1
common/data/src/main/java/org/thingsboard/server/common/data/device/data/DeviceTransportConfiguration.java

@ -49,7 +49,6 @@ import java.io.Serializable;
@JsonSubTypes.Type(value = SnmpDeviceTransportConfiguration.class, name = "SNMP")})
public interface DeviceTransportConfiguration extends Serializable {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@JsonIgnore
DeviceTransportType getType();

1
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmConditionSpec.java

@ -45,7 +45,6 @@ import java.io.Serializable;
@Deprecated
public interface AlarmConditionSpec extends Serializable {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@JsonIgnore
AlarmConditionSpecType getType();

1
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmSchedule.java

@ -45,7 +45,6 @@ import java.io.Serializable;
@Deprecated
public interface AlarmSchedule extends Serializable {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the alarm schedule")
AlarmScheduleType getType();
DynamicValue<String> getDynamicValue();

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

@ -15,11 +15,13 @@
*/
package org.thingsboard.server.common.data.device.profile;
import io.swagger.v3.oas.annotations.media.Schema;
import org.thingsboard.server.common.data.query.DynamicValue;
@Deprecated
public class AnyTimeSchedule implements AlarmSchedule {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public AlarmScheduleType getType() {
return AlarmScheduleType.ANY_TIME;

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

@ -29,6 +29,7 @@ public class CoapDeviceProfileTransportConfiguration implements DeviceProfileTra
@Schema
private PowerSavingConfiguration clientSettings;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public DeviceTransportType getType() {
return DeviceTransportType.COAP;

1
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CoapDeviceTypeConfiguration.java

@ -43,7 +43,6 @@ import java.io.Serializable;
@JsonSubTypes.Type(value = EfentoCoapDeviceTypeConfiguration.class, name = "EFENTO")})
public interface CoapDeviceTypeConfiguration extends Serializable {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@JsonIgnore
CoapDeviceType getCoapDeviceType();

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

@ -15,6 +15,7 @@
*/
package org.thingsboard.server.common.data.device.profile;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.thingsboard.server.common.data.query.DynamicValue;
@ -29,6 +30,7 @@ public class CustomTimeSchedule implements AlarmSchedule {
private DynamicValue<String> dynamicValue;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public AlarmScheduleType getType() {
return AlarmScheduleType.CUSTOM;

1
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileTransportConfiguration.java

@ -23,6 +23,7 @@ import org.thingsboard.server.common.data.DeviceTransportType;
@Data
public class DefaultDeviceProfileTransportConfiguration implements DeviceProfileTransportConfiguration {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public DeviceTransportType getType() {
return DeviceTransportType.DEFAULT;

1
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileConfiguration.java

@ -41,7 +41,6 @@ import java.io.Serializable;
@JsonSubTypes.Type(value = DefaultDeviceProfileConfiguration.class, name = "DEFAULT")})
public interface DeviceProfileConfiguration extends Serializable {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@JsonIgnore
DeviceProfileType getType();

1
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileProvisionConfiguration.java

@ -50,7 +50,6 @@ public interface DeviceProfileProvisionConfiguration extends Serializable {
@Schema(description = "Provision device secret", example = "secret123")
String getProvisionDeviceSecret();
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Device profile provision type")
@JsonIgnore
DeviceProfileProvisionType getType();

1
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileTransportConfiguration.java

@ -50,7 +50,6 @@ import java.io.Serializable;
})
public interface DeviceProfileTransportConfiguration extends Serializable {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@JsonIgnore
DeviceTransportType getType();

1
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/Lwm2mDeviceProfileTransportConfiguration.java

@ -49,6 +49,7 @@ public class Lwm2mDeviceProfileTransportConfiguration implements DeviceProfileTr
updateDefault();
}
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public DeviceTransportType getType() {
return DeviceTransportType.LWM2M;

1
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/MqttDeviceProfileTransportConfiguration.java

@ -48,6 +48,7 @@ public class MqttDeviceProfileTransportConfiguration implements DeviceProfileTra
@Schema
private boolean sendAckOnValidationException;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public DeviceTransportType getType() {
return DeviceTransportType.MQTT;

1
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SnmpDeviceProfileTransportConfiguration.java

@ -32,6 +32,7 @@ public class SnmpDeviceProfileTransportConfiguration implements DeviceProfileTra
@ArraySchema(schema = @Schema(implementation = SnmpCommunicationConfig.class))
private List<SnmpCommunicationConfig> communicationConfigs;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public DeviceTransportType getType() {
return DeviceTransportType.SNMP;

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

@ -15,6 +15,7 @@
*/
package org.thingsboard.server.common.data.device.profile;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.thingsboard.server.common.data.query.DynamicValue;
@ -31,6 +32,7 @@ public class SpecificTimeSchedule implements AlarmSchedule {
private DynamicValue<String> dynamicValue;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public AlarmScheduleType getType() {
return AlarmScheduleType.SPECIFIC_TIME;

1
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/TransportPayloadTypeConfiguration.java

@ -43,7 +43,6 @@ import java.io.Serializable;
@JsonSubTypes.Type(value = ProtoTransportPayloadConfiguration.class, name = "PROTOBUF")})
public interface TransportPayloadTypeConfiguration extends Serializable {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@JsonIgnore
TransportPayloadType getTransportPayloadType();

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

@ -15,14 +15,10 @@
*/
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() {

1
common/data/src/main/java/org/thingsboard/server/common/data/job/DummyJobConfiguration.java

@ -45,6 +45,7 @@ public class DummyJobConfiguration extends JobConfiguration {
private String generalError;
private int submittedTasksBeforeGeneralError;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public JobType getType() {
return JobType.DUMMY;

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

@ -15,8 +15,11 @@
*/
package org.thingsboard.server.common.data.job;
import io.swagger.v3.oas.annotations.media.Schema;
public class DummyJobResult extends JobResult {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public JobType getJobType() {
return JobType.DUMMY;

1
common/data/src/main/java/org/thingsboard/server/common/data/job/JobResult.java

@ -91,7 +91,6 @@ public abstract class JobResult implements Serializable {
}
}
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@JsonIgnore
public abstract JobType getJobType();

1
common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/MobilePage.java

@ -48,7 +48,6 @@ import java.io.Serializable;
})
public interface MobilePage extends Serializable {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@JsonView(Views.Private.class)
MobilePageType getType();

1
common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmAssignmentNotificationRuleTriggerConfig.java

@ -49,7 +49,6 @@ public class AlarmAssignmentNotificationRuleTriggerConfig implements Notificatio
private Set<Action> notifyOn;
@Override
@Schema(description = "Type of the notification rule trigger")
public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.ALARM_ASSIGNMENT;
}

1
common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmCommentNotificationRuleTriggerConfig.java

@ -49,7 +49,6 @@ public class AlarmCommentNotificationRuleTriggerConfig implements NotificationRu
private boolean notifyOnCommentUpdate;
@Override
@Schema(description = "Type of the notification rule trigger")
public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.ALARM_COMMENT;
}

1
common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/AlarmNotificationRuleTriggerConfig.java

@ -50,7 +50,6 @@ public class AlarmNotificationRuleTriggerConfig implements NotificationRuleTrigg
private ClearRule clearRule;
@Override
@Schema
public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.ALARM;
}

1
common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/ApiUsageLimitNotificationRuleTriggerConfig.java

@ -39,7 +39,6 @@ public class ApiUsageLimitNotificationRuleTriggerConfig implements NotificationR
private Set<ApiUsageStateValue> notifyOn;
@Override
@Schema
public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.API_USAGE_LIMIT;
}

1
common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/DeviceActivityNotificationRuleTriggerConfig.java

@ -42,7 +42,6 @@ public class DeviceActivityNotificationRuleTriggerConfig implements Notification
private Set<DeviceEvent> notifyOn;
@Override
@Schema
public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.DEVICE_ACTIVITY;
}

1
common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeCommunicationFailureNotificationRuleTriggerConfig.java

@ -36,7 +36,6 @@ public class EdgeCommunicationFailureNotificationRuleTriggerConfig implements No
private Set<UUID> edges; // if empty - all edges
@Override
@Schema
public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.EDGE_COMMUNICATION_FAILURE;
}

2
common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EdgeConnectionNotificationRuleTriggerConfig.java

@ -38,12 +38,10 @@ public class EdgeConnectionNotificationRuleTriggerConfig implements Notification
private Set<EdgeConnectivityEvent> notifyOn;
@Override
@Schema
public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.EDGE_CONNECTION;
}
@Schema
public enum EdgeConnectivityEvent {
CONNECTED, DISCONNECTED
}

1
common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EntitiesLimitNotificationRuleTriggerConfig.java

@ -39,7 +39,6 @@ public class EntitiesLimitNotificationRuleTriggerConfig implements NotificationR
private float threshold; // in percents,
@Override
@Schema
public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.ENTITIES_LIMIT;
}

1
common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/EntityActionNotificationRuleTriggerConfig.java

@ -39,7 +39,6 @@ public class EntityActionNotificationRuleTriggerConfig implements NotificationRu
private boolean deleted;
@Override
@Schema
public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.ENTITY_ACTION;
}

1
common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NewPlatformVersionNotificationRuleTriggerConfig.java

@ -23,7 +23,6 @@ import lombok.Data;
public class NewPlatformVersionNotificationRuleTriggerConfig implements NotificationRuleTriggerConfig {
@Override
@Schema
public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.NEW_PLATFORM_VERSION;
}

1
common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/RateLimitsNotificationRuleTriggerConfig.java

@ -37,7 +37,6 @@ public class RateLimitsNotificationRuleTriggerConfig implements NotificationRule
private Set<LimitedApi> apis;
@Override
@Schema
public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.RATE_LIMITS;
}

1
common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/ResourcesShortageNotificationRuleTriggerConfig.java

@ -42,7 +42,6 @@ public class ResourcesShortageNotificationRuleTriggerConfig implements Notificat
private float storageThreshold; // in percents
@Override
@Schema
public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.RESOURCES_SHORTAGE;
}

1
common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig.java

@ -45,7 +45,6 @@ public class RuleEngineComponentLifecycleEventNotificationRuleTriggerConfig impl
private boolean onlyRuleNodeLifecycleFailures;
@Override
@Schema
public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.RULE_ENGINE_COMPONENT_LIFECYCLE_EVENT;
}

1
common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/TaskProcessingFailureNotificationRuleTriggerConfig.java

@ -25,7 +25,6 @@ import lombok.Data;
public class TaskProcessingFailureNotificationRuleTriggerConfig implements NotificationRuleTriggerConfig {
@Override
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
public NotificationRuleTriggerType getTriggerType() {
return NotificationRuleTriggerType.TASK_PROCESSING_FAILURE;
}

1
common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/NotificationDeliveryMethodConfig.java

@ -41,7 +41,6 @@ import java.io.Serializable;
})
public interface NotificationDeliveryMethodConfig extends Serializable {
@Schema(description = "Notification delivery method", requiredMode = Schema.RequiredMode.REQUIRED)
@JsonIgnore
NotificationDeliveryMethod getMethod();

1
common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/NotificationTargetConfig.java

@ -50,7 +50,6 @@ public abstract class NotificationTargetConfig {
@Length(max = 500, message = "cannot be longer than 500 chars")
private String description;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the notification target")
@JsonIgnore
public abstract NotificationTargetType getType();

1
common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UsersFilter.java

@ -50,7 +50,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
})
public interface UsersFilter {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Type of the users filter")
@JsonIgnore
UsersFilterType getType();

1
common/data/src/main/java/org/thingsboard/server/common/data/notification/template/DeliveryMethodNotificationTemplate.java

@ -64,7 +64,6 @@ public abstract class DeliveryMethodNotificationTemplate {
this.body = other.body;
}
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@JsonIgnore
public abstract NotificationDeliveryMethod getMethod();

2
common/data/src/main/java/org/thingsboard/server/common/data/query/ApiUsageStateFilter.java

@ -15,6 +15,7 @@
*/
package org.thingsboard.server.common.data.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.thingsboard.server.common.data.id.CustomerId;
@ -23,6 +24,7 @@ public class ApiUsageStateFilter implements EntityFilter {
private CustomerId customerId;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public EntityFilterType getType() {
return EntityFilterType.API_USAGE_STATE;

2
common/data/src/main/java/org/thingsboard/server/common/data/query/AssetSearchQueryFilter.java

@ -15,6 +15,7 @@
*/
package org.thingsboard.server.common.data.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@ -26,6 +27,7 @@ import java.util.List;
@ToString(callSuper = true)
public class AssetSearchQueryFilter extends EntitySearchQueryFilter {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public EntityFilterType getType() {
return EntityFilterType.ASSET_SEARCH_QUERY;

2
common/data/src/main/java/org/thingsboard/server/common/data/query/AssetTypeFilter.java

@ -15,6 +15,7 @@
*/
package org.thingsboard.server.common.data.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@ -44,6 +45,7 @@ public class AssetTypeFilter implements EntityFilter {
@Getter
private String assetNameFilter;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public EntityFilterType getType() {
return EntityFilterType.ASSET_TYPE;

2
common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceSearchQueryFilter.java

@ -15,6 +15,7 @@
*/
package org.thingsboard.server.common.data.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@ -26,6 +27,7 @@ import java.util.List;
@ToString(callSuper = true)
public class DeviceSearchQueryFilter extends EntitySearchQueryFilter {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public EntityFilterType getType() {
return EntityFilterType.DEVICE_SEARCH_QUERY;

2
common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceTypeFilter.java

@ -15,6 +15,7 @@
*/
package org.thingsboard.server.common.data.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
@ -53,6 +54,7 @@ public class DeviceTypeFilter implements EntityFilter {
this.deviceNameFilter = deviceNameFilter;
}
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public EntityFilterType getType() {
return EntityFilterType.DEVICE_TYPE;

2
common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeSearchQueryFilter.java

@ -15,6 +15,7 @@
*/
package org.thingsboard.server.common.data.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@ -26,6 +27,7 @@ import java.util.List;
@ToString(callSuper = true)
public class EdgeSearchQueryFilter extends EntitySearchQueryFilter {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public EntityFilterType getType() {
return EntityFilterType.EDGE_SEARCH_QUERY;

2
common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeTypeFilter.java

@ -15,6 +15,7 @@
*/
package org.thingsboard.server.common.data.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@ -44,6 +45,7 @@ public class EdgeTypeFilter implements EntityFilter {
@Getter
private String edgeNameFilter;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public EntityFilterType getType() {
return EntityFilterType.EDGE_TYPE;

1
common/data/src/main/java/org/thingsboard/server/common/data/query/EntityFilter.java

@ -71,7 +71,6 @@ import static org.thingsboard.server.common.data.query.AliasEntityId.resolveAlia
public interface EntityFilter {
@JsonIgnore
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
EntityFilterType getType();
static void resolveEntityFilter(EntityFilter filter, TenantId tenantId, UserId userId, EntityId userOwnerId) {

2
common/data/src/main/java/org/thingsboard/server/common/data/query/EntityListFilter.java

@ -15,6 +15,7 @@
*/
package org.thingsboard.server.common.data.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.thingsboard.server.common.data.EntityType;
@ -22,6 +23,7 @@ import java.util.List;
@Data
public class EntityListFilter implements EntityFilter {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public EntityFilterType getType() {
return EntityFilterType.ENTITY_LIST;

2
common/data/src/main/java/org/thingsboard/server/common/data/query/EntityNameFilter.java

@ -15,11 +15,13 @@
*/
package org.thingsboard.server.common.data.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.thingsboard.server.common.data.EntityType;
@Data
public class EntityNameFilter implements EntityFilter {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public EntityFilterType getType() {
return EntityFilterType.ENTITY_NAME;

2
common/data/src/main/java/org/thingsboard/server/common/data/query/EntityTypeFilter.java

@ -15,11 +15,13 @@
*/
package org.thingsboard.server.common.data.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.thingsboard.server.common.data.EntityType;
@Data
public class EntityTypeFilter implements EntityFilter {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public EntityFilterType getType() {
return EntityFilterType.ENTITY_TYPE;

2
common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewSearchQueryFilter.java

@ -15,6 +15,7 @@
*/
package org.thingsboard.server.common.data.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@ -26,6 +27,7 @@ import java.util.List;
@ToString(callSuper = true)
public class EntityViewSearchQueryFilter extends EntitySearchQueryFilter {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public EntityFilterType getType() {
return EntityFilterType.ENTITY_VIEW_SEARCH_QUERY;

2
common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewTypeFilter.java

@ -15,6 +15,7 @@
*/
package org.thingsboard.server.common.data.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@ -44,6 +45,7 @@ public class EntityViewTypeFilter implements EntityFilter {
@Getter
private String entityViewNameFilter;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public EntityFilterType getType() {
return EntityFilterType.ENTITY_VIEW_TYPE;

1
common/data/src/main/java/org/thingsboard/server/common/data/query/KeyFilterPredicate.java

@ -45,7 +45,6 @@ import java.io.Serializable;
public interface KeyFilterPredicate extends Serializable {
@JsonIgnore
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
FilterPredicateType getType();
}

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

@ -15,6 +15,7 @@
*/
package org.thingsboard.server.common.data.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.common.data.id.EntityId;
@ -27,6 +28,7 @@ import java.util.Set;
@Data
public class RelationsQueryFilter implements EntityFilter {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public EntityFilterType getType() {
return EntityFilterType.RELATIONS_QUERY;

2
common/data/src/main/java/org/thingsboard/server/common/data/query/SingleEntityFilter.java

@ -15,11 +15,13 @@
*/
package org.thingsboard.server.common.data.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.thingsboard.server.common.data.id.EntityId;
@Data
public class SingleEntityFilter implements EntityFilter {
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public EntityFilterType getType() {
return EntityFilterType.SINGLE_ENTITY;

2
common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelation.java

@ -103,7 +103,7 @@ public class EntityRelation implements HasVersion, Serializable, EdqsObject {
this.version = entityRelation.getVersion();
}
@Schema(description = "Additional parameters of the relation")
@Schema(description = "Additional parameters of the relation", implementation = JsonNode.class)
public JsonNode getAdditionalInfo() {
return BaseDataWithAdditionalInfo.getJson(() -> additionalInfo, () -> additionalInfoBytes);
}

5
common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java

@ -61,7 +61,7 @@ public class RuleNode extends BaseDataWithAdditionalInfo<RuleNodeId> implements
private String queueName;
@Schema(description = "Version of rule node configuration. ", example = "0")
private int configurationVersion;
@Schema(description = "JSON with the rule node configuration. Structure depends on the rule node implementation.")
@Schema(description = "JSON with the rule node configuration. Structure depends on the rule node implementation.", implementation = JsonNode.class)
private JsonNode configuration;
private RuleNodeId externalId;
@ -105,8 +105,7 @@ public class RuleNode extends BaseDataWithAdditionalInfo<RuleNodeId> implements
return super.getCreatedTime();
}
@Schema(description = "Additional parameters of the rule node. Contains 'layoutX' and 'layoutY' properties for visualization.")
@Override
@Schema(description = "Additional parameters of the rule node. Contains 'layoutX' and 'layoutY' properties for visualization.", implementation = JsonNode.class) @Override
public JsonNode getAdditionalInfo() {
return super.getAdditionalInfo();
}

1
common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/TwoFaAccountConfig.java

@ -55,7 +55,6 @@ public abstract class TwoFaAccountConfig implements Serializable {
@JsonIgnore
protected transient boolean serializeHiddenFields;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "Two-Factor Authentication provider type")
@JsonIgnore
public abstract TwoFaProviderType getProviderType();

4
common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/TwoFaProviderConfig.java

@ -45,10 +45,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
})
public interface TwoFaProviderConfig {
@Schema(
description = "Type of two-factor authentication provider",
requiredMode = Schema.RequiredMode.REQUIRED
)
@JsonIgnore
TwoFaProviderType getProviderType();

1
common/data/src/main/java/org/thingsboard/server/common/data/sms/config/AwsSnsSmsProviderConfiguration.java

@ -29,6 +29,7 @@ public class AwsSnsSmsProviderConfiguration implements SmsProviderConfiguration
@Schema(description = "The AWS region.")
private String region;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public SmsProviderType getType() {
return SmsProviderType.AWS_SNS;

1
common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmppSmsProviderConfiguration.java

@ -107,6 +107,7 @@ public class SmppSmsProviderConfiguration implements SmsProviderConfiguration {
"14 - Korean Graphic Character Set (KS C 5601/KS X 1001)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Byte codingScheme;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public SmsProviderType getType() {
return SmsProviderType.SMPP;

1
common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmsProviderConfiguration.java

@ -44,7 +44,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
public interface SmsProviderConfiguration {
@JsonIgnore
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
SmsProviderType getType();
}

1
common/data/src/main/java/org/thingsboard/server/common/data/sms/config/TwilioSmsProviderConfiguration.java

@ -29,6 +29,7 @@ public class TwilioSmsProviderConfiguration implements SmsProviderConfiguration
@Schema(description = "The number/id of a sender.")
private String numberFrom;
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public SmsProviderType getType() {
return SmsProviderType.TWILIO;

1
common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java

@ -250,6 +250,7 @@ public class DefaultTenantProfileConfiguration implements TenantProfileConfigura
};
}
@Schema(requiredMode = Schema.RequiredMode.REQUIRED)
@Override
public TenantProfileType getType() {
return TenantProfileType.DEFAULT;

3
common/transport/http/src/main/java/org/thingsboard/server/transport/http/DeviceApiController.java

@ -87,9 +87,6 @@ import java.util.function.Consumer;
@ConditionalOnExpression("'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.http.enabled}'=='true')")
@RequestMapping("/api/v1")
@Slf4j
@Tag(
name = "Thingsboard"
)
public class DeviceApiController implements TbTransportService {
private static final String MARKDOWN_CODE_BLOCK_START = "\n\n```json\n";

Loading…
Cancel
Save