From 410d197a340b1db3ebe71ee023a86659b5f38403 Mon Sep 17 00:00:00 2001
From: Andrew Shvayka <ashvayka@thingsboard.io>
Date: Tue, 30 May 2017 13:14:51 +0300
Subject: [PATCH] Fixed Implementation of DAO and services after merge

---
 .../org/thingsboard/server/dao/alarm/BaseAlarmService.java  | 2 +-
 .../org/thingsboard/server/dao/alarm/CassandraAlarmDao.java | 6 +++++-
 .../org/thingsboard/server/dao/asset/BaseAssetService.java  | 6 +++---
 .../org/thingsboard/server/dao/asset/CassandraAssetDao.java | 6 ------
 .../thingsboard/server/dao/device/DeviceServiceImpl.java    | 2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
index 77cc574757..262a11b62c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
@@ -193,7 +193,7 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
     public ListenableFuture<Alarm> findAlarmByIdAsync(AlarmId alarmId) {
         log.trace("Executing findAlarmById [{}]", alarmId);
         validateId(alarmId, "Incorrect alarmId " + alarmId);
-        return alarmDao.findByIdAsync(alarmId.getId());
+        return alarmDao.findAlarmByIdAsync(alarmId.getId());
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/CassandraAlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/CassandraAlarmDao.java
index 926127e89d..343d4cc41a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/alarm/CassandraAlarmDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/CassandraAlarmDao.java
@@ -102,6 +102,10 @@ public class CassandraAlarmDao extends CassandraAbstractModelDao<AlarmEntity, Al
 
     @Override
     public ListenableFuture<Alarm> findAlarmByIdAsync(UUID key) {
-        return findByIdAsync(key);
+        log.debug("Get alarm by id {}", key);
+        Select.Where query = select().from(ALARM_BY_ID_VIEW_NAME).where(eq(ModelConstants.ID_PROPERTY, key));
+        query.limit(1);
+        log.trace("Execute query {}", query);
+        return findOneByStatementAsync(query);
     }
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java b/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
index a3cd65e191..a6fea21543 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
@@ -226,7 +226,7 @@ public class BaseAssetService extends AbstractEntityService implements AssetServ
                 (Function<List<TenantAssetType>, List<TenantAssetType>>) assetTypeEntities -> {
                     List<TenantAssetType> assetTypes = new ArrayList<>();
                     for (TenantAssetType assetType : assetTypeEntities) {
-                        if (assetType.getTenantId().equals(tenantId.getId())) {
+                        if (assetType.getTenantId().equals(tenantId)) {
                             assetTypes.add(assetType);
                         }
                     }
@@ -252,7 +252,7 @@ public class BaseAssetService extends AbstractEntityService implements AssetServ
                 protected void validateUpdate(Asset asset) {
                     assetDao.findAssetsByTenantIdAndName(asset.getTenantId().getId(), asset.getName()).ifPresent(
                             d -> {
-                                if (!d.getId().equals(asset.getUuidId())) {
+                                if (!d.getId().equals(asset.getId())) {
                                     throw new DataValidationException("Asset with such name already exists!");
                                 }
                             }
@@ -282,7 +282,7 @@ public class BaseAssetService extends AbstractEntityService implements AssetServ
                         if (customer == null) {
                             throw new DataValidationException("Can't assign asset to non-existent customer!");
                         }
-                        if (!customer.getTenantId().equals(asset.getTenantId().getId())) {
+                        if (!customer.getTenantId().equals(asset.getTenantId())) {
                             throw new DataValidationException("Can't assign asset to customer from different tenant!");
                         }
                     }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/CassandraAssetDao.java b/dao/src/main/java/org/thingsboard/server/dao/asset/CassandraAssetDao.java
index d53a2e4b6b..d78b93189a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/CassandraAssetDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/CassandraAssetDao.java
@@ -54,12 +54,6 @@ public class CassandraAssetDao extends CassandraAbstractSearchTextDao<AssetEntit
         return ASSET_COLUMN_FAMILY_NAME;
     }
 
-    @Override
-    public Asset save(Asset asset) {
-        log.debug("Save asset [{}] ", asset);
-        return save(asset);
-    }
-
     @Override
     public List<Asset> findAssetsByTenantId(UUID tenantId, TextPageLink pageLink) {
         log.debug("Try to find assets by tenantId [{}] and pageLink [{}]", tenantId, pageLink);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
index fe1997e934..b06faa17c1 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
@@ -246,7 +246,7 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe
             (Function<List<TenantDeviceType>, List<TenantDeviceType>>) deviceTypeEntities -> {
                 List<TenantDeviceType> deviceTypes = new ArrayList<>();
                 for (TenantDeviceType deviceType : deviceTypeEntities) {
-                    if (deviceType.getTenantId().equals(tenantId.getId())) {
+                    if (deviceType.getTenantId().equals(tenantId)) {
                         deviceTypes.add(deviceType);
                     }
                 }