Removed invalid dependency

Andrii Shvaika
1 parent 936171b8
Showing 14 changed files with 386 additions and 196 deletions
application/src/main/java/org/thingsboard/server/controller/BaseController.java
application/src/main/java/org/thingsboard/server/controller/TbResourceController.java
application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
dao/src/main/java/org/thingsboard/server/dao/resource/BaseTbResourceService.java → application/src/main/java/org/thingsboard/server/service/resource/DefaultTbResourceService.java
common/dao-api/src/main/java/org/thingsboard/server/dao/resource/TbResourceService.java → application/src/main/java/org/thingsboard/server/service/resource/TbResourceService.java
application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
dao/src/test/java/org/thingsboard/server/dao/service/sql/TbResourceServiceSqlTest.java → application/src/test/java/org/thingsboard/server/service/ServiceSqlTestSuite.java
dao/src/test/java/org/thingsboard/server/dao/service/BaseTbResourceServiceTest.java → application/src/test/java/org/thingsboard/server/service/resource/BaseTbResourceServiceTest.java
common/dao-api/src/main/java/org/thingsboard/server/dao/resource/ResourceService.java
common/data/pom.xml
dao/pom.xml
dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java
--- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java
View file @f1d89ac
+++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
View file @f1d89ac
@@ -110,7 +110,6 @@ import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.oauth2.OAuth2ConfigTemplateService;
 import org.thingsboard.server.dao.oauth2.OAuth2Service;
 import org.thingsboard.server.dao.relation.RelationService;
-import org.thingsboard.server.dao.resource.TbResourceService;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.dao.tenant.TenantProfileService;
@@ -130,6 +129,7 @@ import org.thingsboard.server.service.edge.rpc.init.SyncEdgeService;
 import org.thingsboard.server.service.lwm2m.LwM2MModelsRepository;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
 import org.thingsboard.server.service.queue.TbClusterService;
+import org.thingsboard.server.service.resource.TbResourceService;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.AccessControlService;
 import org.thingsboard.server.service.security.permission.Operation;
--- a/application/src/main/java/org/thingsboard/server/controller/TbResourceController.java
View file @f1d89ac
+++ b/application/src/main/java/org/thingsboard/server/controller/TbResourceController.java
View file @f1d89ac
@@ -36,8 +36,8 @@ import org.thingsboard.server.common.data.lwm2m.LwM2mObject;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.security.Authority;
-import org.thingsboard.server.dao.resource.TbResourceService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.resource.TbResourceService;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
@@ -52,12 +52,6 @@ public class TbResourceController extends BaseController {
     public static final String RESOURCE_ID = "resourceId";
-    private final TbResourceService resourceService;
-
-    public TbResourceController(TbResourceService resourceService) {
-        this.resourceService = resourceService;
-    }
-
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
     @RequestMapping(value = "/resource/{resourceId}/download", method = RequestMethod.GET)
     @ResponseBody
--- a/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
View file @f1d89ac
+++ b/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
View file @f1d89ac
@@ -35,7 +35,7 @@ import org.thingsboard.server.common.data.widget.WidgetsBundle;
 import org.thingsboard.server.dao.dashboard.DashboardService;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.oauth2.OAuth2ConfigTemplateService;
-import org.thingsboard.server.dao.resource.TbResourceService;
+import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.widget.WidgetTypeService;
 import org.thingsboard.server.dao.widget.WidgetsBundleService;
@@ -97,7 +97,7 @@ public class InstallScripts {
     private OAuth2ConfigTemplateService oAuth2TemplateService;
     @Autowired
-    private TbResourceService resourceService;
+    private ResourceService resourceService;
     private Path getTenantRuleChainsDir() {
         return Paths.get(getDataDir(), JSON_DIR, TENANT_DIR, RULE_CHAINS_DIR);
--- a/application/src/main/java/org/thingsboard/server/service/resource/DefaultTbResourceService.java renamed from dao/src/main/java/org/thingsboard/server/dao/resource/BaseTbResourceService.java
View file @f1d89ac
+++ b/application/src/main/java/org/thingsboard/server/service/resource/DefaultTbResourceService.java renamed from dao/src/main/java/org/thingsboard/server/dao/resource/BaseTbResourceService.java
View file @f1d89ac
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.dao.resource;
+package org.thingsboard.server.service.resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -21,12 +21,12 @@ import org.eclipse.leshan.core.model.DDFFileParser;
 import org.eclipse.leshan.core.model.DefaultDDFFileValidator;
 import org.eclipse.leshan.core.model.InvalidDDFFileException;
 import org.eclipse.leshan.core.model.ObjectModel;
-import org.hibernate.exception.ConstraintViolationException;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.TbResource;
 import org.thingsboard.server.common.data.TbResourceInfo;
-import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.TbResourceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.lwm2m.LwM2mInstance;
@@ -35,11 +35,7 @@ import org.thingsboard.server.common.data.lwm2m.LwM2mResourceObserve;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.dao.exception.DataValidationException;
-import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.service.DataValidator;
-import org.thingsboard.server.dao.service.PaginatedRemover;
-import org.thingsboard.server.dao.service.Validator;
-import org.thingsboard.server.dao.tenant.TenantDao;
+import org.thingsboard.server.dao.resource.ResourceService;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -47,7 +43,6 @@ import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 import static org.thingsboard.server.common.data.lwm2m.LwM2mConstants.LWM2M_SEPARATOR_KEY;
@@ -55,139 +50,120 @@ import static org.thingsboard.server.common.data.lwm2m.LwM2mConstants.LWM2M_SEPA
 import static org.thingsboard.server.dao.device.DeviceServiceImpl.INCORRECT_TENANT_ID;
 import static org.thingsboard.server.dao.service.Validator.validateId;
-@Service
 @Slf4j
-public class BaseTbResourceService implements TbResourceService {
+@Service
+public class DefaultTbResourceService implements TbResourceService {
-    public static final String INCORRECT_RESOURCE_ID = "Incorrect resourceId ";
-    private final TbResourceDao resourceDao;
-    private final TbResourceInfoDao resourceInfoDao;
-    private final TenantDao tenantDao;
+    private final ResourceService resourceService;
     private final DDFFileParser ddfFileParser;
-    public BaseTbResourceService(TbResourceDao resourceDao, TbResourceInfoDao resourceInfoDao, TenantDao tenantDao) {
-        this.resourceDao = resourceDao;
-        this.resourceInfoDao = resourceInfoDao;
-        this.tenantDao = tenantDao;
+    public DefaultTbResourceService(ResourceService resourceService) {
+        this.resourceService = resourceService;
         this.ddfFileParser = new DDFFileParser(new DefaultDDFFileValidator());
     }
     @Override
-    public TbResource saveResource(TbResource resource) throws InvalidDDFFileException, IOException {
+    public TbResource saveResource(TbResource resource) throws ThingsboardException {
         log.trace("Executing saveResource [{}]", resource);
         if (StringUtils.isEmpty(resource.getData())) {
             throw new DataValidationException("Resource data should be specified!");
         }
         if (ResourceType.LWM2M_MODEL.equals(resource.getResourceType())) {
-            List<ObjectModel> objectModels =
-                    ddfFileParser.parseEx(new ByteArrayInputStream(Base64.getDecoder().decode(resource.getData())), resource.getSearchText());
-            if (!objectModels.isEmpty()) {
-                ObjectModel objectModel = objectModels.get(0);
-
-                String resourceKey = objectModel.id + LWM2M_SEPARATOR_KEY + objectModel.getVersion();
-                String name = objectModel.name;
-                resource.setResourceKey(resourceKey);
-                if (resource.getId() == null) {
-                    resource.setTitle(name + " id=" + objectModel.id + " v" + objectModel.getVersion());
+            try {
+                List<ObjectModel> objectModels =
+                        ddfFileParser.parseEx(new ByteArrayInputStream(Base64.getDecoder().decode(resource.getData())), resource.getSearchText());
+                if (!objectModels.isEmpty()) {
+                    ObjectModel objectModel = objectModels.get(0);
+
+                    String resourceKey = objectModel.id + LWM2M_SEPARATOR_KEY + objectModel.getVersion();
+                    String name = objectModel.name;
+                    resource.setResourceKey(resourceKey);
+                    if (resource.getId() == null) {
+                        resource.setTitle(name + " id=" + objectModel.id + " v" + objectModel.getVersion());
+                    }
+                    resource.setSearchText(resourceKey + LWM2M_SEPARATOR_SEARCH_TEXT + name);
+                } else {
+                    throw new DataValidationException(String.format("Could not parse the XML of objectModel with name %s", resource.getSearchText()));
                 }
-                resource.setSearchText(resourceKey + LWM2M_SEPARATOR_SEARCH_TEXT + name);
-            } else {
+            } catch (InvalidDDFFileException | IOException e) {
+                throw new ThingsboardException(e, ThingsboardErrorCode.GENERAL);
+            }
+            if (resource.getResourceType().equals(ResourceType.LWM2M_MODEL) && toLwM2mObject(resource) == null) {
                 throw new DataValidationException(String.format("Could not parse the XML of objectModel with name %s", resource.getSearchText()));
             }
         } else {
             resource.setResourceKey(resource.getFileName());
         }
-        resourceValidator.validate(resource, TbResourceInfo::getTenantId);
-
-        try {
-            return resourceDao.save(resource.getTenantId(), resource);
-        } catch (Exception t) {
-            ConstraintViolationException e = extractConstraintViolationException(t).orElse(null);
-            if (e != null && e.getConstraintName() != null && e.getConstraintName().equalsIgnoreCase("resource_unq_key")) {
-                String field = ResourceType.LWM2M_MODEL.equals(resource.getResourceType()) ? "resourceKey" : "fileName";
-                throw new DataValidationException("Resource with such " + field + " already exists!");
-            } else {
-                throw t;
-            }
-        }
-
+        return resourceService.saveResource(resource);
     }
     @Override
-    public TbResource getResource(TenantId tenantId, ResourceType resourceType, String resourceKey) {
-        log.trace("Executing getResource [{}] [{}] [{}]", tenantId, resourceType, resourceKey);
-        return resourceDao.getResource(tenantId, resourceType, resourceKey);
+    public TbResource getResource(TenantId tenantId, ResourceType resourceType, String resourceId) {
+        return resourceService.getResource(tenantId, resourceType, resourceId);
     }
     @Override
     public TbResource findResourceById(TenantId tenantId, TbResourceId resourceId) {
-        log.trace("Executing findResourceById [{}] [{}]", tenantId, resourceId);
-        Validator.validateId(resourceId, INCORRECT_RESOURCE_ID + resourceId);
-        return resourceDao.findById(tenantId, resourceId.getId());
+        return resourceService.findResourceById(tenantId, resourceId);
     }
     @Override
     public TbResourceInfo findResourceInfoById(TenantId tenantId, TbResourceId resourceId) {
-        log.trace("Executing findResourceInfoById [{}] [{}]", tenantId, resourceId);
-        Validator.validateId(resourceId, INCORRECT_RESOURCE_ID + resourceId);
-        return resourceInfoDao.findById(tenantId, resourceId.getId());
-    }
-
-    @Override
-    public void deleteResource(TenantId tenantId, TbResourceId resourceId) {
-        log.trace("Executing deleteResource [{}] [{}]", tenantId, resourceId);
-        Validator.validateId(resourceId, INCORRECT_RESOURCE_ID + resourceId);
-        resourceDao.removeById(tenantId, resourceId.getId());
+        return resourceService.findResourceInfoById(tenantId, resourceId);
     }
     @Override
     public PageData<TbResourceInfo> findAllTenantResourcesByTenantId(TenantId tenantId, PageLink pageLink) {
-        log.trace("Executing findAllTenantResourcesByTenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        return resourceInfoDao.findAllTenantResourcesByTenantId(tenantId.getId(), pageLink);
+        return resourceService.findAllTenantResourcesByTenantId(tenantId, pageLink);
     }
     @Override
     public PageData<TbResourceInfo> findTenantResourcesByTenantId(TenantId tenantId, PageLink pageLink) {
-        log.trace("Executing findTenantResourcesByTenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        return resourceInfoDao.findTenantResourcesByTenantId(tenantId.getId(), pageLink);
+        return resourceService.findTenantResourcesByTenantId(tenantId, pageLink);
     }
     @Override
-    public List<LwM2mObject> findLwM2mObjectPage(TenantId tenantId, String sortProperty, String sortOrder, PageLink pageLink) {
+    public List<LwM2mObject> findLwM2mObject(TenantId tenantId, String sortOrder, String sortProperty, String[] objectIds) {
         log.trace("Executing findByTenantId [{}]", tenantId);
         validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        PageData<TbResource> resourcePageData = resourceDao.findResourcesByTenantIdAndResourceType(
-                tenantId,
-                ResourceType.LWM2M_MODEL, pageLink);
-        return resourcePageData.getData().stream()
+        List<TbResource> resources = resourceService.findTenantResourcesByResourceTypeAndObjectIds(tenantId, ResourceType.LWM2M_MODEL,
+                objectIds);
+        return resources.stream()
                 .map(this::toLwM2mObject)
                 .sorted(getComparator(sortProperty, sortOrder))
                 .collect(Collectors.toList());
     }
     @Override
-    public List<LwM2mObject> findLwM2mObject(TenantId tenantId, String sortOrder,
-                                             String sortProperty,
-                                             String[] objectIds) {
+    public List<LwM2mObject> findLwM2mObjectPage(TenantId tenantId, String sortProperty, String sortOrder, PageLink pageLink) {
         log.trace("Executing findByTenantId [{}]", tenantId);
         validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        List<TbResource> resources = resourceDao.findResourcesByTenantIdAndResourceType(tenantId, ResourceType.LWM2M_MODEL,
-                objectIds,
-                null);
-        return resources.stream()
+        PageData<TbResource> resourcePageData = resourceService.findTenantResourcesByResourceTypeAndPageLink(tenantId, ResourceType.LWM2M_MODEL, pageLink);
+        return resourcePageData.getData().stream()
                 .map(this::toLwM2mObject)
                 .sorted(getComparator(sortProperty, sortOrder))
                 .collect(Collectors.toList());
     }
     @Override
+    public void deleteResource(TenantId tenantId, TbResourceId resourceId) {
+        resourceService.deleteResource(tenantId, resourceId);
+    }
+
+    @Override
     public void deleteResourcesByTenantId(TenantId tenantId) {
-        log.trace("Executing deleteResourcesByTenantId, tenantId [{}]", tenantId);
-        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        tenantResourcesRemover.removeEntities(tenantId, tenantId);
+        resourceService.deleteResourcesByTenantId(tenantId);
+    }
+
+    private Comparator<? super LwM2mObject> getComparator(String sortProperty, String sortOrder) {
+        Comparator<LwM2mObject> comparator;
+        if ("name".equals(sortProperty)) {
+            comparator = Comparator.comparing(LwM2mObject::getName);
+        } else {
+            comparator = Comparator.comparingLong(LwM2mObject::getId);
+        }
+        return "DESC".equals(sortOrder) ? comparator.reversed() : comparator;
     }
     private LwM2mObject toLwM2mObject(TbResource resource) {
@@ -223,69 +199,4 @@ public class BaseTbResourceService implements TbResourceService {
             return null;
         }
     }
-
-    private Comparator<? super LwM2mObject> getComparator(String sortProperty, String sortOrder) {
-        Comparator<LwM2mObject> comparator;
-        if ("name".equals(sortProperty)) {
-            comparator = Comparator.comparing(LwM2mObject::getName);
-        } else {
-            comparator = Comparator.comparingLong(LwM2mObject::getId);
-        }
-        return "DESC".equals(sortOrder) ? comparator.reversed() : comparator;
-    }
-
-    private DataValidator<TbResource> resourceValidator = new DataValidator<>() {
-
-        @Override
-        protected void validateDataImpl(TenantId tenantId, TbResource resource) {
-            if (StringUtils.isEmpty(resource.getTitle())) {
-                throw new DataValidationException("Resource title should be specified!");
-            }
-            if (resource.getResourceType() == null) {
-                throw new DataValidationException("Resource type should be specified!");
-            }
-            if (StringUtils.isEmpty(resource.getFileName())) {
-                throw new DataValidationException("Resource file name should be specified!");
-            }
-            if (StringUtils.isEmpty(resource.getResourceKey())) {
-                throw new DataValidationException("Resource key should be specified!");
-            }
-            if (resource.getTenantId() == null) {
-                resource.setTenantId(new TenantId(ModelConstants.NULL_UUID));
-            }
-            if (!resource.getTenantId().getId().equals(ModelConstants.NULL_UUID)) {
-                Tenant tenant = tenantDao.findById(tenantId, resource.getTenantId().getId());
-                if (tenant == null) {
-                    throw new DataValidationException("Resource is referencing to non-existent tenant!");
-                }
-            }
-            if (resource.getResourceType().equals(ResourceType.LWM2M_MODEL) && toLwM2mObject(resource) == null) {
-                throw new DataValidationException(String.format("Could not parse the XML of objectModel with name %s", resource.getSearchText()));
-            }
-        }
-    };
-
-    private PaginatedRemover<TenantId, TbResource> tenantResourcesRemover =
-            new PaginatedRemover<>() {
-
-                @Override
-                protected PageData<TbResource> findEntities(TenantId tenantId, TenantId id, PageLink pageLink) {
-                    return resourceDao.findAllByTenantId(id, pageLink);
-                }
-
-                @Override
-                protected void removeEntity(TenantId tenantId, TbResource entity) {
-                    deleteResource(tenantId, new TbResourceId(entity.getUuidId()));
-                }
-            };
-
-    protected Optional<ConstraintViolationException> extractConstraintViolationException(Exception t) {
-        if (t instanceof ConstraintViolationException) {
-            return Optional.of((ConstraintViolationException) t);
-        } else if (t.getCause() instanceof ConstraintViolationException) {
-            return Optional.of((ConstraintViolationException) (t.getCause()));
-        } else {
-            return Optional.empty();
-        }
-    }
 }
--- a/application/src/main/java/org/thingsboard/server/service/resource/TbResourceService.java renamed from common/dao-api/src/main/java/org/thingsboard/server/dao/resource/TbResourceService.java
View file @f1d89ac
+++ b/application/src/main/java/org/thingsboard/server/service/resource/TbResourceService.java renamed from common/dao-api/src/main/java/org/thingsboard/server/dao/resource/TbResourceService.java
View file @f1d89ac
@@ -13,24 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.dao.resource;
+package org.thingsboard.server.service.resource;
-import org.eclipse.leshan.core.model.InvalidDDFFileException;
+import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.TbResource;
 import org.thingsboard.server.common.data.TbResourceInfo;
-import org.thingsboard.server.common.data.ResourceType;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.TbResourceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.lwm2m.LwM2mObject;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
-import java.io.IOException;
 import java.util.List;
-
 public interface TbResourceService {
-    TbResource saveResource(TbResource resource) throws InvalidDDFFileException, IOException;
+
+    TbResource saveResource(TbResource resource) throws ThingsboardException;
     TbResource getResource(TenantId tenantId, ResourceType resourceType, String resourceId);
@@ -55,4 +54,5 @@ public interface TbResourceService {
     void deleteResource(TenantId tenantId, TbResourceId resourceId);
     void deleteResourcesByTenantId(TenantId tenantId);
+
 }
--- a/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
View file @f1d89ac
+++ b/application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
View file @f1d89ac
@@ -56,7 +56,7 @@ import org.thingsboard.server.dao.device.provision.ProvisionFailedException;
 import org.thingsboard.server.dao.device.provision.ProvisionRequest;
 import org.thingsboard.server.dao.device.provision.ProvisionResponse;
 import org.thingsboard.server.dao.relation.RelationService;
-import org.thingsboard.server.dao.resource.TbResourceService;
+import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.DeviceInfoProto;
@@ -108,7 +108,7 @@ public class DefaultTransportApiService implements TransportApiService {
     private final TbClusterService tbClusterService;
     private final DataDecodingEncodingService dataDecodingEncodingService;
     private final DeviceProvisionService deviceProvisionService;
-    private final TbResourceService resourceService;
+    private final ResourceService resourceService;
     private final ConcurrentMap<String, ReentrantLock> deviceCreationLocks = new ConcurrentHashMap<>();
@@ -117,7 +117,7 @@ public class DefaultTransportApiService implements TransportApiService {
                                       RelationService relationService, DeviceCredentialsService deviceCredentialsService,
                                       DeviceStateService deviceStateService, DbCallbackExecutorService dbCallbackExecutorService,
                                       TbClusterService tbClusterService, DataDecodingEncodingService dataDecodingEncodingService,
-                                      DeviceProvisionService deviceProvisionService, TbResourceService resourceService) {
+                                      DeviceProvisionService deviceProvisionService, ResourceService resourceService) {
         this.deviceProfileCache = deviceProfileCache;
         this.tenantProfileCache = tenantProfileCache;
         this.apiUsageStateService = apiUsageStateService;
--- a/application/src/test/java/org/thingsboard/server/service/ServiceSqlTestSuite.java renamed from dao/src/test/java/org/thingsboard/server/dao/service/sql/TbResourceServiceSqlTest.java
View file @f1d89ac
+++ b/application/src/test/java/org/thingsboard/server/service/ServiceSqlTestSuite.java renamed from dao/src/test/java/org/thingsboard/server/dao/service/sql/TbResourceServiceSqlTest.java
View file @f1d89ac
@@ -13,11 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.dao.service.sql;
+package org.thingsboard.server.service;
-import org.thingsboard.server.dao.service.BaseTbResourceServiceTest;
-import org.thingsboard.server.dao.service.DaoSqlTest;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.extensions.cpsuite.ClasspathSuite;
+import org.junit.runner.RunWith;
+import org.thingsboard.server.dao.CustomSqlUnit;
+import org.thingsboard.server.queue.memory.InMemoryStorage;
-@DaoSqlTest
-public class TbResourceServiceSqlTest extends BaseTbResourceServiceTest {
+import java.util.Arrays;
+
+@RunWith(ClasspathSuite.class)
+@ClasspathSuite.ClassnameFilters({
+        "org.thingsboard.server.service.resource.*Test",
+        })
+public class ServiceSqlTestSuite {
+
+    @ClassRule
+    public static CustomSqlUnit sqlUnit = new CustomSqlUnit(
+            Arrays.asList("sql/schema-types-hsql.sql", "sql/schema-ts-hsql.sql", "sql/schema-entities-hsql.sql", "sql/schema-entities-idx.sql", "sql/system-data.sql"),
+            "sql/hsql/drop-all-tables.sql",
+            "sql-test.properties");
+
+    @BeforeClass
+    public static void cleanupInMemStorage(){
+        InMemoryStorage.getInstance().cleanup();
+    }
 }
--- a/application/src/test/java/org/thingsboard/server/service/resource/BaseTbResourceServiceTest.java renamed from dao/src/test/java/org/thingsboard/server/dao/service/BaseTbResourceServiceTest.java
View file @f1d89ac
+++ b/application/src/test/java/org/thingsboard/server/service/resource/BaseTbResourceServiceTest.java renamed from dao/src/test/java/org/thingsboard/server/dao/service/BaseTbResourceServiceTest.java
View file @f1d89ac
@@ -13,28 +13,37 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.dao.service;
+package org.thingsboard.server.service.resource;
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.TbResource;
 import org.thingsboard.server.common.data.TbResourceInfo;
 import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.controller.AbstractControllerTest;
 import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.service.AbstractServiceTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collections;
 import java.util.List;
-public abstract class BaseTbResourceServiceTest extends AbstractServiceTest {
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@DaoSqlTest
+public class BaseTbResourceServiceTest extends AbstractControllerTest {
     private static final String LWM2M_TEST_MODEL = "<LWM2M xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"http://www.openmobilealliance.org/tech/profiles/LWM2M-v1_1.xsd\">\n" +
             "<Object ObjectType=\"MODefinition\">\n" +
@@ -67,18 +76,38 @@ public abstract class BaseTbResourceServiceTest extends AbstractServiceTest {
     private TenantId tenantId;
+    @Autowired
+    private TbResourceService resourceService;
+
+    private Tenant savedTenant;
+    private User tenantAdmin;
+
     @Before
-    public void before() {
+    public void beforeTest() throws Exception {
+        loginSysAdmin();
+
         Tenant tenant = new Tenant();
         tenant.setTitle("My tenant");
-        Tenant savedTenant = tenantService.saveTenant(tenant);
-        Assert.assertNotNull(savedTenant);
+        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
         tenantId = savedTenant.getId();
+        Assert.assertNotNull(savedTenant);
+
+        tenantAdmin = new User();
+        tenantAdmin.setAuthority(Authority.TENANT_ADMIN);
+        tenantAdmin.setTenantId(savedTenant.getId());
+        tenantAdmin.setEmail("tenant2@thingsboard.org");
+        tenantAdmin.setFirstName("Joe");
+        tenantAdmin.setLastName("Downs");
+
+        tenantAdmin = createUserAndLogin(tenantAdmin, "testPassword1");
     }
     @After
-    public void after() {
-        tenantService.deleteTenant(tenantId);
+    public void afterTest() throws Exception {
+        loginSysAdmin();
+
+        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
+                .andExpect(status().isOk());
     }
     @Test
@@ -239,9 +268,10 @@ public abstract class BaseTbResourceServiceTest extends AbstractServiceTest {
     @Test
     public void testFindTenantResourcesByTenantId() throws Exception {
+        loginSysAdmin();
         Tenant tenant = new Tenant();
         tenant.setTitle("Test tenant");
-        tenant = tenantService.saveTenant(tenant);
+        tenant = doPost("/api/tenant", tenant, Tenant.class);
         TenantId tenantId = tenant.getId();
@@ -279,14 +309,17 @@ public abstract class BaseTbResourceServiceTest extends AbstractServiceTest {
         Assert.assertFalse(pageData.hasNext());
         Assert.assertTrue(pageData.getData().isEmpty());
-        tenantService.deleteTenant(tenantId);
+        doDelete("/api/tenant/" + tenantId.getId().toString())
+                .andExpect(status().isOk());
     }
     @Test
     public void testFindAllTenantResourcesByTenantId() throws Exception {
+        loginSysAdmin();
+
         Tenant tenant = new Tenant();
         tenant.setTitle("Test tenant");
-        tenant = tenantService.saveTenant(tenant);
+        tenant = doPost("/api/tenant", tenant, Tenant.class);
         TenantId tenantId = tenant.getId();
@@ -344,7 +377,8 @@ public abstract class BaseTbResourceServiceTest extends AbstractServiceTest {
         Assert.assertFalse(pageData.hasNext());
         Assert.assertTrue(pageData.getData().isEmpty());
-        tenantService.deleteTenant(tenantId);
+        doDelete("/api/tenant/" + tenantId.getId().toString())
+                .andExpect(status().isOk());
     }
 }
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/resource/ResourceService.java 0 → 100644
View file @f1d89ac
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/resource/ResourceService.java 0 → 100644
View file @f1d89ac
+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.resource;
+
+import org.thingsboard.server.common.data.ResourceType;
+import org.thingsboard.server.common.data.TbResource;
+import org.thingsboard.server.common.data.TbResourceInfo;
+import org.thingsboard.server.common.data.id.TbResourceId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.page.PageLink;
+
+import java.util.List;
+
+public interface ResourceService {
+    TbResource saveResource(TbResource resource);
+
+    TbResource getResource(TenantId tenantId, ResourceType resourceType, String resourceId);
+
+    TbResource findResourceById(TenantId tenantId, TbResourceId resourceId);
+
+    TbResourceInfo findResourceInfoById(TenantId tenantId, TbResourceId resourceId);
+
+    PageData<TbResourceInfo> findAllTenantResourcesByTenantId(TenantId tenantId, PageLink pageLink);
+
+    PageData<TbResourceInfo> findTenantResourcesByTenantId(TenantId tenantId, PageLink pageLink);
+
+    List<TbResource> findTenantResourcesByResourceTypeAndObjectIds(TenantId tenantId, ResourceType lwm2mModel, String[] objectIds);
+
+    PageData<TbResource> findTenantResourcesByResourceTypeAndPageLink(TenantId tenantId, ResourceType lwm2mModel, PageLink pageLink);
+
+    void deleteResource(TenantId tenantId, TbResourceId resourceId);
+
+    void deleteResourcesByTenantId(TenantId tenantId);
+
+
+}
--- a/common/data/pom.xml
View file @f1d89ac
+++ b/common/data/pom.xml
View file @f1d89ac
@@ -87,10 +87,6 @@
             <groupId>org.thingsboard</groupId>
             <artifactId>protobuf-dynamic</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.leshan</groupId>
-            <artifactId>leshan-core</artifactId>
-        </dependency>
     </dependencies>
     <build>
--- a/dao/pom.xml
View file @f1d89ac
+++ b/dao/pom.xml
View file @f1d89ac
@@ -227,10 +227,6 @@
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>rest</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.leshan</groupId>
-            <artifactId>leshan-core</artifactId>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
--- a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java 0 → 100644
View file @f1d89ac
+++ b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java 0 → 100644
View file @f1d89ac
+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.resource;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.exception.ConstraintViolationException;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.ResourceType;
+import org.thingsboard.server.common.data.TbResource;
+import org.thingsboard.server.common.data.TbResourceInfo;
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.id.TbResourceId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.dao.service.DataValidator;
+import org.thingsboard.server.dao.service.PaginatedRemover;
+import org.thingsboard.server.dao.service.Validator;
+import org.thingsboard.server.dao.tenant.TenantDao;
+
+import java.util.List;
+import java.util.Optional;
+
+import static org.thingsboard.server.dao.device.DeviceServiceImpl.INCORRECT_TENANT_ID;
+import static org.thingsboard.server.dao.service.Validator.validateId;
+
+@Service
+@Slf4j
+public class BaseResourceService implements ResourceService {
+
+    public static final String INCORRECT_RESOURCE_ID = "Incorrect resourceId ";
+    private final TbResourceDao resourceDao;
+    private final TbResourceInfoDao resourceInfoDao;
+    private final TenantDao tenantDao;
+
+
+    public BaseResourceService(TbResourceDao resourceDao, TbResourceInfoDao resourceInfoDao, TenantDao tenantDao) {
+        this.resourceDao = resourceDao;
+        this.resourceInfoDao = resourceInfoDao;
+        this.tenantDao = tenantDao;
+    }
+
+    @Override
+    public TbResource saveResource(TbResource resource) {
+        resourceValidator.validate(resource, TbResourceInfo::getTenantId);
+
+        try {
+            return resourceDao.save(resource.getTenantId(), resource);
+        } catch (Exception t) {
+            ConstraintViolationException e = extractConstraintViolationException(t).orElse(null);
+            if (e != null && e.getConstraintName() != null && e.getConstraintName().equalsIgnoreCase("resource_unq_key")) {
+                String field = ResourceType.LWM2M_MODEL.equals(resource.getResourceType()) ? "resourceKey" : "fileName";
+                throw new DataValidationException("Resource with such " + field + " already exists!");
+            } else {
+                throw t;
+            }
+        }
+    }
+
+    @Override
+    public TbResource getResource(TenantId tenantId, ResourceType resourceType, String resourceKey) {
+        log.trace("Executing getResource [{}] [{}] [{}]", tenantId, resourceType, resourceKey);
+        return resourceDao.getResource(tenantId, resourceType, resourceKey);
+    }
+
+    @Override
+    public TbResource findResourceById(TenantId tenantId, TbResourceId resourceId) {
+        log.trace("Executing findResourceById [{}] [{}]", tenantId, resourceId);
+        Validator.validateId(resourceId, INCORRECT_RESOURCE_ID + resourceId);
+        return resourceDao.findById(tenantId, resourceId.getId());
+    }
+
+    @Override
+    public TbResourceInfo findResourceInfoById(TenantId tenantId, TbResourceId resourceId) {
+        log.trace("Executing findResourceInfoById [{}] [{}]", tenantId, resourceId);
+        Validator.validateId(resourceId, INCORRECT_RESOURCE_ID + resourceId);
+        return resourceInfoDao.findById(tenantId, resourceId.getId());
+    }
+
+    @Override
+    public void deleteResource(TenantId tenantId, TbResourceId resourceId) {
+        log.trace("Executing deleteResource [{}] [{}]", tenantId, resourceId);
+        Validator.validateId(resourceId, INCORRECT_RESOURCE_ID + resourceId);
+        resourceDao.removeById(tenantId, resourceId.getId());
+    }
+
+    @Override
+    public PageData<TbResourceInfo> findAllTenantResourcesByTenantId(TenantId tenantId, PageLink pageLink) {
+        log.trace("Executing findAllTenantResourcesByTenantId [{}]", tenantId);
+        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        return resourceInfoDao.findAllTenantResourcesByTenantId(tenantId.getId(), pageLink);
+    }
+
+    @Override
+    public PageData<TbResourceInfo> findTenantResourcesByTenantId(TenantId tenantId, PageLink pageLink) {
+        log.trace("Executing findTenantResourcesByTenantId [{}]", tenantId);
+        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        return resourceInfoDao.findTenantResourcesByTenantId(tenantId.getId(), pageLink);
+    }
+
+    @Override
+    public List<TbResource> findTenantResourcesByResourceTypeAndObjectIds(TenantId tenantId, ResourceType resourceType, String[] objectIds) {
+        log.trace("Executing findTenantResourcesByResourceTypeAndObjectIds [{}][{}][{}]", tenantId, resourceType, objectIds);
+        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        return resourceDao.findResourcesByTenantIdAndResourceType(tenantId, resourceType, objectIds, null);
+    }
+
+    @Override
+    public PageData<TbResource> findTenantResourcesByResourceTypeAndPageLink(TenantId tenantId, ResourceType resourceType, PageLink pageLink) {
+        log.trace("Executing findTenantResourcesByResourceTypeAndPageLink [{}][{}][{}]", tenantId, resourceType, pageLink);
+        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        return resourceDao.findResourcesByTenantIdAndResourceType(tenantId, resourceType, pageLink);
+    }
+
+    @Override
+    public void deleteResourcesByTenantId(TenantId tenantId) {
+        log.trace("Executing deleteResourcesByTenantId, tenantId [{}]", tenantId);
+        validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
+        tenantResourcesRemover.removeEntities(tenantId, tenantId);
+    }
+
+    private DataValidator<TbResource> resourceValidator = new DataValidator<>() {
+
+        @Override
+        protected void validateDataImpl(TenantId tenantId, TbResource resource) {
+            if (StringUtils.isEmpty(resource.getTitle())) {
+                throw new DataValidationException("Resource title should be specified!");
+            }
+            if (resource.getResourceType() == null) {
+                throw new DataValidationException("Resource type should be specified!");
+            }
+            if (StringUtils.isEmpty(resource.getFileName())) {
+                throw new DataValidationException("Resource file name should be specified!");
+            }
+            if (StringUtils.isEmpty(resource.getResourceKey())) {
+                throw new DataValidationException("Resource key should be specified!");
+            }
+            if (resource.getTenantId() == null) {
+                resource.setTenantId(new TenantId(ModelConstants.NULL_UUID));
+            }
+            if (!resource.getTenantId().getId().equals(ModelConstants.NULL_UUID)) {
+                Tenant tenant = tenantDao.findById(tenantId, resource.getTenantId().getId());
+                if (tenant == null) {
+                    throw new DataValidationException("Resource is referencing to non-existent tenant!");
+                }
+            }
+        }
+    };
+
+    private PaginatedRemover<TenantId, TbResource> tenantResourcesRemover =
+            new PaginatedRemover<>() {
+
+                @Override
+                protected PageData<TbResource> findEntities(TenantId tenantId, TenantId id, PageLink pageLink) {
+                    return resourceDao.findAllByTenantId(id, pageLink);
+                }
+
+                @Override
+                protected void removeEntity(TenantId tenantId, TbResource entity) {
+                    deleteResource(tenantId, new TbResourceId(entity.getUuidId()));
+                }
+            };
+
+    protected Optional<ConstraintViolationException> extractConstraintViolationException(Exception t) {
+        if (t instanceof ConstraintViolationException) {
+            return Optional.of((ConstraintViolationException) t);
+        } else if (t.getCause() instanceof ConstraintViolationException) {
+            return Optional.of((ConstraintViolationException) (t.getCause()));
+        } else {
+            return Optional.empty();
+        }
+    }
+}
--- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
View file @f1d89ac
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
View file @f1d89ac
@@ -35,7 +35,7 @@ import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.entity.AbstractEntityService;
 import org.thingsboard.server.dao.entityview.EntityViewService;
 import org.thingsboard.server.dao.exception.DataValidationException;
-import org.thingsboard.server.dao.resource.TbResourceService;
+import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.service.DataValidator;
 import org.thingsboard.server.dao.service.PaginatedRemover;
@@ -90,7 +90,7 @@ public class TenantServiceImpl extends AbstractEntityService implements TenantSe
     private RuleChainService ruleChainService;
     @Autowired
-    private TbResourceService resourceService;
+    private ResourceService resourceService;
     @Override
     public Tenant findTenantById(TenantId tenantId) {
--- a/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java
View file @f1d89ac
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java
View file @f1d89ac
@@ -54,7 +54,7 @@ import org.thingsboard.server.dao.entity.EntityService;
 import org.thingsboard.server.dao.entityview.EntityViewService;
 import org.thingsboard.server.dao.event.EventService;
 import org.thingsboard.server.dao.relation.RelationService;
-import org.thingsboard.server.dao.resource.TbResourceService;
+import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.settings.AdminSettingsService;
 import org.thingsboard.server.dao.tenant.TenantProfileService;
@@ -152,9 +152,9 @@ public abstract class AbstractServiceTest {
     protected DeviceProfileService deviceProfileService;
     @Autowired
-    protected TbResourceService resourceService;
+    protected ResourceService resourceService;
-    class IdComparator<D extends HasId> implements Comparator<D> {
+    public class IdComparator<D extends HasId> implements Comparator<D> {
         @Override
         public int compare(D o1, D o2) {
             return o1.getId().getId().compareTo(o2.getId().getId());