Browse Source

refactoring

pull/15277/head
dashevchenko 6 months ago
parent
commit
6e2eb5dc34
  1. 12
      application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCache.java

12
application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCache.java

@ -313,9 +313,9 @@ public class DefaultCalculatedFieldCache implements CalculatedFieldCache {
} }
break; break;
case CUSTOMER: case CUSTOMER:
if (event.getEvent().equals(ComponentLifecycleEvent.CREATED)) { if (event.getEvent() == ComponentLifecycleEvent.CREATED) {
addOwnerEntity(event.getTenantId(), event.getEntityId()); addOwnerEntity(event.getTenantId(), event.getEntityId());
} else if (event.getEvent().equals(ComponentLifecycleEvent.UPDATED) && event.isOwnerChanged()) { } else if (event.getEvent() == ComponentLifecycleEvent.UPDATED && event.isOwnerChanged()) {
updateOwnerEntity(event.getTenantId(), event.getEntityId()); updateOwnerEntity(event.getTenantId(), event.getEntityId());
} else if (event.getEvent() == ComponentLifecycleEvent.DELETED) { } else if (event.getEvent() == ComponentLifecycleEvent.DELETED) {
evictOwner(event.getEntityId()); evictOwner(event.getEntityId());
@ -323,17 +323,17 @@ public class DefaultCalculatedFieldCache implements CalculatedFieldCache {
} }
break; break;
case DEVICE, ASSET: case DEVICE, ASSET:
if (event.getEvent().equals(ComponentLifecycleEvent.CREATED)) { if (event.getEvent() == ComponentLifecycleEvent.CREATED) {
addOwnerEntity(event.getTenantId(), event.getEntityId()); addOwnerEntity(event.getTenantId(), event.getEntityId());
} else if (event.getEvent().equals(ComponentLifecycleEvent.UPDATED) && event.isOwnerChanged()) { } else if (event.getEvent() == ComponentLifecycleEvent.UPDATED && event.isOwnerChanged()) {
updateOwnerEntity(event.getTenantId(), event.getEntityId()); updateOwnerEntity(event.getTenantId(), event.getEntityId());
} else if (event.getEvent().equals(ComponentLifecycleEvent.DELETED)) { } else if (event.getEvent() == ComponentLifecycleEvent.DELETED) {
evictOwnerEntity(event.getEntityId()); evictOwnerEntity(event.getEntityId());
evictEntityCfs(event.getEntityId()); evictEntityCfs(event.getEntityId());
} }
break; break;
case DEVICE_PROFILE, ASSET_PROFILE: case DEVICE_PROFILE, ASSET_PROFILE:
if (event.getEvent().equals(ComponentLifecycleEvent.DELETED)) { if (event.getEvent() == ComponentLifecycleEvent.DELETED) {
evictEntityCfs(event.getEntityId()); evictEntityCfs(event.getEntityId());
} }
break; break;

Loading…
Cancel
Save