Fixes for JPA DAO tests

dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java

@@ -28,8 +28,6 @@ import org.thingsboard.server.dao.model.BaseEntity;
 import java.util.List;
 import java.util.UUID;
 
-import static org.springframework.transaction.annotation.Propagation.REQUIRES_NEW;
-
 /**
  * @author Valerii Sosliuk
  */

dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java

@@ -20,8 +20,8 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;
 import org.thingsboard.server.common.data.asset.TenantAssetType;
-import org.thingsboard.server.dao.util.SqlDao;
 import org.thingsboard.server.dao.model.sql.AssetEntity;
+import org.thingsboard.server.dao.util.SqlDao;
 
 import java.util.List;
 import java.util.UUID;

dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java

@@ -24,7 +24,7 @@ import java.util.Arrays;
 
 @RunWith(ClasspathSuite.class)
 @ClassnameFilters({
-        "org.thingsboard.server.dao.sql.*AASDTest"
+        "org.thingsboard.server.dao.sql.alarm.JpaAlarmDaoTest"
 })
 public class JpaDaoTestSuite {
 

dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java

@@ -51,7 +51,6 @@ public class JpaDbunitTestConfig {
         DatabaseDataSourceConnectionFactoryBean databaseDataSourceConnectionFactoryBean = new DatabaseDataSourceConnectionFactoryBean();
         databaseDataSourceConnectionFactoryBean.setDatabaseConfig(databaseConfigBean());
         databaseDataSourceConnectionFactoryBean.setDataSource(dataSource);
-        databaseDataSourceConnectionFactoryBean.setSchema("public");
         return databaseDataSourceConnectionFactoryBean;
     }
 }

dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java

@@ -18,8 +18,6 @@ package org.thingsboard.server.dao.sql.alarm;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
-import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmId;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
@@ -27,7 +25,6 @@ import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.AbstractJpaDaoTest;
 import org.thingsboard.server.dao.alarm.AlarmDao;
-import org.thingsboard.server.dao.model.sql.AlarmEntity;
 
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
@@ -43,8 +40,6 @@ public class JpaAlarmDaoTest extends AbstractJpaDaoTest {
     @Autowired
     private AlarmDao alarmDao;
 
-    @Autowired
-    private AlarmRepository alarmRepository;
 
     @Test
     public void testFindLatestByOriginatorAndType() throws ExecutionException, InterruptedException {
@@ -59,9 +54,6 @@ public class JpaAlarmDaoTest extends AbstractJpaDaoTest {
         saveAlarm(alarm2Id, tenantId, originator1Id, "TEST_ALARM");
         saveAlarm(alarm3Id, tenantId, originator2Id, "TEST_ALARM");
         assertEquals(3, alarmDao.find().size());
-        AlarmEntity alarmEntity = alarmRepository.findLatestByOriginatorAndType(
-                tenantId, originator1Id, EntityType.DEVICE, "TEST_ALARM", new PageRequest(0, 1)).get(0);
-        assertNotNull(alarmEntity);
         ListenableFuture<Alarm> future = alarmDao
                 .findLatestByOriginatorAndType(new TenantId(tenantId), new DeviceId(originator1Id), "TEST_ALARM");
         Alarm alarm = future.get();
@@ -69,11 +61,6 @@ public class JpaAlarmDaoTest extends AbstractJpaDaoTest {
         assertEquals(alarm2Id, alarm.getId().getId());
     }
 
-    @Test
-    public void testFindAlarmByIdAsync() {
-        // TODO: implement
-    }
-
     private void saveAlarm(UUID id, UUID tenantId, UUID deviceId, String type) {
         Alarm alarm = new Alarm();
         alarm.setId(new AlarmId(id));

dao/src/test/resources/dbunit/device_credentials.xml

@@ -1,14 +1,14 @@
 <dataset>
     <device_credentials
-            id="958e3314-3215-11e7-93ae-92361f002671"
+            id="uuid'958e3314-3215-11e7-93ae-92361f002671'"
-            device_id="958e3a30-3215-11e7-93ae-92361f002671"
+            device_id="uuid'958e3a30-3215-11e7-93ae-92361f002671'"
             credentials_type="ACCESS_TOKEN"
             credentials_id="ID_1"
             credentials_value="ACCESS_TOKEN_1"
     />
     <device_credentials
-            id="958e3c74-3215-11e7-93ae-92361f002671"
+            id="uuid'958e3c74-3215-11e7-93ae-92361f002671'"
-            device_id="958e3e5e-3215-11e7-93ae-92361f002671"
+            device_id="uuid'958e3e5e-3215-11e7-93ae-92361f002671'"
             credentials_type="ACCESS_TOKEN"
             credentials_id="ID_2"
             credentials_value="ACCESS_TOKEN_2"

dao/src/test/resources/dbunit/event.xml

@@ -1,18 +1,18 @@
 <dataset>
     <event
-        id="be41c7a2-31f5-11e7-9cfd-2786e6aa2046"
+        id="uuid'be41c7a2-31f5-11e7-9cfd-2786e6aa2046'"
-        tenant_id="be41c7a0-31f5-11e7-9cfd-2786e6aa2046"
+        tenant_id="uuid'be41c7a0-31f5-11e7-9cfd-2786e6aa2046'"
-        entity_id="be41c7a1-31f5-11e7-9cfd-2786e6aa2046"
+        entity_id="uuid'be41c7a1-31f5-11e7-9cfd-2786e6aa2046'"
         entity_type="DEVICE"
         event_type="STATS"
-        event_uid="be41c7a3-31f5-11e7-9cfd-2786e6aa2046"
+        event_uid="uuid'be41c7a3-31f5-11e7-9cfd-2786e6aa2046'"
     />
     <event
-        id="be41c7a4-31f5-11e7-9cfd-2786e6aa2046"
+        id="uuid'be41c7a4-31f5-11e7-9cfd-2786e6aa2046'"
-        tenant_id="be41c7a0-31f5-11e7-9cfd-2786e6aa2046"
+        tenant_id="uuid'be41c7a0-31f5-11e7-9cfd-2786e6aa2046'"
-        entity_id="be41c7a1-31f5-11e7-9cfd-2786e6aa2046"
+        entity_id="uuid'be41c7a1-31f5-11e7-9cfd-2786e6aa2046'"
         entity_type="DEVICE"
         event_type="STATS"
-        event_uid="be41c7a5-31f5-11e7-9cfd-2786e6aa2046"
+        event_uid="uuid'be41c7a5-31f5-11e7-9cfd-2786e6aa2046'"
     />
 </dataset>

dao/src/test/resources/dbunit/rule.xml

@@ -1,31 +1,31 @@
 <dataset>
     <rule
-        id="8e834e11-2e0a-11e7-83ec-f7f6dbfb4833"
+        id="uuid'8e834e11-2e0a-11e7-83ec-f7f6dbfb4833'"
-        tenant_id="8e834e10-2e0a-11e7-83ec-f7f6dbfb4833"
+        tenant_id="uuid'8e834e10-2e0a-11e7-83ec-f7f6dbfb4833'"
         name="RULE_11"
         weight="1"
         search_text="rule_11"
         plugin_token="token_1"
     />
     <rule
-        id="8e834e12-2e0a-11e7-83ec-f7f6dbfb4833"
+        id="uuid'8e834e12-2e0a-11e7-83ec-f7f6dbfb4833'"
-        tenant_id="8e834e10-2e0a-11e7-83ec-f7f6dbfb4833"
+        tenant_id="uuid'8e834e10-2e0a-11e7-83ec-f7f6dbfb4833'"
         name="RULE_12"
         weight="1"
         search_text="rule_12"
         plugin_token="token_1"
     />
     <rule
-        id="8e834e13-2e0a-11e7-83ec-f7f6dbfb4833"
+        id="uuid'8e834e13-2e0a-11e7-83ec-f7f6dbfb4833'"
-        tenant_id="8e834e10-2e0a-11e7-83ec-f7f6dbfb4833"
+        tenant_id="uuid'8e834e10-2e0a-11e7-83ec-f7f6dbfb4833'"
         name="RULE_13"
         weight="1"
         search_text="rule_13"
         plugin_token="token_1"
     />
     <rule
-        id="8e834e14-2e0a-11e7-83ec-f7f6dbfb4833"
+        id="uuid'8e834e14-2e0a-11e7-83ec-f7f6dbfb4833'"
-        tenant_id="8e834e10-2e0a-11e7-83ec-f7f6dbfb4833"
+        tenant_id="uuid'8e834e10-2e0a-11e7-83ec-f7f6dbfb4833'"
         name="RULE_14"
         weight="2"
         search_text="rule_14"

dao/src/test/resources/dbunit/user.xml

@@ -1,41 +1,41 @@
 <dataset>
-    <tb_user id="9cb58ba0-27c1-11e7-93ae-92361f002671"
+    <tb_user id="uuid'9cb58ba0-27c1-11e7-93ae-92361f002671'"
-          tenant_id="c97ea14e-27c1-11e7-93ae-92361f002671"
+          tenant_id="uuid'c97ea14e-27c1-11e7-93ae-92361f002671'"
-          customer_id="cdf9c79e-27c1-11e7-93ae-92361f002671"
+          customer_id="uuid'cdf9c79e-27c1-11e7-93ae-92361f002671'"
           authority="SYS_ADMIN"
           email="sysadm@thingsboard.org"
           search_text="SYSADM SEARCH TEXT"
           first_name="John"
           last_name="Doe"
     />
-    <tb_user id="1312f328-27c7-11e7-93ae-92361f002671"
+    <tb_user id="uuid'1312f328-27c7-11e7-93ae-92361f002671'"
-          tenant_id="1e1cd4c8-27c7-11e7-93ae-92361f002671"
+          tenant_id="uuid'1e1cd4c8-27c7-11e7-93ae-92361f002671'"
           authority="TENANT_ADMIN"
           email="tenantadm1@thingsboard.org"
           search_text="TENANTADM1 SEARCH TEXT"
           first_name="Samuel"
           last_name="Serif"
     />
-    <tb_user id="2b090dde-27ca-11e7-93ae-92361f002671"
+    <tb_user id="uuid'2b090dde-27ca-11e7-93ae-92361f002671'"
-          tenant_id="1e1cd4c8-27c7-11e7-93ae-92361f002671"
+          tenant_id="uuid'1e1cd4c8-27c7-11e7-93ae-92361f002671'"
           authority="TENANT_ADMIN"
           email="tenantadm2@thingsboard.org"
           search_text="TENANTADM2 SEARCH TEXT"
           first_name="Penny"
           last_name="Morgan"
     />
-    <tb_user id="cc8c1ca8-27c7-11e7-93ae-92361f002671"
+    <tb_user id="uuid'cc8c1ca8-27c7-11e7-93ae-92361f002671'"
-          tenant_id="d2e27caa-27c7-11e7-93ae-92361f002671"
+          tenant_id="uuid'd2e27caa-27c7-11e7-93ae-92361f002671'"
-          customer_id="d89e128a-27c7-11e7-93ae-92361f002671"
+          customer_id="uuid'd89e128a-27c7-11e7-93ae-92361f002671'"
           authority="CUSTOMER_USER"
           email="customeruser@thingsboard.org"
           search_text="CUSTOMER USER SEARCH TEXT"
           first_name="Norman"
           last_name="Gordon"
     />
-    <tb_user id="edb2de58-27c7-11e7-93ae-92361f002671"
+    <tb_user id="uuid'edb2de58-27c7-11e7-93ae-92361f002671'"
-          tenant_id="f229675e-27c7-11e7-93ae-92361f002671"
+          tenant_id="uuid'f229675e-27c7-11e7-93ae-92361f002671'"
-          customer_id="f7a3d4e4-27c7-11e7-93ae-92361f002671"
+          customer_id="uuid'f7a3d4e4-27c7-11e7-93ae-92361f002671'"
           authority="REFRESH_TOKEN"
           email="refreshtoken@thingsboard.org"
           search_text="REFRESH TOKEN SEARCH TEXT"

dao/src/test/resources/dbunit/user_credentials.xml

@@ -1,15 +1,15 @@
 <dataset>
     <user_credentials
-        id="3ed10af0-27d5-11e7-93ae-92361f002671"
+        id="uuid'3ed10af0-27d5-11e7-93ae-92361f002671'"
-        user_id="44ee8552-27d5-11e7-93ae-92361f002671"
+        user_id="uuid'44ee8552-27d5-11e7-93ae-92361f002671'"
         enabled="true"
         password="password"
         activate_token="ACTIVATE_TOKEN_1"
         reset_token="RESET_TOKEN_1"
     />
     <user_credentials
-        id="4b9e010c-27d5-11e7-93ae-92361f002671"
+        id="uuid'4b9e010c-27d5-11e7-93ae-92361f002671'"
-        user_id="787827e6-27d7-11e7-93ae-92361f002671"
+        user_id="uuid'787827e6-27d7-11e7-93ae-92361f002671'"
         enabled="true"
         password="password"
         activate_token="ACTIVATE_TOKEN_2"

dao/src/test/resources/dbunit/widget_type.xml

@@ -1,28 +1,28 @@
 <dataset>
     <widget_type
-        id="2b7e4c91-2dfe-11e7-94aa-f7f6dbfb4833"
+        id="uuid'2b7e4c91-2dfe-11e7-94aa-f7f6dbfb4833'"
-        tenant_id="2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833"
+        tenant_id="uuid'2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833'"
         bundle_alias="BUNDLE_ALIAS_1"
         alias="ALIAS1"
         name="ALIAS1"
     />
     <widget_type
-        id="2b7e4c92-2dfe-11e7-94aa-f7f6dbfb4833"
+        id="uuid'2b7e4c92-2dfe-11e7-94aa-f7f6dbfb4833'"
-        tenant_id="2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833"
+        tenant_id="uuid'2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833'"
         bundle_alias="BUNDLE_ALIAS_1"
         alias="ALIAS2"
         name="ALIAS2"
     />
     <widget_type
-        id="2b7e4c93-2dfe-11e7-94aa-f7f6dbfb4833"
+        id="uuid'2b7e4c93-2dfe-11e7-94aa-f7f6dbfb4833'"
-        tenant_id="2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833"
+        tenant_id="uuid'2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833'"
         bundle_alias="BUNDLE_ALIAS_1"
         alias="ALIAS3"
         name="ALIAS3"
     />
     <widget_type
-        id="2b7e4c94-2dfe-11e7-94aa-f7f6dbfb4833"
+        id="uuid'2b7e4c94-2dfe-11e7-94aa-f7f6dbfb4833'"
-        tenant_id="2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833"
+        tenant_id="uuid'2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833'"
         bundle_alias="BUNDLE_ALIAS_2"
         alias="ALIAS4"
         name="ALIAS4"

dao/src/test/resources/dbunit/widgets_bundle.xml

@@ -1,45 +1,45 @@
 <dataset>
     <widgets_bundle
-        id="250ac7b4-2825-11e7-93ae-92361f002671"
+        id="uuid'250ac7b4-2825-11e7-93ae-92361f002671'"
-        tenant_id="250aca8e-2825-11e7-93ae-92361f002671"
+        tenant_id="uuid'250aca8e-2825-11e7-93ae-92361f002671'"
         alias="WB1"
         title="Widgets Bundle 1"
         search_text="WB SEARCH TEXT 1"
     />
     <widgets_bundle
-        id="3269c18a-2825-11e7-93ae-92361f002671"
+        id="uuid'3269c18a-2825-11e7-93ae-92361f002671'"
-        tenant_id="3269c18a-2825-11e7-93ae-92361f002671"
+        tenant_id="uuid'3269c18a-2825-11e7-93ae-92361f002671'"
         alias="WB2"
         title="Widgets Bundle 2"
         search_text="WB SEARCH TEXT 2"
     />
     <widgets_bundle
-        id="44e6af4e-2825-11e7-93ae-92361f002671"
+        id="uuid'44e6af4e-2825-11e7-93ae-92361f002671'"
-        tenant_id="250aca8e-2825-11e7-93ae-92361f002671"
+        tenant_id="uuid'250aca8e-2825-11e7-93ae-92361f002671'"
         alias="WB3"
         title="Widgets Bundle 3"
         search_text="WB SEARCH TEXT 3"
     />
     <widgets_bundle
-        id="696dc9b4-2830-11e7-93ae-92361f002671"
+        id="uuid'696dc9b4-2830-11e7-93ae-92361f002671'"
         alias="WB4"
         title="Widgets Bundle 4"
         search_text="SYSTEM BUNDLE 1"
     />
     <widgets_bundle
-        id="1a83fc50-2840-11e7-93ae-92361f002671"
+        id="uuid'1a83fc50-2840-11e7-93ae-92361f002671'"
         alias="WB5"
         title="Widgets Bundle 5"
         search_text="SYSTEM BUNDLE 2"
     />
     <widgets_bundle
-        id="6a593dde-2841-11e7-93ae-92361f002671"
+        id="uuid'6a593dde-2841-11e7-93ae-92361f002671'"
         alias="WB6"
         title="Widgets Bundle 6"
         search_text="SYSTEM BUNDLE 1"
     />
     <widgets_bundle
-        id="3beb4b1a-294d-11e7-93ae-92361f002671"
+        id="uuid'3beb4b1a-294d-11e7-93ae-92361f002671'"
         alias="WB6"
         title="Widgets Bundle 7"
         search_text="ABC DEF"