Code cleaning and fix of tests

common/data/src/main/java/org/thingsboard/server/common/data/query/DynamicValue.java

@@ -18,8 +18,10 @@ package org.thingsboard.server.common.data.query;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 
 @Data
+@RequiredArgsConstructor
 public class DynamicValue<T> {
 
     @JsonIgnore
@@ -31,12 +33,6 @@ public class DynamicValue<T> {
         this.inherit = false;
     }
 
-    public DynamicValue(DynamicValueSourceType sourceType, String sourceAttribute, boolean inherit) {
-        this.sourceAttribute = sourceAttribute;
-        this.sourceType = sourceType;
-        this.inherit = inherit;
-    }
-
     @Getter
     private final DynamicValueSourceType sourceType;
     @Getter

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmRuleState.java

@@ -388,15 +388,6 @@ class AlarmRuleState {
         EntityKeyValue ekv = null;
         if (value.getDynamicValue() != null) {
             switch (value.getDynamicValue().getSourceType()) {
-                case CURRENT_TENANT:
-                    ekv = dynamicPredicateValueCtx.getTenantValue(value.getDynamicValue().getSourceAttribute());
-                    break;
-                case CURRENT_CUSTOMER:
-                    ekv = dynamicPredicateValueCtx.getCustomerValue(value.getDynamicValue().getSourceAttribute());
-                    if(ekv == null && value.getDynamicValue().isInherit()) {
-                        ekv = dynamicPredicateValueCtx.getTenantValue(value.getDynamicValue().getSourceAttribute());
-                    }
-                    break;
                 case CURRENT_DEVICE:
                     ekv = data.getValue(new EntityKey(EntityKeyType.ATTRIBUTE, value.getDynamicValue().getSourceAttribute()));
                     if (ekv == null) {
@@ -408,12 +399,16 @@ class AlarmRuleState {
                             }
                         }
                     }
-                    if(ekv == null && value.getDynamicValue().isInherit()) {
-                        ekv = dynamicPredicateValueCtx.getCustomerValue(value.getDynamicValue().getSourceAttribute());
-                        if(ekv == null) {
-                            ekv = dynamicPredicateValueCtx.getTenantValue(value.getDynamicValue().getSourceAttribute());
-                        }
+                    if(ekv != null || !value.getDynamicValue().isInherit()) {
+                        break;
                     }
+                case CURRENT_CUSTOMER:
+                    ekv = dynamicPredicateValueCtx.getCustomerValue(value.getDynamicValue().getSourceAttribute());
+                    if(ekv != null || !value.getDynamicValue().isInherit()) {
+                       break;
+                    }
+                case CURRENT_TENANT:
+                    ekv = dynamicPredicateValueCtx.getTenantValue(value.getDynamicValue().getSourceAttribute());
             }
         }
         return ekv;

rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNodeTest.java

@@ -453,8 +453,6 @@ public class TbDeviceProfileNodeTest {
         AttributeKvEntry entry = attributeKvEntity.toData();
         ListenableFuture<List<AttributeKvEntry>> listListenableFutureWithLess =
                 Futures.immediateFuture(Collections.singletonList(entry));
-        ListenableFuture<Optional<AttributeKvEntry>> optionalListenableFutureWithLess =
-                Futures.immediateFuture(Optional.of(entry));
 
         KeyFilter lowTempFilter = new KeyFilter();
         lowTempFilter.setKey(new EntityKey(EntityKeyType.TIME_SERIES, "temperature"));
@@ -490,8 +488,6 @@ public class TbDeviceProfileNodeTest {
         Mockito.when(ctx.getAttributesService()).thenReturn(attributesService);
         Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.anyString(), Mockito.anySet()))
                 .thenReturn(listListenableFutureWithLess);
-        Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), eq(DataConstants.SERVER_SCOPE),  Mockito.anyString()))
-                .thenReturn(optionalListenableFutureWithLess);
 
         TbMsg theMsg = TbMsg.newMsg("ALARM", deviceId, new TbMsgMetaData(), "");
         Mockito.when(ctx.newMsg(Mockito.anyString(), Mockito.anyString(), Mockito.any(), Mockito.any(), Mockito.anyString()))