dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Was fixed cache to pass tests

Browse Source
This commit is contained in:
viktorbasanets 2018-09-17 17:27:37 +03:00
parent 06d59ed62a
commit 7bfccc0f8b
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
View File

@ -51,6 +51,7 @@ import org.thingsboard.server.dao.tenant.TenantDao;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -88,7 +89,6 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
@Autowired @Autowired
private CacheManager cacheManager; private CacheManager cacheManager;
@Cacheable(cacheNames = ENTITY_VIEW_CACHE, key = "{#entityViewId.getId()}")
@Override @Override
public EntityView findEntityViewById(EntityViewId entityViewId) { public EntityView findEntityViewById(EntityViewId entityViewId) {
log.trace("Executing findEntityViewById [{}]", entityViewId); log.trace("Executing findEntityViewById [{}]", entityViewId);
@ -105,7 +105,7 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
.orElse(null); .orElse(null);
} }
@CacheEvict(cacheNames = ENTITY_VIEW_CACHE, key = "{#entityView.id, #entityView.tenantId, #entityView.name}") @CacheEvict(cacheNames = ENTITY_VIEW_CACHE, key = "{#entityView.tenantId, #entityView.name}")
@Override @Override
public EntityView saveEntityView(EntityView entityView) { public EntityView saveEntityView(EntityView entityView) {
log.trace("Executing save entity view [{}]", entityView); log.trace("Executing save entity view [{}]", entityView);
@ -173,9 +173,7 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
validateId(entityViewId, INCORRECT_ENTITY_VIEW_ID + entityViewId); validateId(entityViewId, INCORRECT_ENTITY_VIEW_ID + entityViewId);
deleteEntityRelations(entityViewId); deleteEntityRelations(entityViewId);
EntityView entityView = entityViewDao.findById(entityViewId.getId()); EntityView entityView = entityViewDao.findById(entityViewId.getId());
cache.evict(entityView.getId()); cache.evict(Arrays.asList(entityView.getTenantId(), entityView.getName()));
cache.evict(entityView.getTenantId());
cache.evict(entityView.getName());
entityViewDao.removeById(entityViewId.getId()); entityViewDao.removeById(entityViewId.getId());
} }
@ -310,9 +308,6 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
@Override @Override
protected void validateDataImpl(EntityView entityView) { protected void validateDataImpl(EntityView entityView) {
if (StringUtils.isEmpty(entityView.getKeys().toString())) {
throw new DataValidationException("Entity view type should be specified!");
}
if (StringUtils.isEmpty(entityView.getName())) { if (StringUtils.isEmpty(entityView.getName())) {
throw new DataValidationException("Entity view name should be specified!"); throw new DataValidationException("Entity view name should be specified!");
} }