Commit 7bfccc0f8b09e5d2063f88c9b92f16b84cc2577c

Authored by viktorbasanets
1 parent 06d59ed6

Was fixed cache to pass tests

... ... @@ -51,6 +51,7 @@ import org.thingsboard.server.dao.tenant.TenantDao;
51 51
52 52 import javax.annotation.Nullable;
53 53 import java.util.ArrayList;
  54 +import java.util.Arrays;
54 55 import java.util.Collection;
55 56 import java.util.List;
56 57 import java.util.stream.Collectors;
... ... @@ -88,7 +89,6 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
88 89 @Autowired
89 90 private CacheManager cacheManager;
90 91
91   - @Cacheable(cacheNames = ENTITY_VIEW_CACHE, key = "{#entityViewId.getId()}")
92 92 @Override
93 93 public EntityView findEntityViewById(EntityViewId entityViewId) {
94 94 log.trace("Executing findEntityViewById [{}]", entityViewId);
... ... @@ -105,7 +105,7 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
105 105 .orElse(null);
106 106 }
107 107
108   - @CacheEvict(cacheNames = ENTITY_VIEW_CACHE, key = "{#entityView.id, #entityView.tenantId, #entityView.name}")
  108 + @CacheEvict(cacheNames = ENTITY_VIEW_CACHE, key = "{#entityView.tenantId, #entityView.name}")
109 109 @Override
110 110 public EntityView saveEntityView(EntityView entityView) {
111 111 log.trace("Executing save entity view [{}]", entityView);
... ... @@ -173,9 +173,7 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
173 173 validateId(entityViewId, INCORRECT_ENTITY_VIEW_ID + entityViewId);
174 174 deleteEntityRelations(entityViewId);
175 175 EntityView entityView = entityViewDao.findById(entityViewId.getId());
176   - cache.evict(entityView.getId());
177   - cache.evict(entityView.getTenantId());
178   - cache.evict(entityView.getName());
  176 + cache.evict(Arrays.asList(entityView.getTenantId(), entityView.getName()));
179 177 entityViewDao.removeById(entityViewId.getId());
180 178 }
181 179
... ... @@ -310,9 +308,6 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
310 308
311 309 @Override
312 310 protected void validateDataImpl(EntityView entityView) {
313   - if (StringUtils.isEmpty(entityView.getKeys().toString())) {
314   - throw new DataValidationException("Entity view type should be specified!");
315   - }
316 311 if (StringUtils.isEmpty(entityView.getName())) {
317 312 throw new DataValidationException("Entity view name should be specified!");
318 313 }
... ...