diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/DurationAlarmCondition.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/DurationAlarmCondition.java
index beae9bffbf..48ecebe8f6 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/DurationAlarmCondition.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/DurationAlarmCondition.java
@@ -37,7 +37,6 @@ public class DurationAlarmCondition extends AlarmCondition {
     @NotNull
     private AlarmConditionValue<Long> value;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public AlarmConditionType getType() {
         return AlarmConditionType.DURATION;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/RepeatingAlarmCondition.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/RepeatingAlarmCondition.java
index 95434eafa5..dcacfcd475 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/RepeatingAlarmCondition.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/RepeatingAlarmCondition.java
@@ -32,7 +32,6 @@ public class RepeatingAlarmCondition extends AlarmCondition {
     @NotNull
     private AlarmConditionValue<Integer> count;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public AlarmConditionType getType() {
         return AlarmConditionType.REPEATING;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/SimpleAlarmCondition.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/SimpleAlarmCondition.java
index f902e159f0..d27a1301e8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/SimpleAlarmCondition.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/SimpleAlarmCondition.java
@@ -20,7 +20,6 @@ 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;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/SimpleAlarmConditionExpression.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/SimpleAlarmConditionExpression.java
index e11f5d9a7f..390bbb3230 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/SimpleAlarmConditionExpression.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/SimpleAlarmConditionExpression.java
@@ -35,7 +35,6 @@ public class SimpleAlarmConditionExpression implements AlarmConditionExpression
     private List<AlarmConditionFilter> filters;
     private ComplexOperation operation;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public AlarmConditionExpressionType getType() {
         return AlarmConditionExpressionType.SIMPLE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/TbelAlarmConditionExpression.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/TbelAlarmConditionExpression.java
index 018e276e5a..e7a24dff72 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/TbelAlarmConditionExpression.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/expression/TbelAlarmConditionExpression.java
@@ -15,7 +15,6 @@
  */
 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;
@@ -29,7 +28,6 @@ public class TbelAlarmConditionExpression implements AlarmConditionExpression {
     @NotBlank
     private String expression;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public AlarmConditionExpressionType getType() {
         return AlarmConditionExpressionType.TBEL;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/schedule/AnyTimeSchedule.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/schedule/AnyTimeSchedule.java
index 6ea07719f8..5050f83d59 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/schedule/AnyTimeSchedule.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/schedule/AnyTimeSchedule.java
@@ -20,7 +20,6 @@ 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;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/schedule/CustomTimeSchedule.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/schedule/CustomTimeSchedule.java
index 807a2f98ef..4111dc2cfd 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/schedule/CustomTimeSchedule.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/schedule/CustomTimeSchedule.java
@@ -15,9 +15,8 @@
  */
 package org.thingsboard.server.common.data.alarm.rule.condition.schedule;
 
-import lombok.Data;
-
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 
 import java.util.List;
 
@@ -28,7 +27,6 @@ public class CustomTimeSchedule implements AlarmSchedule {
     private String timezone;
     private List<CustomTimeScheduleItem> items;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public AlarmScheduleType getType() {
         return AlarmScheduleType.CUSTOM;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/schedule/SpecificTimeSchedule.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/schedule/SpecificTimeSchedule.java
index 029aa06490..9a7fad2e73 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/schedule/SpecificTimeSchedule.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/rule/condition/schedule/SpecificTimeSchedule.java
@@ -15,9 +15,8 @@
  */
 package org.thingsboard.server.common.data.alarm.rule.condition.schedule;
 
-import lombok.Data;
-
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 
 import java.util.Set;
 
@@ -30,7 +29,6 @@ public class SpecificTimeSchedule implements AlarmSchedule {
     private long startsOn;
     private long endsOn;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public AlarmScheduleType getType() {
         return AlarmScheduleType.SPECIFIC_TIME;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AlarmCalculatedFieldConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AlarmCalculatedFieldConfiguration.java
index d473e33245..bababd453d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AlarmCalculatedFieldConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AlarmCalculatedFieldConfiguration.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.common.data.cf.configuration;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
@@ -25,8 +26,6 @@ import org.thingsboard.server.common.data.alarm.rule.AlarmRule;
 import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 import org.thingsboard.server.common.data.util.CollectionsUtil;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -53,7 +52,6 @@ public class AlarmCalculatedFieldConfiguration implements ArgumentsBasedCalculat
     private boolean propagateToTenant;
     private List<String> propagateRelationTypes;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public CalculatedFieldType getType() {
         return CalculatedFieldType.ALARM;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AttributesImmediateOutputStrategy.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AttributesImmediateOutputStrategy.java
index 51942b3ed1..4fbac188bd 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AttributesImmediateOutputStrategy.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AttributesImmediateOutputStrategy.java
@@ -33,7 +33,6 @@ public class AttributesImmediateOutputStrategy implements AttributesOutputStrate
     private boolean sendWsUpdate;
     private boolean processCfs;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public OutputStrategyType getType() {
         return OutputStrategyType.IMMEDIATE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AttributesOutput.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AttributesOutput.java
index 8b1e20387d..e672c90ed0 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AttributesOutput.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AttributesOutput.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.common.data.cf.configuration;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.thingsboard.server.common.data.AttributeScope;
 
@@ -32,7 +31,6 @@ public class AttributesOutput implements Output {
         this.strategy = new AttributesRuleChainOutputStrategy();
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public OutputType getType() {
         return OutputType.ATTRIBUTES;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AttributesRuleChainOutputStrategy.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AttributesRuleChainOutputStrategy.java
index 7fc8b00d47..935d97fabc 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AttributesRuleChainOutputStrategy.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/AttributesRuleChainOutputStrategy.java
@@ -24,7 +24,6 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class AttributesRuleChainOutputStrategy implements AttributesOutputStrategy {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public OutputStrategyType getType() {
         return OutputStrategyType.RULE_CHAIN;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CurrentOwnerDynamicSourceConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CurrentOwnerDynamicSourceConfiguration.java
index c60c5d98c4..61efa11557 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CurrentOwnerDynamicSourceConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CurrentOwnerDynamicSourceConfiguration.java
@@ -15,13 +15,11 @@
  */
 package org.thingsboard.server.common.data.cf.configuration;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Data
 public class CurrentOwnerDynamicSourceConfiguration implements CfArgumentDynamicSourceConfiguration {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public CFArgumentDynamicSourceType getType() {
         return CFArgumentDynamicSourceType.CURRENT_OWNER;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/PropagationCalculatedFieldConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/PropagationCalculatedFieldConfiguration.java
index 30b79c504f..2acb9b092c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/PropagationCalculatedFieldConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/PropagationCalculatedFieldConfiguration.java
@@ -46,7 +46,6 @@ public class PropagationCalculatedFieldConfiguration extends BaseCalculatedField
         return output.getType() == OutputType.TIME_SERIES;
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public CalculatedFieldType getType() {
         return CalculatedFieldType.PROPAGATION;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/RelationPathQueryDynamicSourceConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/RelationPathQueryDynamicSourceConfiguration.java
index 8f893e4c10..b59f69afc1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/RelationPathQueryDynamicSourceConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/RelationPathQueryDynamicSourceConfiguration.java
@@ -33,7 +33,6 @@ public class RelationPathQueryDynamicSourceConfiguration implements CfArgumentDy
     @ArraySchema(schema = @Schema(implementation = RelationPathLevel.class))
     private List<RelationPathLevel> levels;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public CFArgumentDynamicSourceType getType() {
         return CFArgumentDynamicSourceType.RELATION_PATH_QUERY;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/ScriptCalculatedFieldConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/ScriptCalculatedFieldConfiguration.java
index ec331a8430..7c16c8d438 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/ScriptCalculatedFieldConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/ScriptCalculatedFieldConfiguration.java
@@ -25,7 +25,6 @@ import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 @EqualsAndHashCode(callSuper = true)
 public class ScriptCalculatedFieldConfiguration extends BaseCalculatedFieldConfiguration implements ArgumentsBasedCalculatedFieldConfiguration {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public CalculatedFieldType getType() {
         return CalculatedFieldType.SCRIPT;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/SimpleCalculatedFieldConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/SimpleCalculatedFieldConfiguration.java
index ae1a297a2f..2bd81345a8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/SimpleCalculatedFieldConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/SimpleCalculatedFieldConfiguration.java
@@ -27,7 +27,6 @@ public class SimpleCalculatedFieldConfiguration extends BaseCalculatedFieldConfi
 
     private boolean useLatestTs;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public CalculatedFieldType getType() {
         return CalculatedFieldType.SIMPLE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/TimeSeriesImmediateOutputStrategy.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/TimeSeriesImmediateOutputStrategy.java
index fe38920c77..33be67e5a6 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/TimeSeriesImmediateOutputStrategy.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/TimeSeriesImmediateOutputStrategy.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.common.data.cf.configuration;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -32,7 +31,6 @@ public class TimeSeriesImmediateOutputStrategy implements TimeSeriesOutputStrate
     private boolean sendWsUpdate;
     private boolean processCfs;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public OutputStrategyType getType() {
         return OutputStrategyType.IMMEDIATE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/TimeSeriesOutput.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/TimeSeriesOutput.java
index ddb656a527..942a734908 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/TimeSeriesOutput.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/TimeSeriesOutput.java
@@ -31,7 +31,6 @@ public class TimeSeriesOutput implements Output {
         this.strategy = new TimeSeriesRuleChainOutputStrategy();
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public OutputType getType() {
         return OutputType.TIME_SERIES;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/TimeSeriesRuleChainOutputStrategy.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/TimeSeriesRuleChainOutputStrategy.java
index f851ec7ec4..1d68d3e8ee 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/TimeSeriesRuleChainOutputStrategy.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/TimeSeriesRuleChainOutputStrategy.java
@@ -24,7 +24,6 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class TimeSeriesRuleChainOutputStrategy implements TimeSeriesOutputStrategy {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public OutputStrategyType getType() {
         return OutputStrategyType.RULE_CHAIN;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/AggFunctionInput.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/AggFunctionInput.java
index f22c8f5ee5..ce29e20ea4 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/AggFunctionInput.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/AggFunctionInput.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.common.data.cf.configuration.aggregation;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -27,7 +26,6 @@ public class AggFunctionInput implements AggInput {
 
     private String function;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public String getType() {
         return "function";
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/AggKeyInput.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/AggKeyInput.java
index 967445b53e..55aed3b59a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/AggKeyInput.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/AggKeyInput.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.common.data.cf.configuration.aggregation;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -27,7 +26,6 @@ public class AggKeyInput implements AggInput {
 
     private String key;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public String getType() {
         return "key";
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/RelatedEntitiesAggregationCalculatedFieldConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/RelatedEntitiesAggregationCalculatedFieldConfiguration.java
index 26dc6da430..c45a38e7d7 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/RelatedEntitiesAggregationCalculatedFieldConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/RelatedEntitiesAggregationCalculatedFieldConfiguration.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.common.data.cf.configuration.aggregation;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -22,15 +23,13 @@ import lombok.Data;
 import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 import org.thingsboard.server.common.data.cf.configuration.Argument;
 import org.thingsboard.server.common.data.cf.configuration.ArgumentsBasedCalculatedFieldConfiguration;
+import org.thingsboard.server.common.data.cf.configuration.CalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.cf.configuration.HasRelationPathLevel;
 import org.thingsboard.server.common.data.cf.configuration.HasUseLatestTsConfig;
 import org.thingsboard.server.common.data.cf.configuration.Output;
 import org.thingsboard.server.common.data.cf.configuration.ScheduledUpdateSupportedCalculatedFieldConfiguration;
-import org.thingsboard.server.common.data.cf.configuration.CalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.relation.RelationPathLevel;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.util.Map;
 
 @Schema(allOf = CalculatedFieldConfiguration.class)
@@ -51,7 +50,6 @@ public class RelatedEntitiesAggregationCalculatedFieldConfiguration implements A
 
     private Integer scheduledUpdateInterval;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public CalculatedFieldType getType() {
         return CalculatedFieldType.RELATED_ENTITIES_AGGREGATION;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/EntityAggregationCalculatedFieldConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/EntityAggregationCalculatedFieldConfiguration.java
index f1951c472c..e4a949f4aa 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/EntityAggregationCalculatedFieldConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/EntityAggregationCalculatedFieldConfiguration.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.common.data.cf.configuration.aggregation.single;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -23,15 +24,13 @@ import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 import org.thingsboard.server.common.data.cf.configuration.Argument;
 import org.thingsboard.server.common.data.cf.configuration.ArgumentType;
 import org.thingsboard.server.common.data.cf.configuration.ArgumentsBasedCalculatedFieldConfiguration;
+import org.thingsboard.server.common.data.cf.configuration.CalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.cf.configuration.Output;
 import org.thingsboard.server.common.data.cf.configuration.aggregation.AggKeyInput;
-import org.thingsboard.server.common.data.cf.configuration.CalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.cf.configuration.aggregation.AggMetric;
 import org.thingsboard.server.common.data.cf.configuration.aggregation.single.interval.AggInterval;
 import org.thingsboard.server.common.data.cf.configuration.aggregation.single.interval.Watermark;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.util.Map;
 
 @Schema(allOf = CalculatedFieldConfiguration.class)
@@ -52,7 +51,6 @@ public class EntityAggregationCalculatedFieldConfiguration implements ArgumentsB
     @NotNull
     private Output output;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public CalculatedFieldType getType() {
         return CalculatedFieldType.ENTITY_AGGREGATION;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/CustomInterval.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/CustomInterval.java
index bc5015be83..933f2569fb 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/CustomInterval.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/CustomInterval.java
@@ -40,7 +40,6 @@ public class CustomInterval extends BaseAggInterval {
         this.durationSec = durationSec;
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public AggIntervalType getType() {
         return AggIntervalType.CUSTOM;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/DayInterval.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/DayInterval.java
index 4166085e37..23cb648de2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/DayInterval.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/DayInterval.java
@@ -27,7 +27,6 @@ import java.time.temporal.ChronoUnit;
 @NoArgsConstructor
 public class DayInterval extends BaseAggInterval {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public AggIntervalType getType() {
         return AggIntervalType.DAY;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/HourInterval.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/HourInterval.java
index 0a9a02ab5e..7a95f2d387 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/HourInterval.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/HourInterval.java
@@ -33,7 +33,6 @@ public class HourInterval extends BaseAggInterval {
         super(tz, offsetSec);
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public AggIntervalType getType() {
         return AggIntervalType.HOUR;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/MonthInterval.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/MonthInterval.java
index adb70d723c..d49ff9b335 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/MonthInterval.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/MonthInterval.java
@@ -27,7 +27,6 @@ import java.time.temporal.ChronoUnit;
 @NoArgsConstructor
 public class MonthInterval extends BaseAggInterval {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public AggIntervalType getType() {
         return AggIntervalType.MONTH;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/QuarterInterval.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/QuarterInterval.java
index db94a6a53c..a6f29f53f4 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/QuarterInterval.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/QuarterInterval.java
@@ -28,7 +28,6 @@ import java.time.ZonedDateTime;
 @NoArgsConstructor
 public class QuarterInterval extends BaseAggInterval {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public AggIntervalType getType() {
         return AggIntervalType.QUARTER;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/WeekInterval.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/WeekInterval.java
index ef8d64778a..fad2f072d3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/WeekInterval.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/WeekInterval.java
@@ -29,7 +29,6 @@ import java.time.temporal.TemporalAdjusters;
 @NoArgsConstructor
 public class WeekInterval extends BaseAggInterval {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public AggIntervalType getType() {
         return AggIntervalType.WEEK;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/WeekSunSatInterval.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/WeekSunSatInterval.java
index e37a482a68..a3d5876b0e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/WeekSunSatInterval.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/WeekSunSatInterval.java
@@ -29,7 +29,6 @@ import java.time.temporal.TemporalAdjusters;
 @NoArgsConstructor
 public class WeekSunSatInterval extends BaseAggInterval {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public AggIntervalType getType() {
         return AggIntervalType.WEEK_SUN_SAT;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/YearInterval.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/YearInterval.java
index a0e21e9efd..882aaa1e56 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/YearInterval.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/aggregation/single/interval/YearInterval.java
@@ -28,7 +28,6 @@ import java.time.ZonedDateTime;
 @NoArgsConstructor
 public class YearInterval extends BaseAggInterval {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public AggIntervalType getType() {
         return AggIntervalType.YEAR;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/geofencing/GeofencingCalculatedFieldConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/geofencing/GeofencingCalculatedFieldConfiguration.java
index 13a4118a36..b4ac34ac31 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/geofencing/GeofencingCalculatedFieldConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/geofencing/GeofencingCalculatedFieldConfiguration.java
@@ -16,21 +16,20 @@
 package org.thingsboard.server.common.data.cf.configuration.geofencing;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 import org.thingsboard.server.common.data.cf.configuration.Argument;
 import org.thingsboard.server.common.data.cf.configuration.ArgumentsBasedCalculatedFieldConfiguration;
+import org.thingsboard.server.common.data.cf.configuration.CalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.cf.configuration.HasUseLatestTsConfig;
 import org.thingsboard.server.common.data.cf.configuration.Output;
 import org.thingsboard.server.common.data.cf.configuration.OutputType;
 import org.thingsboard.server.common.data.cf.configuration.ScheduledUpdateSupportedCalculatedFieldConfiguration;
-import org.thingsboard.server.common.data.cf.configuration.CalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.id.EntityId;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -63,7 +62,6 @@ public class GeofencingCalculatedFieldConfiguration implements ArgumentsBasedCal
         return output.getType() == OutputType.TIME_SERIES;
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public CalculatedFieldType getType() {
         return CalculatedFieldType.GEOFENCING;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java
index 18c0c29b8b..86a61e31b6 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java
@@ -44,7 +44,6 @@ public class CoapDeviceTransportConfiguration extends PowerSavingConfiguration i
         this.properties.put(name, value);
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public DeviceTransportType getType() {
         return DeviceTransportType.COAP;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DefaultDeviceConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DefaultDeviceConfiguration.java
index 8cd9887212..d5616d8ad9 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DefaultDeviceConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DefaultDeviceConfiguration.java
@@ -25,7 +25,6 @@ public class DefaultDeviceConfiguration implements DeviceConfiguration {
 
     private static final long serialVersionUID = -2225378639573611325L;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public DeviceProfileType getType() {
         return DeviceProfileType.DEFAULT;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DefaultDeviceTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DefaultDeviceTransportConfiguration.java
index 0ea963cc14..022a0ca528 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DefaultDeviceTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/DefaultDeviceTransportConfiguration.java
@@ -23,7 +23,6 @@ import org.thingsboard.server.common.data.DeviceTransportType;
 @Data
 public class DefaultDeviceTransportConfiguration implements DeviceTransportConfiguration {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public DeviceTransportType getType() {
         return DeviceTransportType.DEFAULT;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
index 667ddda0c0..656262ab45 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
@@ -42,7 +42,6 @@ public class Lwm2mDeviceTransportConfiguration extends PowerSavingConfiguration
         this.properties.put(name, value);
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public DeviceTransportType getType() {
         return DeviceTransportType.LWM2M;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/MqttDeviceTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/MqttDeviceTransportConfiguration.java
index 34789714ca..bf83fd31fc 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/MqttDeviceTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/MqttDeviceTransportConfiguration.java
@@ -42,7 +42,6 @@ public class MqttDeviceTransportConfiguration implements DeviceTransportConfigur
         this.properties.put(name, value);
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public DeviceTransportType getType() {
         return DeviceTransportType.MQTT;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/SnmpDeviceTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/SnmpDeviceTransportConfiguration.java
index f671cda1b4..5c732b9e62 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/SnmpDeviceTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/SnmpDeviceTransportConfiguration.java
@@ -57,7 +57,6 @@ public class SnmpDeviceTransportConfiguration implements DeviceTransportConfigur
         this.community = "public";
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public DeviceTransportType getType() {
         return DeviceTransportType.SNMP;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AllowCreateNewDevicesDeviceProfileProvisionConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AllowCreateNewDevicesDeviceProfileProvisionConfiguration.java
index 988a9cf0d4..d1672af07e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AllowCreateNewDevicesDeviceProfileProvisionConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AllowCreateNewDevicesDeviceProfileProvisionConfiguration.java
@@ -26,7 +26,6 @@ public class AllowCreateNewDevicesDeviceProfileProvisionConfiguration implements
     private final String provisionDeviceSecret;
 
     @Override
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     public DeviceProfileProvisionType getType() {
         return DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AnyTimeSchedule.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AnyTimeSchedule.java
index 79cd3c43e1..e7acb04cd3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AnyTimeSchedule.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AnyTimeSchedule.java
@@ -15,13 +15,11 @@
  */
 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;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration.java
index 7398832974..935da4cbbe 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration.java
@@ -25,7 +25,6 @@ public class CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration imple
 
     private final String provisionDeviceSecret;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public DeviceProfileProvisionType getType() {
         return DeviceProfileProvisionType.CHECK_PRE_PROVISIONED_DEVICES;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CoapDeviceProfileTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CoapDeviceProfileTransportConfiguration.java
index b8ab359999..66d7f15fc4 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CoapDeviceProfileTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CoapDeviceProfileTransportConfiguration.java
@@ -29,7 +29,6 @@ public class CoapDeviceProfileTransportConfiguration implements DeviceProfileTra
     @Schema
     private PowerSavingConfiguration clientSettings;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public DeviceTransportType getType() {
         return DeviceTransportType.COAP;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CustomTimeSchedule.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CustomTimeSchedule.java
index 6d7b59c66f..878a85360b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CustomTimeSchedule.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CustomTimeSchedule.java
@@ -15,7 +15,6 @@
  */
 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;
 
@@ -30,7 +29,6 @@ public class CustomTimeSchedule implements AlarmSchedule {
 
     private DynamicValue<String> dynamicValue;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public AlarmScheduleType getType() {
         return AlarmScheduleType.CUSTOM;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultCoapDeviceTypeConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultCoapDeviceTypeConfiguration.java
index 05c11a8d45..0455f9f370 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultCoapDeviceTypeConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultCoapDeviceTypeConfiguration.java
@@ -29,7 +29,6 @@ public class DefaultCoapDeviceTypeConfiguration implements CoapDeviceTypeConfigu
     private TransportPayloadTypeConfiguration transportPayloadTypeConfiguration;
 
     @Override
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     public CoapDeviceType getCoapDeviceType() {
         return CoapDeviceType.DEFAULT;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileConfiguration.java
index 294e97ec30..7f6fa55310 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileConfiguration.java
@@ -23,7 +23,6 @@ import org.thingsboard.server.common.data.DeviceProfileType;
 @Data
 public class DefaultDeviceProfileConfiguration implements DeviceProfileConfiguration {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public DeviceProfileType getType() {
         return DeviceProfileType.DEFAULT;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileTransportConfiguration.java
index 320bbd6948..f00922119a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DefaultDeviceProfileTransportConfiguration.java
@@ -23,7 +23,6 @@ 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;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DisabledDeviceProfileProvisionConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DisabledDeviceProfileProvisionConfiguration.java
index 86a69e164d..df5883230a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DisabledDeviceProfileProvisionConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DisabledDeviceProfileProvisionConfiguration.java
@@ -26,7 +26,6 @@ public class DisabledDeviceProfileProvisionConfiguration implements DeviceProfil
     private final String provisionDeviceSecret;
 
     @Override
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     public DeviceProfileProvisionType getType() {
         return DeviceProfileProvisionType.DISABLED;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DurationAlarmConditionSpec.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DurationAlarmConditionSpec.java
index 652168e7db..b40b8f2c82 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DurationAlarmConditionSpec.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DurationAlarmConditionSpec.java
@@ -34,7 +34,6 @@ public class DurationAlarmConditionSpec implements AlarmConditionSpec {
     private FilterPredicateValue<Long> predicate;
 
     @Override
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     public AlarmConditionSpecType getType() {
         return AlarmConditionSpecType.DURATION;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/EfentoCoapDeviceTypeConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/EfentoCoapDeviceTypeConfiguration.java
index f15be1fe11..8d6831ebd9 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/EfentoCoapDeviceTypeConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/EfentoCoapDeviceTypeConfiguration.java
@@ -26,7 +26,6 @@ public class EfentoCoapDeviceTypeConfiguration implements CoapDeviceTypeConfigur
     private static final long serialVersionUID = -8523081152598707064L;
 
     @Override
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     public CoapDeviceType getCoapDeviceType() {
         return CoapDeviceType.EFENTO;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/JsonTransportPayloadConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/JsonTransportPayloadConfiguration.java
index 6654e9febf..3103aff8c4 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/JsonTransportPayloadConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/JsonTransportPayloadConfiguration.java
@@ -23,7 +23,6 @@ import org.thingsboard.server.common.data.TransportPayloadType;
 @Schema
 public class JsonTransportPayloadConfiguration implements TransportPayloadTypeConfiguration {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public TransportPayloadType getTransportPayloadType() {
         return TransportPayloadType.JSON;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/Lwm2mDeviceProfileTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/Lwm2mDeviceProfileTransportConfiguration.java
index 3dff937ae8..300ede57c9 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/Lwm2mDeviceProfileTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/Lwm2mDeviceProfileTransportConfiguration.java
@@ -49,7 +49,6 @@ public class Lwm2mDeviceProfileTransportConfiguration implements DeviceProfileTr
         updateDefault();
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public DeviceTransportType getType() {
         return DeviceTransportType.LWM2M;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/MqttDeviceProfileTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/MqttDeviceProfileTransportConfiguration.java
index bdbc2613de..a5df705800 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/MqttDeviceProfileTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/MqttDeviceProfileTransportConfiguration.java
@@ -48,7 +48,6 @@ public class MqttDeviceProfileTransportConfiguration implements DeviceProfileTra
     @Schema
     private boolean sendAckOnValidationException;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public DeviceTransportType getType() {
         return DeviceTransportType.MQTT;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SimpleAlarmConditionSpec.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SimpleAlarmConditionSpec.java
index b00d0c64c5..caa65777e9 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SimpleAlarmConditionSpec.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SimpleAlarmConditionSpec.java
@@ -25,7 +25,6 @@ import lombok.Data;
 @Deprecated
 public class SimpleAlarmConditionSpec implements AlarmConditionSpec {
     @Override
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     public AlarmConditionSpecType getType() {
         return AlarmConditionSpecType.SIMPLE;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SnmpDeviceProfileTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SnmpDeviceProfileTransportConfiguration.java
index edbb0a0738..a83920b777 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SnmpDeviceProfileTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SnmpDeviceProfileTransportConfiguration.java
@@ -32,7 +32,6 @@ 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;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SpecificTimeSchedule.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SpecificTimeSchedule.java
index 18b296e6ab..dfaf6c763c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SpecificTimeSchedule.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SpecificTimeSchedule.java
@@ -15,7 +15,6 @@
  */
 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;
 
@@ -32,7 +31,6 @@ public class SpecificTimeSchedule implements AlarmSchedule {
 
     private DynamicValue<String> dynamicValue;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public AlarmScheduleType getType() {
         return AlarmScheduleType.SPECIFIC_TIME;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/X509CertificateChainProvisionConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/X509CertificateChainProvisionConfiguration.java
index b704e56e5c..ab95dae195 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/X509CertificateChainProvisionConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/X509CertificateChainProvisionConfiguration.java
@@ -30,7 +30,6 @@ public class X509CertificateChainProvisionConfiguration implements DeviceProfile
     private boolean allowCreateNewDevicesByX509Certificate;
 
     @Override
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     public DeviceProfileProvisionType getType() {
         return DeviceProfileProvisionType.X509_CERTIFICATE_CHAIN;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/job/DummyJobConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/job/DummyJobConfiguration.java
index b80e9f844c..c36d40dc26 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/job/DummyJobConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/job/DummyJobConfiguration.java
@@ -45,7 +45,6 @@ public class DummyJobConfiguration extends JobConfiguration {
     private String generalError;
     private int submittedTasksBeforeGeneralError;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public JobType getType() {
         return JobType.DUMMY;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/job/DummyJobResult.java b/common/data/src/main/java/org/thingsboard/server/common/data/job/DummyJobResult.java
index ef2b68c8f1..a5729545bc 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/job/DummyJobResult.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/job/DummyJobResult.java
@@ -15,11 +15,8 @@
  */
 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;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/CustomMobilePage.java b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/CustomMobilePage.java
index abc0e98425..156436225f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/CustomMobilePage.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/CustomMobilePage.java
@@ -36,7 +36,6 @@ public class CustomMobilePage extends AbstractMobilePage {
     @JsonView(Views.Public.class)
     private String path;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public MobilePageType getType() {
         return MobilePageType.CUSTOM;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/DashboardPage.java b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/DashboardPage.java
index 4381825e2b..232049adbb 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/DashboardPage.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/DashboardPage.java
@@ -36,7 +36,6 @@ public class DashboardPage extends AbstractMobilePage {
     @JsonView(Views.Public.class)
     private String dashboardId;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public MobilePageType getType() {
         return MobilePageType.DASHBOARD;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/DefaultMobilePage.java b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/DefaultMobilePage.java
index c12305b508..20f25afe19 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/DefaultMobilePage.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/DefaultMobilePage.java
@@ -36,7 +36,6 @@ public class DefaultMobilePage extends AbstractMobilePage {
     @JsonView(Views.Public.class)
     private DefaultPageId id;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public MobilePageType getType() {
         return MobilePageType.DEFAULT;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/WebViewPage.java b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/WebViewPage.java
index 50f67116d2..89e82ab90e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/WebViewPage.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/WebViewPage.java
@@ -36,7 +36,6 @@ public class WebViewPage extends AbstractMobilePage {
     @JsonView(Views.Public.class)
     private String url;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public MobilePageType getType() {
         return MobilePageType.WEB_VIEW;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerConfig.java
index a58b3d5eef..e6764fa8d0 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/trigger/config/NotificationRuleTriggerConfig.java
@@ -66,7 +66,6 @@ import java.io.Serializable;
 })
 public interface NotificationRuleTriggerConfig extends Serializable {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     NotificationRuleTriggerType getTriggerType();
 
     @JsonIgnore
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/MobileAppNotificationDeliveryMethodConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/MobileAppNotificationDeliveryMethodConfig.java
index 2dc162118a..2a708ed998 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/MobileAppNotificationDeliveryMethodConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/MobileAppNotificationDeliveryMethodConfig.java
@@ -28,7 +28,6 @@ public class MobileAppNotificationDeliveryMethodConfig implements NotificationDe
     @NotEmpty
     private String firebaseServiceAccountCredentials;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public NotificationDeliveryMethod getMethod() {
         return NotificationDeliveryMethod.MOBILE_APP;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/SlackNotificationDeliveryMethodConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/SlackNotificationDeliveryMethodConfig.java
index 0e969a9a10..283c09bbd8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/SlackNotificationDeliveryMethodConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/SlackNotificationDeliveryMethodConfig.java
@@ -27,7 +27,6 @@ public class SlackNotificationDeliveryMethodConfig implements NotificationDelive
     @NotEmpty
     private String botToken;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public NotificationDeliveryMethod getMethod() {
         return NotificationDeliveryMethod.SLACK;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/MicrosoftTeamsNotificationTargetConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/MicrosoftTeamsNotificationTargetConfig.java
index eede7b56db..d551aab4c9 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/MicrosoftTeamsNotificationTargetConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/MicrosoftTeamsNotificationTargetConfig.java
@@ -32,7 +32,6 @@ public class MicrosoftTeamsNotificationTargetConfig extends NotificationTargetCo
     private String channelName;
     private Boolean useOldApi = Boolean.TRUE;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public NotificationTargetType getType() {
         return NotificationTargetType.MICROSOFT_TEAMS;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedTenantAdministratorsFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedTenantAdministratorsFilter.java
index 2958c48dcc..96dda12884 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedTenantAdministratorsFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedTenantAdministratorsFilter.java
@@ -22,7 +22,6 @@ import lombok.Data;
 @Data
 public class AffectedTenantAdministratorsFilter implements UsersFilter {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public UsersFilterType getType() {
         return UsersFilterType.AFFECTED_TENANT_ADMINISTRATORS;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedUserFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedUserFilter.java
index d93c8f8feb..b2c5348d3b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedUserFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AffectedUserFilter.java
@@ -22,7 +22,6 @@ import lombok.Data;
 @Data
 public class AffectedUserFilter implements UsersFilter {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public UsersFilterType getType() {
         return UsersFilterType.AFFECTED_USER;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AllUsersFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AllUsersFilter.java
index f0cab33456..119859db7c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AllUsersFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/AllUsersFilter.java
@@ -22,7 +22,6 @@ import lombok.Data;
 @Data
 public class AllUsersFilter implements SystemLevelUsersFilter {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public UsersFilterType getType() {
         return UsersFilterType.ALL_USERS;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/CustomerUsersFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/CustomerUsersFilter.java
index 546a9a652d..bc63801124 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/CustomerUsersFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/CustomerUsersFilter.java
@@ -28,7 +28,6 @@ public class CustomerUsersFilter implements UsersFilter {
     @NotNull
     private UUID customerId;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public UsersFilterType getType() {
         return UsersFilterType.CUSTOMER_USERS;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/OriginatorEntityOwnerUsersFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/OriginatorEntityOwnerUsersFilter.java
index 7f66665f3b..375b47cc03 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/OriginatorEntityOwnerUsersFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/OriginatorEntityOwnerUsersFilter.java
@@ -22,7 +22,6 @@ import lombok.Data;
 @Data
 public class OriginatorEntityOwnerUsersFilter implements UsersFilter {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public UsersFilterType getType() {
         return UsersFilterType.ORIGINATOR_ENTITY_OWNER_USERS;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/PlatformUsersNotificationTargetConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/PlatformUsersNotificationTargetConfig.java
index 4709a5f79a..df26d6ca65 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/PlatformUsersNotificationTargetConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/PlatformUsersNotificationTargetConfig.java
@@ -33,7 +33,6 @@ public class PlatformUsersNotificationTargetConfig extends NotificationTargetCon
     @Valid
     private UsersFilter usersFilter;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public NotificationTargetType getType() {
         return NotificationTargetType.PLATFORM_USERS;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/SystemAdministratorsFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/SystemAdministratorsFilter.java
index afa986039c..8daf518089 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/SystemAdministratorsFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/SystemAdministratorsFilter.java
@@ -22,7 +22,6 @@ import lombok.Data;
 @Data
 public class SystemAdministratorsFilter implements SystemLevelUsersFilter {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public UsersFilterType getType() {
         return UsersFilterType.SYSTEM_ADMINISTRATORS;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/TenantAdministratorsFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/TenantAdministratorsFilter.java
index 957ec8fa02..3b551b4fbf 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/TenantAdministratorsFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/TenantAdministratorsFilter.java
@@ -31,7 +31,6 @@ public class TenantAdministratorsFilter implements SystemLevelUsersFilter {
     @ArraySchema(schema = @Schema(implementation = UUID.class))
     private Set<UUID> tenantProfilesIds;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public UsersFilterType getType() {
         return UsersFilterType.TENANT_ADMINISTRATORS;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UserListFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UserListFilter.java
index 0ca54bf493..2534bc8dbc 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UserListFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/platform/UserListFilter.java
@@ -31,7 +31,6 @@ public class UserListFilter implements UsersFilter {
     @NotEmpty
     private List<UUID> usersIds;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public UsersFilterType getType() {
         return UsersFilterType.USER_LIST;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/EmailDeliveryMethodNotificationTemplate.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/EmailDeliveryMethodNotificationTemplate.java
index dc8d1dc52c..261c127ce4 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/EmailDeliveryMethodNotificationTemplate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/EmailDeliveryMethodNotificationTemplate.java
@@ -49,7 +49,6 @@ public class EmailDeliveryMethodNotificationTemplate extends DeliveryMethodNotif
         this.subject = other.subject;
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public NotificationDeliveryMethod getMethod() {
         return NotificationDeliveryMethod.EMAIL;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MicrosoftTeamsDeliveryMethodNotificationTemplate.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MicrosoftTeamsDeliveryMethodNotificationTemplate.java
index 7dc3cb9e65..4d03afd7e2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MicrosoftTeamsDeliveryMethodNotificationTemplate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MicrosoftTeamsDeliveryMethodNotificationTemplate.java
@@ -54,7 +54,6 @@ public class MicrosoftTeamsDeliveryMethodNotificationTemplate extends DeliveryMe
         this.button = other.button != null ? new Button(other.button) : null;
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public NotificationDeliveryMethod getMethod() {
         return NotificationDeliveryMethod.MICROSOFT_TEAMS;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MobileAppDeliveryMethodNotificationTemplate.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MobileAppDeliveryMethodNotificationTemplate.java
index 31eb96219b..c7d8689f45 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MobileAppDeliveryMethodNotificationTemplate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MobileAppDeliveryMethodNotificationTemplate.java
@@ -49,7 +49,6 @@ public class MobileAppDeliveryMethodNotificationTemplate extends DeliveryMethodN
         this.additionalConfig = other.additionalConfig;
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public NotificationDeliveryMethod getMethod() {
         return NotificationDeliveryMethod.MOBILE_APP;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/SlackDeliveryMethodNotificationTemplate.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/SlackDeliveryMethodNotificationTemplate.java
index 7fa5fc292c..ea93ba2aab 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/SlackDeliveryMethodNotificationTemplate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/SlackDeliveryMethodNotificationTemplate.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.common.data.notification.template;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -45,7 +44,6 @@ public class SlackDeliveryMethodNotificationTemplate extends DeliveryMethodNotif
         return super.getBody();
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public NotificationDeliveryMethod getMethod() {
         return NotificationDeliveryMethod.SLACK;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/SmsDeliveryMethodNotificationTemplate.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/SmsDeliveryMethodNotificationTemplate.java
index e8d4e05363..cbfe0bdcf4 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/SmsDeliveryMethodNotificationTemplate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/SmsDeliveryMethodNotificationTemplate.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.common.data.notification.template;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -47,7 +46,6 @@ public class SmsDeliveryMethodNotificationTemplate extends DeliveryMethodNotific
         return super.getBody();
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public NotificationDeliveryMethod getMethod() {
         return NotificationDeliveryMethod.SMS;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/WebDeliveryMethodNotificationTemplate.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/WebDeliveryMethodNotificationTemplate.java
index fd197fea97..c0229678f6 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/WebDeliveryMethodNotificationTemplate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/WebDeliveryMethodNotificationTemplate.java
@@ -106,7 +106,6 @@ public class WebDeliveryMethodNotificationTemplate extends DeliveryMethodNotific
                 .map(config -> (ObjectNode) config);
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public NotificationDeliveryMethod getMethod() {
         return NotificationDeliveryMethod.WEB;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/ApiUsageStateFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/ApiUsageStateFilter.java
index 314b8ff980..621d8a66fd 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/ApiUsageStateFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/ApiUsageStateFilter.java
@@ -15,7 +15,6 @@
  */
 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;
 
@@ -24,7 +23,6 @@ public class ApiUsageStateFilter implements EntityFilter {
 
     private CustomerId customerId;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public EntityFilterType getType() {
         return EntityFilterType.API_USAGE_STATE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetSearchQueryFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetSearchQueryFilter.java
index 961f3c36e4..25dd243a57 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetSearchQueryFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetSearchQueryFilter.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.common.data.query;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -27,7 +26,6 @@ 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;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetTypeFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetTypeFilter.java
index 886e01637e..6f48734d0f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetTypeFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetTypeFilter.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.common.data.query;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
@@ -45,7 +44,6 @@ public class AssetTypeFilter implements EntityFilter {
     @Getter
     private String assetNameFilter;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public EntityFilterType getType() {
         return EntityFilterType.ASSET_TYPE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/BooleanFilterPredicate.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/BooleanFilterPredicate.java
index 796fb850f9..c469a7ef75 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/BooleanFilterPredicate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/BooleanFilterPredicate.java
@@ -25,7 +25,6 @@ public class BooleanFilterPredicate implements SimpleKeyFilterPredicate<Boolean>
     private BooleanOperation operation;
     private FilterPredicateValue<Boolean> value;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public FilterPredicateType getType() {
         return FilterPredicateType.BOOLEAN;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/ComplexFilterPredicate.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/ComplexFilterPredicate.java
index 91feaa1e71..557f08eb2b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/ComplexFilterPredicate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/ComplexFilterPredicate.java
@@ -29,7 +29,6 @@ public class ComplexFilterPredicate implements KeyFilterPredicate {
     @ArraySchema(schema = @Schema(ref = "#/components/schemas/KeyFilterPredicate"))
     private List<KeyFilterPredicate> predicates;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public FilterPredicateType getType() {
         return FilterPredicateType.COMPLEX;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceSearchQueryFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceSearchQueryFilter.java
index bcdc52b981..bd5a37614f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceSearchQueryFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceSearchQueryFilter.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.common.data.query;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -27,7 +26,6 @@ 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;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceTypeFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceTypeFilter.java
index a5ea0ac307..e829ebdbd7 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceTypeFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceTypeFilter.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.common.data.query;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -54,7 +53,6 @@ public class DeviceTypeFilter implements EntityFilter {
         this.deviceNameFilter = deviceNameFilter;
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public EntityFilterType getType() {
         return EntityFilterType.DEVICE_TYPE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeSearchQueryFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeSearchQueryFilter.java
index 2829f01dfb..de81545690 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeSearchQueryFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeSearchQueryFilter.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.common.data.query;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -27,7 +26,6 @@ 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;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeTypeFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeTypeFilter.java
index 2d6e1a8a23..767695922b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeTypeFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeTypeFilter.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.common.data.query;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
@@ -45,7 +44,6 @@ public class EdgeTypeFilter implements EntityFilter {
     @Getter
     private String edgeNameFilter;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public EntityFilterType getType() {
         return EntityFilterType.EDGE_TYPE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityListFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityListFilter.java
index 68a686b8a9..43feb03190 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityListFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityListFilter.java
@@ -15,7 +15,6 @@
  */
 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;
 
@@ -23,7 +22,6 @@ import java.util.List;
 
 @Data
 public class EntityListFilter implements EntityFilter {
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public EntityFilterType getType() {
         return EntityFilterType.ENTITY_LIST;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityNameFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityNameFilter.java
index 79b166f223..a3889bc7c0 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityNameFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityNameFilter.java
@@ -15,13 +15,11 @@
  */
 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;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityTypeFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityTypeFilter.java
index 7947449678..05556a0089 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityTypeFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityTypeFilter.java
@@ -15,13 +15,11 @@
  */
 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;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewSearchQueryFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewSearchQueryFilter.java
index 47b3c0018f..198ad87782 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewSearchQueryFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewSearchQueryFilter.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.common.data.query;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -27,7 +26,6 @@ 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;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewTypeFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewTypeFilter.java
index d8b586ed4e..3103a1a161 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewTypeFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewTypeFilter.java
@@ -45,7 +45,6 @@ public class EntityViewTypeFilter implements EntityFilter {
     @Getter
     private String entityViewNameFilter;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public EntityFilterType getType() {
         return EntityFilterType.ENTITY_VIEW_TYPE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/NumericFilterPredicate.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/NumericFilterPredicate.java
index 70b010e443..0d7953defc 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/NumericFilterPredicate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/NumericFilterPredicate.java
@@ -25,7 +25,6 @@ public class NumericFilterPredicate implements SimpleKeyFilterPredicate<Double>
     private NumericOperation operation;
     private FilterPredicateValue<Double> value;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public FilterPredicateType getType() {
         return FilterPredicateType.NUMERIC;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/RelationsQueryFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/RelationsQueryFilter.java
index f844b67dd2..488d03df63 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/RelationsQueryFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/RelationsQueryFilter.java
@@ -28,7 +28,6 @@ import java.util.Set;
 @Data
 public class RelationsQueryFilter implements EntityFilter {
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public EntityFilterType getType() {
         return EntityFilterType.RELATIONS_QUERY;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/SimpleKeyFilterPredicate.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/SimpleKeyFilterPredicate.java
index 5072a43e20..f85c259034 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/SimpleKeyFilterPredicate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/SimpleKeyFilterPredicate.java
@@ -17,10 +17,7 @@ package org.thingsboard.server.common.data.query;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-@Schema(
-        description = "Base interface for simple key filter predicates",
-        allOf = { KeyFilterPredicate.class }
-)
+@Schema(description = "Base interface for simple key filter predicates")
 public interface SimpleKeyFilterPredicate<T> extends KeyFilterPredicate {
 
     @Schema(description = "The value associated with the filter predicate")
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/SingleEntityFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/SingleEntityFilter.java
index 4273989e2e..c0bbd43378 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/SingleEntityFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/SingleEntityFilter.java
@@ -15,13 +15,10 @@
  */
 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;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/StringFilterPredicate.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/StringFilterPredicate.java
index 21d555c5c3..da127a58b3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/StringFilterPredicate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/StringFilterPredicate.java
@@ -28,7 +28,6 @@ public class StringFilterPredicate implements SimpleKeyFilterPredicate<String> {
     private FilterPredicateValue<String> value;
     private boolean ignoreCase;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public FilterPredicateType getType() {
         return FilterPredicateType.STRING;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java
index 15aa6157ab..981d5c2598 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java
@@ -105,7 +105,8 @@ 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.", implementation = JsonNode.class)    @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();
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/AccountTwoFaSettings.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/AccountTwoFaSettings.java
index 79114edba7..f613b37220 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/AccountTwoFaSettings.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/AccountTwoFaSettings.java
@@ -24,6 +24,5 @@ import java.util.LinkedHashMap;
 @Data
 @Schema(description = "Account Two-Factor Authentication Settings")
 public class AccountTwoFaSettings {
-    @Schema
     private LinkedHashMap<TwoFaProviderType, TwoFaAccountConfig> configs;
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/BackupCodeTwoFaAccountConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/BackupCodeTwoFaAccountConfig.java
index 3b34a75250..74a804688d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/BackupCodeTwoFaAccountConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/BackupCodeTwoFaAccountConfig.java
@@ -32,7 +32,6 @@ public class BackupCodeTwoFaAccountConfig extends TwoFaAccountConfig {
     @NotEmpty
     private Set<String> codes;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public TwoFaProviderType getProviderType() {
         return TwoFaProviderType.BACKUP_CODE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/EmailTwoFaAccountConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/EmailTwoFaAccountConfig.java
index 8b0b359164..5e87cf5ce7 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/EmailTwoFaAccountConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/EmailTwoFaAccountConfig.java
@@ -31,7 +31,6 @@ public class EmailTwoFaAccountConfig extends OtpBasedTwoFaAccountConfig {
     @Email
     private String email;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public TwoFaProviderType getProviderType() {
         return TwoFaProviderType.EMAIL;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/SmsTwoFaAccountConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/SmsTwoFaAccountConfig.java
index a9d7fe6561..1a9b2b718e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/SmsTwoFaAccountConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/SmsTwoFaAccountConfig.java
@@ -31,7 +31,6 @@ public class SmsTwoFaAccountConfig extends OtpBasedTwoFaAccountConfig {
     @Pattern(regexp = "^\\+[1-9]\\d{1,14}$", message = "is not of E.164 format")
     private String phoneNumber;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public TwoFaProviderType getProviderType() {
         return TwoFaProviderType.SMS;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/TotpTwoFaAccountConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/TotpTwoFaAccountConfig.java
index 7711d09186..799e381b4f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/TotpTwoFaAccountConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/account/TotpTwoFaAccountConfig.java
@@ -31,7 +31,6 @@ public class TotpTwoFaAccountConfig extends TwoFaAccountConfig {
     @Pattern(regexp = "otpauth://totp/(\\S+?):(\\S+?)\\?issuer=(\\S+?)&secret=(\\w+?)", message = "is invalid")
     private String authUrl;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public TwoFaProviderType getProviderType() {
         return TwoFaProviderType.TOTP;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/BackupCodeTwoFaProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/BackupCodeTwoFaProviderConfig.java
index baf55f42cb..5346f996fd 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/BackupCodeTwoFaProviderConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/BackupCodeTwoFaProviderConfig.java
@@ -27,7 +27,6 @@ public class BackupCodeTwoFaProviderConfig implements TwoFaProviderConfig {
     private int codesQuantity;
 
     @Override
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     public TwoFaProviderType getProviderType() {
         return TwoFaProviderType.BACKUP_CODE;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/EmailTwoFaProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/EmailTwoFaProviderConfig.java
index 2d823c6697..f9b6d2e618 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/EmailTwoFaProviderConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/EmailTwoFaProviderConfig.java
@@ -25,7 +25,6 @@ import lombok.EqualsAndHashCode;
 public class EmailTwoFaProviderConfig extends OtpBasedTwoFaProviderConfig {
 
     @Override
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     public TwoFaProviderType getProviderType() {
         return TwoFaProviderType.EMAIL;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/SmsTwoFaProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/SmsTwoFaProviderConfig.java
index e859e8b00d..dba2372989 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/SmsTwoFaProviderConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/SmsTwoFaProviderConfig.java
@@ -31,7 +31,6 @@ public class SmsTwoFaProviderConfig extends OtpBasedTwoFaProviderConfig {
     private String smsVerificationMessageTemplate;
 
     @Override
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     public TwoFaProviderType getProviderType() {
         return TwoFaProviderType.SMS;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/TotpTwoFaProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/TotpTwoFaProviderConfig.java
index f32b820a53..64cabcbbbd 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/TotpTwoFaProviderConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/security/model/mfa/provider/TotpTwoFaProviderConfig.java
@@ -27,7 +27,6 @@ public class TotpTwoFaProviderConfig implements TwoFaProviderConfig {
     private String issuerName;
 
     @Override
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     public TwoFaProviderType getProviderType() {
         return TwoFaProviderType.TOTP;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/AwsSnsSmsProviderConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/AwsSnsSmsProviderConfiguration.java
index 8f90f56895..9ae7fb2f9e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/AwsSnsSmsProviderConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/AwsSnsSmsProviderConfiguration.java
@@ -29,7 +29,6 @@ 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;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmppSmsProviderConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmppSmsProviderConfiguration.java
index 81b30e15fb..1b7c75f69f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmppSmsProviderConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/SmppSmsProviderConfiguration.java
@@ -90,8 +90,7 @@ public class SmppSmsProviderConfiguration implements SmsProviderConfiguration {
     @Schema(description = "Address range", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String addressRange;
 
-    @Schema(minimum = "0",
-            maximum = "14",
+    @Schema(allowableValues = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "13", "14"},
             description = "0 - SMSC Default Alphabet (ASCII for short and long code and to GSM for toll-free, used as default)\n" +
                     "1 - IA5 (ASCII for short and long code, Latin 9 for toll-free (ISO-8859-9))\n" +
                     "2 - Octet Unspecified (8-bit binary)\n" +
@@ -107,7 +106,6 @@ 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;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/TwilioSmsProviderConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/TwilioSmsProviderConfiguration.java
index 2301ca283d..25d6fe417f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/TwilioSmsProviderConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sms/config/TwilioSmsProviderConfiguration.java
@@ -29,7 +29,6 @@ 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;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/EntityExportData.java b/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/EntityExportData.java
index 7ca475f793..3b8dcba162 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/EntityExportData.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/EntityExportData.java
@@ -75,10 +75,9 @@ public class EntityExportData<E extends ExportableEntity<? extends EntityId>> {
 
     @JsonProperty(index = 2)
     @JsonTbEntity
-    @Schema(implementation = ExportableEntity.class)
     private E entity;
     @JsonProperty(index = 1)
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema
     private EntityType entityType;
 
     @JsonProperty(index = 100)
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/WidgetsBundleExportData.java b/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/WidgetsBundleExportData.java
index e225364868..e725d20404 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/WidgetsBundleExportData.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/WidgetsBundleExportData.java
@@ -32,7 +32,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class WidgetsBundleExportData extends EntityExportData<WidgetsBundle> {
 
-    @ArraySchema(schema = @Schema(description = "List of widgets in the bundle"))
+    @ArraySchema(arraySchema = @Schema(description = "List of widgets in the bundle"), schema = @Schema(implementation = JsonNode.class))
     @JsonProperty(index = 3)
     private List<ObjectNode> widgets;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/ComplexVersionCreateRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/ComplexVersionCreateRequest.java
index 32d3b6bf4b..13fb3f08d6 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/ComplexVersionCreateRequest.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/ComplexVersionCreateRequest.java
@@ -31,7 +31,6 @@ public class ComplexVersionCreateRequest extends VersionCreateRequest {
     private SyncStrategy syncStrategy;
     private Map<EntityType, EntityTypeVersionCreateConfig> entityTypes;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public VersionCreateRequestType getType() {
         return VersionCreateRequestType.COMPLEX;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/SingleEntityVersionCreateRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/SingleEntityVersionCreateRequest.java
index e768d3d0e9..4798393cb4 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/SingleEntityVersionCreateRequest.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/create/SingleEntityVersionCreateRequest.java
@@ -28,7 +28,6 @@ public class SingleEntityVersionCreateRequest extends VersionCreateRequest {
     private EntityId entityId;
     private VersionCreateConfig config;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public VersionCreateRequestType getType() {
         return VersionCreateRequestType.SINGLE_ENTITY;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/load/EntityTypeVersionLoadRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/load/EntityTypeVersionLoadRequest.java
index 1f765223cc..c3a1260fb0 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/load/EntityTypeVersionLoadRequest.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/load/EntityTypeVersionLoadRequest.java
@@ -30,7 +30,6 @@ public class EntityTypeVersionLoadRequest extends VersionLoadRequest {
     private Map<EntityType, EntityTypeVersionLoadConfig> entityTypes;
     private boolean rollbackOnError;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public VersionLoadRequestType getType() {
         return VersionLoadRequestType.ENTITY_TYPE;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/load/SingleEntityVersionLoadRequest.java b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/load/SingleEntityVersionLoadRequest.java
index 7fa3e68293..46c760a60f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/load/SingleEntityVersionLoadRequest.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/request/load/SingleEntityVersionLoadRequest.java
@@ -29,7 +29,6 @@ public class SingleEntityVersionLoadRequest extends VersionLoadRequest {
 
     private VersionLoadConfig config;
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public VersionLoadRequestType getType() {
         return VersionLoadRequestType.SINGLE_ENTITY;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
index 9453b8f4cf..297f92cffb 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
@@ -250,7 +250,6 @@ public class DefaultTenantProfileConfiguration implements TenantProfileConfigura
         };
     }
 
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
     @Override
     public TenantProfileType getType() {
         return TenantProfileType.DEFAULT;