Browse Source

Test fixed. Moving classes into new packages

pull/152/head
Volodymyr Babak 9 years ago
parent
commit
1983235b3f
  1. 2
      application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java
  2. 2
      dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java
  3. 2
      dao/src/main/java/org/thingsboard/server/dao/NoSqlDaoConfig.java
  4. 4
      dao/src/main/java/org/thingsboard/server/dao/alarm/CassandraAlarmDao.java
  5. 4
      dao/src/main/java/org/thingsboard/server/dao/asset/CassandraAssetDao.java
  6. 4
      dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java
  7. 2
      dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java
  8. 2
      dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraQueryOptions.java
  9. 2
      dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraSocketOptions.java
  10. 8
      dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java
  11. 4
      dao/src/main/java/org/thingsboard/server/dao/customer/CassandraCustomerDao.java
  12. 4
      dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardDao.java
  13. 4
      dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardInfoDao.java
  14. 4
      dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceCredentialsDao.java
  15. 4
      dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceDao.java
  16. 3
      dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java
  17. 4
      dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java
  18. 8
      dao/src/main/java/org/thingsboard/server/dao/model/nosql/EventEntity.java
  19. 2
      dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java
  20. 2
      dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java
  21. 2
      dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java
  22. 2
      dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java
  23. 2
      dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java
  24. 2
      dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java
  25. 2
      dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java
  26. 2
      dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java
  27. 2
      dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java
  28. 2
      dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java
  29. 2
      dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java
  30. 2
      dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java
  31. 2
      dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java
  32. 2
      dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java
  33. 2
      dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractAsyncDao.java
  34. 2
      dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractDao.java
  35. 5
      dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractModelDao.java
  36. 2
      dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractSearchTextDao.java
  37. 2
      dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractSearchTimeDao.java
  38. 4
      dao/src/main/java/org/thingsboard/server/dao/plugin/CassandraBasePluginDao.java
  39. 6
      dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java
  40. 4
      dao/src/main/java/org/thingsboard/server/dao/rule/CassandraBaseRuleDao.java
  41. 4
      dao/src/main/java/org/thingsboard/server/dao/settings/CassandraAdminSettingsDao.java
  42. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java
  43. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
  44. 3
      dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java
  45. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java
  46. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java
  47. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java
  48. 10
      dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java
  49. 8
      dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java
  50. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java
  51. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java
  52. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java
  53. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardRepository.java
  54. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java
  55. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java
  56. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceCredentialsRepository.java
  57. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java
  58. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java
  59. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java
  60. 13
      dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java
  61. 6
      dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java
  62. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java
  63. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/plugin/PluginMetaDataRepository.java
  64. 3
      dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java
  65. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java
  66. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java
  67. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleMetaDataRepository.java
  68. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java
  69. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java
  70. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java
  71. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java
  72. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvLatestRepository.java
  73. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvRepository.java
  74. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java
  75. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java
  76. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java
  77. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java
  78. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetTypeRepository.java
  79. 2
      dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java
  80. 4
      dao/src/main/java/org/thingsboard/server/dao/tenant/CassandraTenantDao.java
  81. 4
      dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java
  82. 5
      dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserCredentialsDao.java
  83. 4
      dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserDao.java
  84. 2
      dao/src/main/java/org/thingsboard/server/dao/util/NoSqlDao.java
  85. 2
      dao/src/main/java/org/thingsboard/server/dao/util/SqlDao.java
  86. 2
      dao/src/main/java/org/thingsboard/server/dao/util/mapping/AbstractJsonSqlTypeDescriptor.java
  87. 2
      dao/src/main/java/org/thingsboard/server/dao/util/mapping/JacksonUtil.java
  88. 2
      dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonStringSqlTypeDescriptor.java
  89. 2
      dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonStringType.java
  90. 2
      dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonTypeDescriptor.java
  91. 4
      dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetTypeDao.java
  92. 4
      dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetsBundleDao.java
  93. 3
      dao/src/main/resources/postgres/schema.sql
  94. 2
      dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java
  95. 4
      dao/src/test/java/org/thingsboard/server/dao/CustomPostgresUnit.java
  96. 22
      dao/src/test/java/org/thingsboard/server/dao/DaoServiceTestSuite.java
  97. 37
      dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java
  98. 2
      dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java
  99. 2
      dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java
  100. 12
      dao/src/test/java/org/thingsboard/server/dao/service/BaseAdminSettingsServiceTest.java

2
application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java

@ -80,7 +80,7 @@ import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppC
@ActiveProfiles("test")
@RunWith(SpringRunner.class)
@ContextConfiguration(classes = AbstractControllerTest.class, loader = SpringBootContextLoader.class)
@TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:application-test.properties"})
@TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:application-test.properties", "classpath:nosql-test.properties"})
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
@Configuration
@ComponentScan({"org.thingsboard.server"})

2
dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java

@ -21,7 +21,7 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
/**
* @author Valerii Sosliuk

2
dao/src/main/java/org/thingsboard/server/dao/NoSqlDaoConfig.java

@ -20,7 +20,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
import org.springframework.context.annotation.Configuration;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.util.NoSqlDao;
@Configuration
@EnableAutoConfiguration(

4
dao/src/main/java/org/thingsboard/server/dao/alarm/CassandraAlarmDao.java

@ -33,8 +33,8 @@ import org.thingsboard.server.common.data.id.EntityId;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.relation.EntityRelation;
import org.thingsboard.server.common.data.relation.RelationTypeGroup;
import org.thingsboard.server.dao.CassandraAbstractModelDao;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractModelDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.nosql.AlarmEntity;
import org.thingsboard.server.dao.relation.RelationDao;

4
dao/src/main/java/org/thingsboard/server/dao/asset/CassandraAssetDao.java

@ -27,9 +27,9 @@ import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.asset.Asset;
import org.thingsboard.server.common.data.asset.TenantAssetType;
import org.thingsboard.server.common.data.page.TextPageLink;
import org.thingsboard.server.dao.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.TenantAssetTypeEntity;
import org.thingsboard.server.dao.model.nosql.AssetEntity;

4
dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java

@ -26,8 +26,8 @@ import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.id.EntityId;
import org.thingsboard.server.common.data.kv.AttributeKvEntry;
import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
import org.thingsboard.server.dao.CassandraAbstractAsyncDao;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractAsyncDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.timeseries.CassandraBaseTimeseriesDao;

2
dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java

@ -26,7 +26,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;

2
dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraQueryOptions.java

@ -21,12 +21,14 @@ import lombok.Data;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
import org.thingsboard.server.dao.util.NoSqlDao;
import javax.annotation.PostConstruct;
@Component
@Configuration
@Data
@NoSqlDao
public class CassandraQueryOptions {
@Value("${cassandra.query.default_fetch_size}")

2
dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraSocketOptions.java

@ -20,12 +20,14 @@ import lombok.Data;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
import org.thingsboard.server.dao.util.NoSqlDao;
import javax.annotation.PostConstruct;
@Component
@Configuration
@Data
@NoSqlDao
public class CassandraSocketOptions {
@Value("${cassandra.socket.connect_timeout}")

8
dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java

@ -27,9 +27,9 @@ import org.thingsboard.server.common.data.page.TextPageLink;
import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
import org.thingsboard.server.common.data.plugin.ComponentScope;
import org.thingsboard.server.common.data.plugin.ComponentType;
import org.thingsboard.server.dao.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.nosql.ComponentDescriptorEntity;
@ -102,7 +102,7 @@ public class CassandraBaseComponentDescriptorDao extends CassandraAbstractSearch
public List<ComponentDescriptor> findByTypeAndPageLink(ComponentType type, TextPageLink pageLink) {
log.debug("Try to find component by type [{}] and pageLink [{}]", type, pageLink);
List<ComponentDescriptorEntity> entities = findPageWithTextSearch(ModelConstants.COMPONENT_DESCRIPTOR_BY_TYPE_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME,
Arrays.asList(eq(ModelConstants.COMPONENT_DESCRIPTOR_TYPE_PROPERTY, type.name())), pageLink);
Arrays.asList(eq(ModelConstants.COMPONENT_DESCRIPTOR_TYPE_PROPERTY, type)), pageLink);
if (log.isTraceEnabled()) {
log.trace("Search result: [{}]", Arrays.toString(entities.toArray()));
} else {
@ -115,7 +115,7 @@ public class CassandraBaseComponentDescriptorDao extends CassandraAbstractSearch
public List<ComponentDescriptor> findByScopeAndTypeAndPageLink(ComponentScope scope, ComponentType type, TextPageLink pageLink) {
log.debug("Try to find component by scope [{}] and type [{}] and pageLink [{}]", scope, type, pageLink);
List<ComponentDescriptorEntity> entities = findPageWithTextSearch(ModelConstants.COMPONENT_DESCRIPTOR_BY_SCOPE_TYPE_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME,
Arrays.asList(eq(ModelConstants.COMPONENT_DESCRIPTOR_TYPE_PROPERTY, type.name()),
Arrays.asList(eq(ModelConstants.COMPONENT_DESCRIPTOR_TYPE_PROPERTY, type),
eq(ModelConstants.COMPONENT_DESCRIPTOR_SCOPE_PROPERTY, scope.name())), pageLink);
if (log.isTraceEnabled()) {
log.trace("Search result: [{}]", Arrays.toString(entities.toArray()));

4
dao/src/main/java/org/thingsboard/server/dao/customer/CassandraCustomerDao.java

@ -20,9 +20,9 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.Customer;
import org.thingsboard.server.common.data.page.TextPageLink;
import org.thingsboard.server.dao.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.nosql.CustomerEntity;

4
dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardDao.java

@ -17,8 +17,8 @@ package org.thingsboard.server.dao.dashboard;
import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.Dashboard;
import org.thingsboard.server.dao.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.nosql.DashboardEntity;
import static org.thingsboard.server.dao.model.ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME;

4
dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardInfoDao.java

@ -19,9 +19,9 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.DashboardInfo;
import org.thingsboard.server.common.data.page.TextPageLink;
import org.thingsboard.server.dao.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.nosql.DashboardInfoEntity;
import java.util.Arrays;

4
dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceCredentialsDao.java

@ -19,9 +19,9 @@ import com.datastax.driver.core.querybuilder.Select.Where;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.security.DeviceCredentials;
import org.thingsboard.server.dao.CassandraAbstractModelDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractModelDao;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.nosql.DeviceCredentialsEntity;

4
dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceDao.java

@ -27,9 +27,9 @@ import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.Device;
import org.thingsboard.server.common.data.TenantDeviceType;
import org.thingsboard.server.common.data.page.TextPageLink;
import org.thingsboard.server.dao.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.TenantDeviceTypeEntity;
import org.thingsboard.server.dao.model.nosql.DeviceEntity;

3
dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java

@ -49,8 +49,7 @@ public class BaseEventService implements EventService {
if (StringUtils.isEmpty(event.getUid())) {
throw new DataValidationException("Event uid should be specified!.");
}
Optional<Event> result = eventDao.saveIfNotExists(event);
return result.isPresent() ? Optional.of(result.get()) : Optional.empty();
return eventDao.saveIfNotExists(event);
}
@Override

4
dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java

@ -28,9 +28,9 @@ import org.thingsboard.server.common.data.id.EntityId;
import org.thingsboard.server.common.data.id.EventId;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.page.TimePageLink;
import org.thingsboard.server.dao.CassandraAbstractSearchTimeDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractSearchTimeDao;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.nosql.EventEntity;

8
dao/src/main/java/org/thingsboard/server/dao/model/nosql/EventEntity.java

@ -22,15 +22,17 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.common.data.Event;
import org.thingsboard.server.common.data.id.*;
import org.thingsboard.server.common.data.id.EntityIdFactory;
import org.thingsboard.server.common.data.id.EventId;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.dao.model.BaseEntity;
import org.thingsboard.server.dao.model.type.EntityTypeCodec;
import org.thingsboard.server.dao.model.type.JsonCodec;
import static org.thingsboard.server.dao.model.ModelConstants.*;
import java.util.UUID;
import static org.thingsboard.server.dao.model.ModelConstants.*;
/**
* @author Andrew Shvayka
*/

2
dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java

@ -23,7 +23,7 @@ import org.hibernate.annotations.TypeDef;
import org.thingsboard.server.common.data.AdminSettings;
import org.thingsboard.server.common.data.id.AdminSettingsId;
import org.thingsboard.server.dao.model.BaseEntity;
import org.thingsboard.server.dao.util.JsonStringType;
import org.thingsboard.server.dao.util.mapping.JsonStringType;
import javax.persistence.*;
import java.util.UUID;

2
dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java

@ -29,7 +29,7 @@ import org.thingsboard.server.common.data.id.EntityIdFactory;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.dao.model.BaseEntity;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.util.JsonStringType;
import org.thingsboard.server.dao.util.mapping.JsonStringType;
import javax.persistence.*;
import java.util.UUID;

2
dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java

@ -26,7 +26,7 @@ import org.thingsboard.server.common.data.id.CustomerId;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.SearchTextEntity;
import org.thingsboard.server.dao.util.JsonStringType;
import org.thingsboard.server.dao.util.mapping.JsonStringType;
import javax.persistence.*;
import java.util.UUID;

2
dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java

@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.plugin.ComponentScope;
import org.thingsboard.server.common.data.plugin.ComponentType;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.SearchTextEntity;
import org.thingsboard.server.dao.util.JsonStringType;
import org.thingsboard.server.dao.util.mapping.JsonStringType;
import javax.persistence.*;
import java.util.UUID;

2
dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java

@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.id.CustomerId;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.SearchTextEntity;
import org.thingsboard.server.dao.util.JsonStringType;
import org.thingsboard.server.dao.util.mapping.JsonStringType;
import javax.persistence.*;
import java.util.UUID;

2
dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java

@ -26,7 +26,7 @@ import org.thingsboard.server.common.data.id.DashboardId;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.SearchTextEntity;
import org.thingsboard.server.dao.util.JsonStringType;
import org.thingsboard.server.dao.util.mapping.JsonStringType;
import javax.persistence.*;
import java.util.UUID;

2
dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java

@ -26,7 +26,7 @@ import org.thingsboard.server.common.data.id.DeviceId;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.SearchTextEntity;
import org.thingsboard.server.dao.util.JsonStringType;
import org.thingsboard.server.dao.util.mapping.JsonStringType;
import javax.persistence.*;
import java.util.UUID;

2
dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java

@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.common.data.Event;
import org.thingsboard.server.common.data.id.*;
import org.thingsboard.server.dao.model.BaseEntity;
import org.thingsboard.server.dao.util.JsonStringType;
import org.thingsboard.server.dao.util.mapping.JsonStringType;
import javax.persistence.*;
import java.util.UUID;

2
dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java

@ -26,7 +26,7 @@ import org.thingsboard.server.common.data.plugin.ComponentLifecycleState;
import org.thingsboard.server.common.data.plugin.PluginMetaData;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.SearchTextEntity;
import org.thingsboard.server.dao.util.JsonStringType;
import org.thingsboard.server.dao.util.mapping.JsonStringType;
import javax.persistence.*;
import java.util.UUID;

2
dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java

@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.id.EntityIdFactory;
import org.thingsboard.server.common.data.relation.EntityRelation;
import org.thingsboard.server.common.data.relation.RelationTypeGroup;
import org.thingsboard.server.dao.model.ToData;
import org.thingsboard.server.dao.util.JsonStringType;
import org.thingsboard.server.dao.util.mapping.JsonStringType;
import javax.persistence.*;
import java.util.UUID;

2
dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java

@ -27,7 +27,7 @@ import org.thingsboard.server.common.data.rule.RuleMetaData;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.SearchTextEntity;
import org.thingsboard.server.dao.util.JsonStringType;
import org.thingsboard.server.dao.util.mapping.JsonStringType;
import javax.persistence.*;
import java.util.UUID;

2
dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java

@ -24,7 +24,7 @@ import org.thingsboard.server.common.data.Tenant;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.SearchTextEntity;
import org.thingsboard.server.dao.util.JsonStringType;
import org.thingsboard.server.dao.util.mapping.JsonStringType;
import javax.persistence.*;
import java.util.UUID;

2
dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java

@ -27,7 +27,7 @@ import org.thingsboard.server.common.data.id.UserId;
import org.thingsboard.server.common.data.security.Authority;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.SearchTextEntity;
import org.thingsboard.server.dao.util.JsonStringType;
import org.thingsboard.server.dao.util.mapping.JsonStringType;
import javax.persistence.*;
import java.util.UUID;

2
dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java

@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.id.WidgetTypeId;
import org.thingsboard.server.common.data.widget.WidgetType;
import org.thingsboard.server.dao.model.BaseEntity;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.util.JsonStringType;
import org.thingsboard.server.dao.util.mapping.JsonStringType;
import javax.persistence.*;
import java.util.UUID;

2
dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractAsyncDao.java → dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractAsyncDao.java

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thingsboard.server.dao;
package org.thingsboard.server.dao.nosql;
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.ResultSetFuture;

2
dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractDao.java → dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractDao.java

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thingsboard.server.dao;
package org.thingsboard.server.dao.nosql;
import com.datastax.driver.core.*;
import com.datastax.driver.core.exceptions.CodecNotFoundException;

5
dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractModelDao.java → dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractModelDao.java

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thingsboard.server.dao;
package org.thingsboard.server.dao.nosql;
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.ResultSetFuture;
@ -27,9 +27,10 @@ import com.google.common.base.Function;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import lombok.extern.slf4j.Slf4j;
import org.thingsboard.server.dao.Dao;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.model.BaseEntity;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.SearchTextEntity;
import org.thingsboard.server.dao.model.wrapper.EntityResultSet;
import javax.annotation.Nullable;

2
dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTextDao.java → dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractSearchTextDao.java

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thingsboard.server.dao;
package org.thingsboard.server.dao.nosql;
import com.datastax.driver.core.querybuilder.Clause;
import com.datastax.driver.core.querybuilder.QueryBuilder;

2
dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTimeDao.java → dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractSearchTimeDao.java

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thingsboard.server.dao;
package org.thingsboard.server.dao.nosql;
import com.datastax.driver.core.querybuilder.Clause;
import com.datastax.driver.core.querybuilder.Ordering;

4
dao/src/main/java/org/thingsboard/server/dao/plugin/CassandraBasePluginDao.java

@ -22,9 +22,9 @@ import org.thingsboard.server.common.data.id.PluginId;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.page.TextPageLink;
import org.thingsboard.server.common.data.plugin.PluginMetaData;
import org.thingsboard.server.dao.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.nosql.PluginMetaDataEntity;

6
dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java

@ -28,9 +28,9 @@ import org.thingsboard.server.common.data.id.EntityIdFactory;
import org.thingsboard.server.common.data.page.TimePageLink;
import org.thingsboard.server.common.data.relation.EntityRelation;
import org.thingsboard.server.common.data.relation.RelationTypeGroup;
import org.thingsboard.server.dao.CassandraAbstractAsyncDao;
import org.thingsboard.server.dao.CassandraAbstractSearchTimeDao;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractAsyncDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractSearchTimeDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.type.RelationTypeGroupCodec;

4
dao/src/main/java/org/thingsboard/server/dao/rule/CassandraBaseRuleDao.java

@ -22,9 +22,9 @@ import org.thingsboard.server.common.data.id.RuleId;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.page.TextPageLink;
import org.thingsboard.server.common.data.rule.RuleMetaData;
import org.thingsboard.server.dao.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.nosql.RuleMetaDataEntity;

4
dao/src/main/java/org/thingsboard/server/dao/settings/CassandraAdminSettingsDao.java

@ -19,9 +19,9 @@ import com.datastax.driver.core.querybuilder.Select.Where;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.AdminSettings;
import org.thingsboard.server.dao.CassandraAbstractModelDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractModelDao;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.nosql.AdminSettingsEntity;
import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;

2
dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java

@ -20,7 +20,7 @@ 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.EntityType;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.AlarmEntity;
import java.util.List;

2
dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java

@ -37,7 +37,7 @@ import org.thingsboard.server.common.data.relation.RelationTypeGroup;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.alarm.AlarmDao;
import org.thingsboard.server.dao.alarm.BaseAlarmService;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.AlarmEntity;
import org.thingsboard.server.dao.relation.RelationDao;
import org.thingsboard.server.dao.sql.JpaAbstractDao;

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

@ -15,13 +15,12 @@
*/
package org.thingsboard.server.dao.sql.asset;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
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.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.AssetEntity;
import java.util.List;

2
dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java

@ -24,7 +24,7 @@ import org.thingsboard.server.common.data.asset.Asset;
import org.thingsboard.server.common.data.asset.TenantAssetType;
import org.thingsboard.server.common.data.page.TextPageLink;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.asset.AssetDao;
import org.thingsboard.server.dao.model.sql.AssetEntity;
import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;

2
dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java

@ -17,7 +17,7 @@ package org.thingsboard.server.dao.sql.attributes;
import org.springframework.data.repository.CrudRepository;
import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.AttributeKvCompositeKey;
import org.thingsboard.server.dao.model.sql.AttributeKvEntity;

2
dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java

@ -23,7 +23,7 @@ import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.id.EntityId;
import org.thingsboard.server.common.data.kv.AttributeKvEntry;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.attributes.AttributesDao;
import org.thingsboard.server.dao.model.sql.AttributeKvCompositeKey;
import org.thingsboard.server.dao.model.sql.AttributeKvEntity;

10
dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java

@ -19,7 +19,9 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.query.Param;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.common.data.plugin.ComponentScope;
import org.thingsboard.server.common.data.plugin.ComponentType;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.ComponentDescriptorEntity;
import java.util.List;
@ -36,7 +38,7 @@ public interface ComponentDescriptorRepository extends CrudRepository<ComponentD
@Query("SELECT cd FROM ComponentDescriptorEntity cd WHERE cd.type = :type " +
"AND LOWER(cd.searchText) LIKE LOWER(CONCAT(:textSearch, '%')) " +
"AND cd.id > :idOffset ORDER BY cd.id")
List<ComponentDescriptorEntity> findByType(@Param("type") String type,
List<ComponentDescriptorEntity> findByType(@Param("type") ComponentType type,
@Param("textSearch") String textSearch,
@Param("idOffset") UUID idOffset,
Pageable pageable);
@ -44,8 +46,8 @@ public interface ComponentDescriptorRepository extends CrudRepository<ComponentD
@Query("SELECT cd FROM ComponentDescriptorEntity cd WHERE cd.type = :type " +
"AND cd.scope = :scope AND LOWER(cd.searchText) LIKE LOWER(CONCAT(:textSearch, '%')) " +
"AND cd.id > :idOffset ORDER BY cd.id")
List<ComponentDescriptorEntity> findByScopeAndType(@Param("type") String type,
@Param("scope") String scope,
List<ComponentDescriptorEntity> findByScopeAndType(@Param("type") ComponentType type,
@Param("scope") ComponentScope scope,
@Param("textSearch") String textSearch,
@Param("idOffset") UUID idOffset,
Pageable pageable);

8
dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java

@ -26,7 +26,7 @@ import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
import org.thingsboard.server.common.data.plugin.ComponentScope;
import org.thingsboard.server.common.data.plugin.ComponentType;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.component.ComponentDescriptorDao;
import org.thingsboard.server.dao.model.sql.ComponentDescriptorEntity;
import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
@ -85,7 +85,7 @@ public class JpaBaseComponentDescriptorDao extends JpaAbstractSearchTextDao<Comp
public List<ComponentDescriptor> findByTypeAndPageLink(ComponentType type, TextPageLink pageLink) {
return DaoUtil.convertDataList(componentDescriptorRepository
.findByType(
type.toString(),
type,
Objects.toString(pageLink.getTextSearch(), ""),
pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(),
new PageRequest(0, pageLink.getLimit())));
@ -95,8 +95,8 @@ public class JpaBaseComponentDescriptorDao extends JpaAbstractSearchTextDao<Comp
public List<ComponentDescriptor> findByScopeAndTypeAndPageLink(ComponentScope scope, ComponentType type, TextPageLink pageLink) {
return DaoUtil.convertDataList(componentDescriptorRepository
.findByScopeAndType(
type.toString(),
scope.toString(),
type,
scope,
Objects.toString(pageLink.getTextSearch(), ""),
pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(),
new PageRequest(0, pageLink.getLimit())));

2
dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java

@ -19,7 +19,7 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.query.Param;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.CustomerEntity;
import java.util.List;

2
dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java

@ -22,7 +22,7 @@ import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.Customer;
import org.thingsboard.server.common.data.page.TextPageLink;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.customer.CustomerDao;
import org.thingsboard.server.dao.model.sql.CustomerEntity;
import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;

2
dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java

@ -19,7 +19,7 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.query.Param;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.DashboardInfoEntity;
import java.util.List;

2
dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardRepository.java

@ -16,7 +16,7 @@
package org.thingsboard.server.dao.sql.dashboard;
import org.springframework.data.repository.CrudRepository;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.DashboardEntity;
import java.util.UUID;

2
dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java

@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.Dashboard;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.dashboard.DashboardDao;
import org.thingsboard.server.dao.model.sql.DashboardEntity;
import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;

2
dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java

@ -22,7 +22,7 @@ import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.DashboardInfo;
import org.thingsboard.server.common.data.page.TextPageLink;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.dashboard.DashboardInfoDao;
import org.thingsboard.server.dao.model.sql.DashboardInfoEntity;
import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;

2
dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceCredentialsRepository.java

@ -16,7 +16,7 @@
package org.thingsboard.server.dao.sql.device;
import org.springframework.data.repository.CrudRepository;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.DeviceCredentialsEntity;
import java.util.UUID;

2
dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java

@ -19,7 +19,7 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.query.Param;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.DeviceEntity;
import org.thingsboard.server.dao.model.sql.TenantDeviceTypeEntity;

2
dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java

@ -20,7 +20,7 @@ import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.security.DeviceCredentials;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.device.DeviceCredentialsDao;
import org.thingsboard.server.dao.model.sql.DeviceCredentialsEntity;
import org.thingsboard.server.dao.sql.JpaAbstractDao;

2
dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java

@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.TenantDeviceType;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.page.TextPageLink;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.device.DeviceDao;
import org.thingsboard.server.dao.model.sql.DeviceEntity;
import org.thingsboard.server.dao.model.sql.TenantDeviceTypeEntity;

13
dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java

@ -18,8 +18,8 @@ package org.thingsboard.server.dao.sql.event;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.CrudRepository;
import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.model.sql.EventEntity;
import org.thingsboard.server.dao.util.SqlDao;
import java.util.UUID;
@ -29,6 +29,13 @@ import java.util.UUID;
@SqlDao
public interface EventRepository extends CrudRepository<EventEntity, UUID>, JpaSpecificationExecutor<EventEntity> {
EventEntity findByTenantIdAndEntityTypeAndEntityIdAndEventTypeAndEventUid(
UUID tenantId, EntityType entityType, UUID id, String eventType, String eventUid);
EventEntity findByTenantIdAndEntityTypeAndEntityIdAndEventTypeAndEventUid(UUID tenantId,
EntityType entityType,
UUID entityId,
String eventType,
String eventUid);
EventEntity findByTenantIdAndEntityTypeAndEntityId(UUID tenantId,
EntityType entityType,
UUID entityId);
}

6
dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java

@ -30,7 +30,7 @@ import org.thingsboard.server.common.data.id.EntityId;
import org.thingsboard.server.common.data.id.EventId;
import org.thingsboard.server.common.data.page.TimePageLink;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.event.EventDao;
import org.thingsboard.server.dao.model.sql.EventEntity;
import org.thingsboard.server.dao.sql.JpaAbstractSearchTimeDao;
@ -98,6 +98,7 @@ public class JpaBaseEventDao extends JpaAbstractSearchTimeDao<EventEntity, Event
public List<Event> findEvents(UUID tenantId, EntityId entityId, TimePageLink pageLink) {
return findEvents(tenantId, entityId, null, pageLink);
}
@Override
public List<Event> findEvents(UUID tenantId, EntityId entityId, String eventType, TimePageLink pageLink) {
Specification<EventEntity> timeSearchSpec = JpaAbstractSearchTimeDao.<EventEntity>getTimeSearchPageSpec(pageLink, "id");
@ -119,7 +120,8 @@ public class JpaBaseEventDao extends JpaAbstractSearchTimeDao<EventEntity, Event
if (StringUtils.isEmpty(entity.getEventUid())) {
entity.setEventUid(entity.getId().toString());
}
if (ifNotExists && findById(entity.getId()) != null) {
if (ifNotExists &&
eventRepository.findByTenantIdAndEntityTypeAndEntityId(entity.getTenantId(), entity.getEntityType(), entity.getEntityId()) != null) {
return Optional.empty();
}
return Optional.of(DaoUtil.getData(eventRepository.save(entity)));

2
dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java

@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.page.TextPageLink;
import org.thingsboard.server.common.data.plugin.PluginMetaData;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.PluginMetaDataEntity;
import org.thingsboard.server.dao.plugin.PluginDao;
import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;

2
dao/src/main/java/org/thingsboard/server/dao/sql/plugin/PluginMetaDataRepository.java

@ -19,7 +19,7 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.query.Param;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.PluginMetaDataEntity;
import java.util.List;

3
dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java

@ -30,7 +30,7 @@ import org.thingsboard.server.common.data.page.TimePageLink;
import org.thingsboard.server.common.data.relation.EntityRelation;
import org.thingsboard.server.common.data.relation.RelationTypeGroup;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.RelationCompositeKey;
import org.thingsboard.server.dao.model.sql.RelationEntity;
import org.thingsboard.server.dao.relation.RelationDao;
@ -46,7 +46,6 @@ import java.util.List;
import static org.springframework.data.domain.Sort.Direction.ASC;
import static org.springframework.data.jpa.domain.Specifications.where;
import static org.thingsboard.server.dao.model.ModelConstants.*;
/**
* Created by Valerii Sosliuk on 5/29/2017.

2
dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java

@ -17,7 +17,7 @@ package org.thingsboard.server.dao.sql.relation;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.CrudRepository;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.RelationCompositeKey;
import org.thingsboard.server.dao.model.sql.RelationEntity;

2
dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java

@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.page.TextPageLink;
import org.thingsboard.server.common.data.rule.RuleMetaData;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.RuleMetaDataEntity;
import org.thingsboard.server.dao.rule.RuleDao;
import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;

2
dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleMetaDataRepository.java

@ -19,7 +19,7 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.query.Param;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.RuleMetaDataEntity;
import java.util.List;

2
dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java

@ -21,7 +21,7 @@ import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.AdminSettings;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.AdminSettingsEntity;
import org.thingsboard.server.dao.settings.AdminSettingsDao;
import org.thingsboard.server.dao.sql.JpaAbstractDao;

2
dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java

@ -22,7 +22,7 @@ import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.Tenant;
import org.thingsboard.server.common.data.page.TextPageLink;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.TenantEntity;
import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
import org.thingsboard.server.dao.tenant.TenantDao;

2
dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java

@ -19,7 +19,7 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.query.Param;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.TenantEntity;
import java.util.List;

2
dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java

@ -28,7 +28,7 @@ import org.thingsboard.server.common.data.kv.Aggregation;
import org.thingsboard.server.common.data.kv.TsKvEntry;
import org.thingsboard.server.common.data.kv.TsKvQuery;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.TsKvEntity;
import org.thingsboard.server.dao.model.sql.TsKvLatestCompositeKey;
import org.thingsboard.server.dao.model.sql.TsKvLatestEntity;

2
dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvLatestRepository.java

@ -17,7 +17,7 @@ package org.thingsboard.server.dao.sql.timeseries;
import org.springframework.data.repository.CrudRepository;
import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.TsKvLatestCompositeKey;
import org.thingsboard.server.dao.model.sql.TsKvLatestEntity;

2
dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvRepository.java

@ -20,7 +20,7 @@ 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.EntityType;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.TsKvCompositeKey;
import org.thingsboard.server.dao.model.sql.TsKvEntity;

2
dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java

@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.User;
import org.thingsboard.server.common.data.page.TextPageLink;
import org.thingsboard.server.common.data.security.Authority;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.UserEntity;
import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
import org.thingsboard.server.dao.user.UserDao;

2
dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java

@ -20,7 +20,7 @@ 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.security.Authority;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.UserEntity;
import java.util.List;

2
dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java

@ -20,7 +20,7 @@ import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.widget.WidgetType;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.WidgetTypeEntity;
import org.thingsboard.server.dao.sql.JpaAbstractDao;
import org.thingsboard.server.dao.widget.WidgetTypeDao;

2
dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java

@ -22,7 +22,7 @@ import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.page.TextPageLink;
import org.thingsboard.server.common.data.widget.WidgetsBundle;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.WidgetsBundleEntity;
import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
import org.thingsboard.server.dao.widget.WidgetsBundleDao;

2
dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetTypeRepository.java

@ -16,7 +16,7 @@
package org.thingsboard.server.dao.sql.widget;
import org.springframework.data.repository.CrudRepository;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.WidgetTypeEntity;
import java.util.List;

2
dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java

@ -19,7 +19,7 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.query.Param;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import org.thingsboard.server.dao.model.sql.WidgetsBundleEntity;
import java.util.List;

4
dao/src/main/java/org/thingsboard/server/dao/tenant/CassandraTenantDao.java

@ -19,9 +19,9 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.Tenant;
import org.thingsboard.server.common.data.page.TextPageLink;
import org.thingsboard.server.dao.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.nosql.TenantEntity;
import java.util.Arrays;

4
dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java

@ -29,8 +29,8 @@ import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.id.EntityId;
import org.thingsboard.server.common.data.kv.*;
import org.thingsboard.server.common.data.kv.DataType;
import org.thingsboard.server.dao.CassandraAbstractAsyncDao;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractAsyncDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.ModelConstants;
import javax.annotation.Nullable;

5
dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserCredentialsDao.java

@ -17,12 +17,11 @@ package org.thingsboard.server.dao.user;
import com.datastax.driver.core.querybuilder.Select.Where;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.security.UserCredentials;
import org.thingsboard.server.dao.CassandraAbstractModelDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractModelDao;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.nosql.UserCredentialsEntity;

4
dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserDao.java

@ -21,9 +21,9 @@ import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.User;
import org.thingsboard.server.common.data.page.TextPageLink;
import org.thingsboard.server.common.data.security.Authority;
import org.thingsboard.server.dao.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.model.nosql.UserEntity;

2
dao/src/main/java/org/thingsboard/server/dao/annotation/NoSqlDao.java → dao/src/main/java/org/thingsboard/server/dao/util/NoSqlDao.java

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thingsboard.server.dao.annotation;
package org.thingsboard.server.dao.util;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

2
dao/src/main/java/org/thingsboard/server/dao/annotation/SqlDao.java → dao/src/main/java/org/thingsboard/server/dao/util/SqlDao.java

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thingsboard.server.dao.annotation;
package org.thingsboard.server.dao.util;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

2
dao/src/main/java/org/thingsboard/server/dao/util/AbstractJsonSqlTypeDescriptor.java → dao/src/main/java/org/thingsboard/server/dao/util/mapping/AbstractJsonSqlTypeDescriptor.java

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thingsboard.server.dao.util;
package org.thingsboard.server.dao.util.mapping;
import org.hibernate.type.descriptor.ValueExtractor;
import org.hibernate.type.descriptor.WrapperOptions;

2
dao/src/main/java/org/thingsboard/server/dao/util/JacksonUtil.java → dao/src/main/java/org/thingsboard/server/dao/util/mapping/JacksonUtil.java

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thingsboard.server.dao.util;
package org.thingsboard.server.dao.util.mapping;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;

2
dao/src/main/java/org/thingsboard/server/dao/util/JsonStringSqlTypeDescriptor.java → dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonStringSqlTypeDescriptor.java

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thingsboard.server.dao.util;
package org.thingsboard.server.dao.util.mapping;
import org.hibernate.type.descriptor.ValueBinder;
import org.hibernate.type.descriptor.WrapperOptions;

2
dao/src/main/java/org/thingsboard/server/dao/util/JsonStringType.java → dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonStringType.java

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thingsboard.server.dao.util;
package org.thingsboard.server.dao.util.mapping;
import org.hibernate.type.AbstractSingleColumnStandardBasicType;
import org.hibernate.usertype.DynamicParameterizedType;

2
dao/src/main/java/org/thingsboard/server/dao/util/JsonTypeDescriptor.java → dao/src/main/java/org/thingsboard/server/dao/util/mapping/JsonTypeDescriptor.java

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thingsboard.server.dao.util;
package org.thingsboard.server.dao.util.mapping;
import org.hibernate.type.descriptor.WrapperOptions;
import org.hibernate.type.descriptor.java.AbstractTypeDescriptor;

4
dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetTypeDao.java

@ -19,9 +19,9 @@ import com.datastax.driver.core.querybuilder.Select.Where;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.widget.WidgetType;
import org.thingsboard.server.dao.CassandraAbstractModelDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractModelDao;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.nosql.WidgetTypeEntity;
import java.util.List;

4
dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetsBundleDao.java

@ -20,9 +20,9 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.page.TextPageLink;
import org.thingsboard.server.common.data.widget.WidgetsBundle;
import org.thingsboard.server.dao.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.nosql.CassandraAbstractSearchTextDao;
import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.annotation.NoSqlDao;
import org.thingsboard.server.dao.util.NoSqlDao;
import org.thingsboard.server.dao.model.nosql.WidgetsBundleEntity;
import java.util.Arrays;

3
dao/src/main/resources/postgres/schema.sql

@ -121,7 +121,8 @@ CREATE TABLE IF NOT EXISTS event (
entity_type character varying(255),
event_type character varying(255),
event_uid character varying(255),
tenant_id uuid
tenant_id uuid,
CONSTRAINT event_unq_key UNIQUE (tenant_id, entity_type, entity_id, event_type, event_uid)
);
CREATE TABLE IF NOT EXISTS plugin (

2
dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java

@ -31,7 +31,7 @@ import org.springframework.test.context.support.DirtiesContextTestExecutionListe
*/
@RunWith(SpringRunner.class)
@ContextConfiguration(classes = {JpaDaoConfig.class, JpaDbunitTestConfig.class})
@TestPropertySource("classpath:jpa-test.properties")
@TestPropertySource("classpath:sql-test.properties")
@TestExecutionListeners({
DependencyInjectionTestExecutionListener.class,
DirtiesContextTestExecutionListener.class,

4
dao/src/test/java/org/thingsboard/server/dao/CustomPostgresUnit.java

@ -18,11 +18,7 @@ package org.thingsboard.server.dao;
import com.google.common.base.Charsets;
import com.google.common.io.Resources;
import lombok.extern.slf4j.Slf4j;
import org.junit.Before;
import org.junit.rules.ExternalResource;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import ru.yandex.qatools.embed.postgresql.EmbeddedPostgres;
import java.io.IOException;

22
dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java → dao/src/test/java/org/thingsboard/server/dao/DaoServiceTestSuite.java

@ -20,26 +20,14 @@ import org.junit.ClassRule;
import org.junit.extensions.cpsuite.ClasspathSuite;
import org.junit.extensions.cpsuite.ClasspathSuite.ClassnameFilters;
import org.junit.runner.RunWith;
import ru.yandex.qatools.embed.postgresql.EmbeddedPostgres;
import java.io.IOException;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.Arrays;
import static ru.yandex.qatools.embed.postgresql.distribution.Version.Main.V9_6;
@RunWith(ClasspathSuite.class)
@ClassnameFilters({
"org.thingsboard.server.dao.service.*Test",
"org.thingsboard.server.dao.kv.*Test",
"org.thingsboard.server.dao.plugin.*Test",
"org.thingsboard.server.dao.rule.*Test",
"org.thingsboard.server.dao.attributes.*Test",
"org.thingsboard.server.dao.timeseries.*Test"
"org.thingsboard.server.dao.service.*Test"
})
public class DaoTestSuite {
public class DaoServiceTestSuite {
@ClassRule
public static CustomCassandraCQLUnit cassandraUnit =
@ -47,11 +35,11 @@ public class DaoTestSuite {
Arrays.asList(new ClassPathCQLDataSet("cassandra/schema.cql", false, false),
new ClassPathCQLDataSet("cassandra/system-data.cql", false, false),
new ClassPathCQLDataSet("system-test.cql", false, false)),
"cassandra-test.yaml", 30000l);
"cassandra-test.yaml", 30000L);
@ClassRule
public static CustomPostgresUnit postgresUnit = new CustomPostgresUnit(
Arrays.asList("postgres/schema.sql", "postgres/system-data.sql"),
"postgres-embedded-test.properties");
Arrays.asList("postgres/schema.sql", "postgres/system-data.sql", "system-test.sql"),
"postgres-embedded-test.properties");
}

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

@ -0,0 +1,37 @@
/**
* Copyright © 2016-2017 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;
import org.junit.ClassRule;
import org.junit.extensions.cpsuite.ClasspathSuite;
import org.junit.extensions.cpsuite.ClasspathSuite.ClassnameFilters;
import org.junit.runner.RunWith;
import java.util.Arrays;
@RunWith(ClasspathSuite.class)
@ClassnameFilters({
// "org.thingsboard.server.dao.sql.alarm.",
"org.thingsboard.server.dao.sql.alarm.JpaAlarmDaoTest"
})
public class JpaDaoTestSuite {
@ClassRule
public static CustomPostgresUnit postgresUnit = new CustomPostgresUnit(
Arrays.asList("postgres/schema.sql", "postgres/system-data.sql"),
"postgres-embedded-test.properties");
}

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

@ -22,7 +22,7 @@ import org.dbunit.ext.postgresql.PostgresqlDataTypeFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.thingsboard.server.dao.annotation.SqlDao;
import org.thingsboard.server.dao.util.SqlDao;
import javax.sql.DataSource;
import java.io.IOException;

2
dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java

@ -26,7 +26,6 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.support.AnnotationConfigContextLoader;
import org.thingsboard.server.common.data.BaseData;
@ -65,7 +64,6 @@ import java.util.concurrent.ThreadLocalRandom;
@RunWith(SpringRunner.class)
@ContextConfiguration(classes = AbstractServiceTest.class, loader = AnnotationConfigContextLoader.class)
@TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:application-test.properties"})
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
@Configuration
@ComponentScan("org.thingsboard.server")

12
dao/src/test/java/org/thingsboard/server/dao/service/AdminSettingsServiceImplTest.java → dao/src/test/java/org/thingsboard/server/dao/service/BaseAdminSettingsServiceTest.java

@ -15,17 +15,15 @@
*/
package org.thingsboard.server.dao.service;
import org.thingsboard.server.common.data.AdminSettings;
import org.thingsboard.server.dao.exception.DataValidationException;
import org.junit.Assert;
import org.junit.Test;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.junit.Assert;
import org.junit.Test;
import org.thingsboard.server.common.data.AdminSettings;
import org.thingsboard.server.dao.exception.DataValidationException;
public class AdminSettingsServiceImplTest extends AbstractServiceTest {
public abstract class BaseAdminSettingsServiceTest extends AbstractServiceTest {
@Test
public void testFindAdminSettingsByKey() {

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save