From d6965e946955a49a91960fa0e454a798e9b7b271 Mon Sep 17 00:00:00 2001 From: volodymyr-babak Date: Fri, 7 Apr 2017 20:41:19 +0300 Subject: [PATCH 01/69] Refactoring to introduce new DAO layer --- .../server/dao/AbstractSearchTimeDao.java | 13 +-- ...ao.java => CassandraAbstractAsyncDao.java} | 2 +- ...ractDao.java => CassandraAbstractDao.java} | 2 +- ...ao.java => CassandraAbstractModelDao.java} | 85 ++++++++------ ...va => CassandraAbstractSearchTextDao.java} | 19 ++-- .../java/org/thingsboard/server/dao/Dao.java | 3 +- .../org/thingsboard/server/dao/DaoUtil.java | 8 +- .../server/dao/EncryptionUtil.java | 1 - .../server/dao/attributes/AttributesDao.java | 1 + .../dao/attributes/AttributesService.java | 4 +- .../dao/attributes/BaseAttributesService.java | 5 +- ...o.java => CassandraBaseAttributesDao.java} | 14 ++- .../dao/cassandra/CassandraCluster.java | 10 +- .../dao/cassandra/CassandraQueryOptions.java | 3 - .../dao/cassandra/CassandraSocketOptions.java | 3 +- .../component/BaseComponentDescriptorDao.java | 45 ++++---- .../BaseComponentDescriptorService.java | 20 ++-- .../dao/component/ComponentDescriptorDao.java | 13 +-- ...DaoImpl.java => CassandraCustomerDao.java} | 29 ++--- .../server/dao/customer/CustomerDao.java | 13 +-- .../server/dao/customer/CustomerService.java | 10 +- .../dao/customer/CustomerServiceImpl.java | 39 +++---- .../dao/dashboard/CassandraDashboardDao.java | 37 +++++++ ...pl.java => CassandraDashboardInfoDao.java} | 14 ++- .../server/dao/dashboard/DashboardDao.java | 12 +- .../dao/dashboard/DashboardDaoImpl.java | 60 ---------- .../dao/dashboard/DashboardInfoDao.java | 18 ++- .../dao/dashboard/DashboardService.java | 28 ++--- .../dao/dashboard/DashboardServiceImpl.java | 59 +++++----- ...ava => CassandraDeviceCredentialsDao.java} | 36 +++--- ...ceDaoImpl.java => CassandraDeviceDao.java} | 41 +++---- .../dao/device/DeviceCredentialsDao.java | 15 +-- .../device/DeviceCredentialsServiceImpl.java | 20 ++-- .../server/dao/device/DeviceDao.java | 23 ++-- .../server/dao/device/DeviceServiceImpl.java | 31 ++---- .../server/dao/event/BaseEventService.java | 21 ++-- ...entDao.java => CassandraBaseEventDao.java} | 27 +++-- .../server/dao/event/EventDao.java | 15 +-- .../server/dao/event/EventService.java | 1 - .../server/dao/plugin/BasePluginService.java | 49 ++++----- ...inDao.java => CassandraBasePluginDao.java} | 39 +++---- .../server/dao/plugin/PluginDao.java | 13 +-- .../server/dao/rule/BaseRuleService.java | 39 +++---- ...RuleDao.java => CassandraBaseRuleDao.java} | 29 ++--- .../thingsboard/server/dao/rule/RuleDao.java | 13 +-- .../server/dao/service/DataValidator.java | 11 +- .../server/dao/service/PaginatedRemover.java | 38 ++++--- .../server/dao/settings/AdminSettingsDao.java | 7 +- .../dao/settings/AdminSettingsService.java | 6 +- .../settings/AdminSettingsServiceImpl.java | 18 +-- ...pl.java => CassandraAdminSettingsDao.java} | 29 ++--- ...ntDaoImpl.java => CassandraTenantDao.java} | 31 ++---- .../server/dao/tenant/TenantDao.java | 11 +- .../server/dao/tenant/TenantService.java | 12 +- .../server/dao/tenant/TenantServiceImpl.java | 37 +++---- .../dao/timeseries/BaseTimeseriesService.java | 21 +--- ...o.java => CassandraBaseTimeseriesDao.java} | 13 +-- .../server/dao/timeseries/TimeseriesDao.java | 3 +- .../dao/timeseries/TimeseriesService.java | 3 +- .../dao/timeseries/TsKvQueryCursor.java | 1 - ....java => CassandraUserCredentialsDao.java} | 39 +++---- ...UserDaoImpl.java => CassandraUserDao.java} | 42 +++---- .../server/dao/user/UserCredentialsDao.java | 23 ++-- .../thingsboard/server/dao/user/UserDao.java | 17 ++- .../server/dao/user/UserService.java | 28 ++--- .../server/dao/user/UserServiceImpl.java | 104 ++++++++---------- ...oImpl.java => CassandraWidgetTypeDao.java} | 22 ++-- ...pl.java => CassandraWidgetsBundleDao.java} | 33 ++---- .../server/dao/widget/WidgetTypeDao.java | 11 +- .../server/dao/widget/WidgetTypeService.java | 12 +- .../dao/widget/WidgetTypeServiceImpl.java | 38 ++----- .../server/dao/widget/WidgetsBundleDao.java | 15 +-- .../dao/widget/WidgetsBundleService.java | 20 ++-- .../dao/widget/WidgetsBundleServiceImpl.java | 57 ++++------ 74 files changed, 701 insertions(+), 983 deletions(-) rename dao/src/main/java/org/thingsboard/server/dao/{AbstractAsyncDao.java => CassandraAbstractAsyncDao.java} (93%) rename dao/src/main/java/org/thingsboard/server/dao/{AbstractDao.java => CassandraAbstractDao.java} (98%) rename dao/src/main/java/org/thingsboard/server/dao/{AbstractModelDao.java => CassandraAbstractModelDao.java} (64%) rename dao/src/main/java/org/thingsboard/server/dao/{AbstractSearchTextDao.java => CassandraAbstractSearchTextDao.java} (86%) rename dao/src/main/java/org/thingsboard/server/dao/attributes/{BaseAttributesDao.java => CassandraBaseAttributesDao.java} (93%) rename dao/src/main/java/org/thingsboard/server/dao/customer/{CustomerDaoImpl.java => CassandraCustomerDao.java} (78%) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardDao.java rename dao/src/main/java/org/thingsboard/server/dao/dashboard/{DashboardInfoDaoImpl.java => CassandraDashboardInfoDao.java} (79%) delete mode 100644 dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardDaoImpl.java rename dao/src/main/java/org/thingsboard/server/dao/device/{DeviceCredentialsDaoImpl.java => CassandraDeviceCredentialsDao.java} (77%) rename dao/src/main/java/org/thingsboard/server/dao/device/{DeviceDaoImpl.java => CassandraDeviceDao.java} (74%) rename dao/src/main/java/org/thingsboard/server/dao/event/{BaseEventDao.java => CassandraBaseEventDao.java} (84%) rename dao/src/main/java/org/thingsboard/server/dao/plugin/{BasePluginDao.java => CassandraBasePluginDao.java} (77%) rename dao/src/main/java/org/thingsboard/server/dao/rule/{BaseRuleDao.java => CassandraBaseRuleDao.java} (79%) rename dao/src/main/java/org/thingsboard/server/dao/settings/{AdminSettingsDaoImpl.java => CassandraAdminSettingsDao.java} (66%) rename dao/src/main/java/org/thingsboard/server/dao/tenant/{TenantDaoImpl.java => CassandraTenantDao.java} (68%) rename dao/src/main/java/org/thingsboard/server/dao/timeseries/{BaseTimeseriesDao.java => CassandraBaseTimeseriesDao.java} (98%) rename dao/src/main/java/org/thingsboard/server/dao/user/{UserCredentialsDaoImpl.java => CassandraUserCredentialsDao.java} (78%) rename dao/src/main/java/org/thingsboard/server/dao/user/{UserDaoImpl.java => CassandraUserDao.java} (83%) rename dao/src/main/java/org/thingsboard/server/dao/widget/{WidgetTypeDaoImpl.java => CassandraWidgetTypeDao.java} (78%) rename dao/src/main/java/org/thingsboard/server/dao/widget/{WidgetsBundleDaoImpl.java => CassandraWidgetsBundleDao.java} (75%) diff --git a/dao/src/main/java/org/thingsboard/server/dao/AbstractSearchTimeDao.java b/dao/src/main/java/org/thingsboard/server/dao/AbstractSearchTimeDao.java index 5852e3c7e3..4a10617b25 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/AbstractSearchTimeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/AbstractSearchTimeDao.java @@ -21,34 +21,29 @@ import com.datastax.driver.core.querybuilder.QueryBuilder; import com.datastax.driver.core.querybuilder.Select; import com.datastax.driver.core.querybuilder.Select.Where; import com.datastax.driver.core.utils.UUIDs; -import org.apache.commons.lang3.StringUtils; -import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.page.TimePageLink; import org.thingsboard.server.dao.model.BaseEntity; import org.thingsboard.server.dao.model.ModelConstants; -import org.thingsboard.server.dao.model.SearchTextEntity; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.UUID; -import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; import static com.datastax.driver.core.querybuilder.QueryBuilder.select; -public abstract class AbstractSearchTimeDao> extends AbstractModelDao { +public abstract class AbstractSearchTimeDao, D> extends CassandraAbstractModelDao { - protected List findPageWithTimeSearch(String searchView, List clauses, TimePageLink pageLink) { + protected List findPageWithTimeSearch(String searchView, List clauses, TimePageLink pageLink) { return findPageWithTimeSearch(searchView, clauses, Collections.emptyList(), pageLink); } - protected List findPageWithTimeSearch(String searchView, List clauses, Ordering ordering, TimePageLink pageLink) { + protected List findPageWithTimeSearch(String searchView, List clauses, Ordering ordering, TimePageLink pageLink) { return findPageWithTimeSearch(searchView, clauses, Collections.singletonList(ordering), pageLink); } - - protected List findPageWithTimeSearch(String searchView, List clauses, List topLevelOrderings, TimePageLink pageLink) { + protected List findPageWithTimeSearch(String searchView, List clauses, List topLevelOrderings, TimePageLink pageLink) { Select select = select().from(searchView); Where query = select.where(); for (Clause clause : clauses) { diff --git a/dao/src/main/java/org/thingsboard/server/dao/AbstractAsyncDao.java b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractAsyncDao.java similarity index 93% rename from dao/src/main/java/org/thingsboard/server/dao/AbstractAsyncDao.java rename to dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractAsyncDao.java index 9b9368d45d..f241f2ca8b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/AbstractAsyncDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractAsyncDao.java @@ -23,7 +23,7 @@ import java.util.concurrent.Executors; /** * Created by ashvayka on 21.02.17. */ -public abstract class AbstractAsyncDao extends AbstractDao { +public abstract class CassandraAbstractAsyncDao extends CassandraAbstractDao { protected ExecutorService readResultsProcessingExecutor; diff --git a/dao/src/main/java/org/thingsboard/server/dao/AbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractDao.java similarity index 98% rename from dao/src/main/java/org/thingsboard/server/dao/AbstractDao.java rename to dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractDao.java index 5968477dc6..bd7346acf3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/AbstractDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractDao.java @@ -23,7 +23,7 @@ import org.thingsboard.server.dao.cassandra.CassandraCluster; import org.thingsboard.server.dao.model.type.*; @Slf4j -public abstract class AbstractDao { +public abstract class CassandraAbstractDao { @Autowired protected CassandraCluster cluster; diff --git a/dao/src/main/java/org/thingsboard/server/dao/AbstractModelDao.java b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractModelDao.java similarity index 64% rename from dao/src/main/java/org/thingsboard/server/dao/AbstractModelDao.java rename to dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractModelDao.java index 01346b0da9..5f5f95f037 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/AbstractModelDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractModelDao.java @@ -28,8 +28,8 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.dao.model.BaseEntity; -import org.thingsboard.server.dao.model.wrapper.EntityResultSet; import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.model.wrapper.EntityResultSet; import javax.annotation.Nullable; import java.util.Collections; @@ -37,26 +37,25 @@ import java.util.List; import java.util.UUID; import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; -import static com.datastax.driver.core.querybuilder.QueryBuilder.lt; import static com.datastax.driver.core.querybuilder.QueryBuilder.select; @Slf4j -public abstract class AbstractModelDao> extends AbstractDao implements Dao { +public abstract class CassandraAbstractModelDao, D> extends CassandraAbstractDao implements Dao { - protected abstract Class getColumnFamilyClass(); + protected abstract Class getColumnFamilyClass(); protected abstract String getColumnFamilyName(); - protected Mapper getMapper() { + protected Mapper getMapper() { return cluster.getMapper(getColumnFamilyClass()); } - protected List findListByStatement(Statement statement) { - List list = Collections.emptyList(); + protected List findListByStatement(Statement statement) { + List list = Collections.emptyList(); if (statement != null) { statement.setConsistencyLevel(cluster.getDefaultReadConsistencyLevel()); ResultSet resultSet = getSession().execute(statement); - Result result = getMapper().map(resultSet); + Result result = getMapper().map(resultSet); if (result != null) { list = result.all(); } @@ -64,33 +63,33 @@ public abstract class AbstractModelDao> extends Abstract return list; } - protected ListenableFuture> findListByStatementAsync(Statement statement) { + protected ListenableFuture> findListByStatementAsync(Statement statement) { if (statement != null) { statement.setConsistencyLevel(cluster.getDefaultReadConsistencyLevel()); ResultSetFuture resultSetFuture = getSession().executeAsync(statement); - ListenableFuture> result = Futures.transform(resultSetFuture, new Function>() { + return Futures.transform(resultSetFuture, new Function>() { @Nullable @Override - public List apply(@Nullable ResultSet resultSet) { - Result result = getMapper().map(resultSet); + public List apply(@Nullable ResultSet resultSet) { + Result result = getMapper().map(resultSet); if (result != null) { - return result.all(); + List entities = result.all(); + return DaoUtil.convertDataList(entities); } else { return Collections.emptyList(); } } }); - return result; } return Futures.immediateFuture(Collections.emptyList()); } - protected T findOneByStatement(Statement statement) { - T object = null; + protected E findOneByStatement(Statement statement) { + E object = null; if (statement != null) { statement.setConsistencyLevel(cluster.getDefaultReadConsistencyLevel()); ResultSet resultSet = getSession().execute(statement); - Result result = getMapper().map(resultSet); + Result result = getMapper().map(resultSet); if (result != null) { object = result.one(); } @@ -98,32 +97,32 @@ public abstract class AbstractModelDao> extends Abstract return object; } - protected ListenableFuture findOneByStatementAsync(Statement statement) { + protected ListenableFuture findOneByStatementAsync(Statement statement) { if (statement != null) { statement.setConsistencyLevel(cluster.getDefaultReadConsistencyLevel()); ResultSetFuture resultSetFuture = getSession().executeAsync(statement); - ListenableFuture result = Futures.transform(resultSetFuture, new Function() { + return Futures.transform(resultSetFuture, new Function() { @Nullable @Override - public T apply(@Nullable ResultSet resultSet) { - Result result = getMapper().map(resultSet); + public D apply(@Nullable ResultSet resultSet) { + Result result = getMapper().map(resultSet); if (result != null) { - return result.one(); + E entity = result.one(); + return DaoUtil.getData(entity); } else { return null; } } }); - return result; } return Futures.immediateFuture(null); } - protected Statement getSaveQuery(T dto) { + protected Statement getSaveQuery(E dto) { return getMapper().saveQuery(dto); } - protected EntityResultSet saveWithResult(T entity) { + protected EntityResultSet saveWithResult(E entity) { log.debug("Save entity {}", entity); if (entity.getId() == null) { entity.setId(UUIDs.timeBased()); @@ -136,34 +135,48 @@ public abstract class AbstractModelDao> extends Abstract return new EntityResultSet<>(resultSet, entity); } - public T save(T entity) { - return saveWithResult(entity).getEntity(); + @Override + public D save(D domain) { + E entity; + try { + entity = getColumnFamilyClass().getConstructor(domain.getClass()).newInstance(domain); + } catch (Exception e) { + log.error("Can't create entity for domain object {}", domain, e); + throw new IllegalArgumentException("Can't create entity for domain object {" + domain + "}", e); + } + log.debug("Saving entity {}", entity); + entity = saveWithResult(entity).getEntity(); + return DaoUtil.getData(entity); } - public T findById(UUID key) { + @Override + public D findById(UUID key) { log.debug("Get entity by key {}", key); Select.Where query = select().from(getColumnFamilyName()).where(eq(ModelConstants.ID_PROPERTY, key)); log.trace("Execute query {}", query); - return findOneByStatement(query); + E entity = findOneByStatement(query); + return DaoUtil.getData(entity); } - public ListenableFuture findByIdAsync(UUID key) { + @Override + public ListenableFuture findByIdAsync(UUID key) { log.debug("Get entity by key {}", key); Select.Where query = select().from(getColumnFamilyName()).where(eq(ModelConstants.ID_PROPERTY, key)); log.trace("Execute query {}", query); return findOneByStatementAsync(query); } - - public ResultSet removeById(UUID key) { + @Override + public boolean removeById(UUID key) { Statement delete = QueryBuilder.delete().all().from(getColumnFamilyName()).where(eq(ModelConstants.ID_PROPERTY, key)); log.debug("Remove request: {}", delete.toString()); - return getSession().execute(delete); + return getSession().execute(delete).wasApplied(); } - - public List find() { + @Override + public List find() { log.debug("Get all entities from column family {}", getColumnFamilyName()); - return findListByStatement(QueryBuilder.select().all().from(getColumnFamilyName()).setConsistencyLevel(cluster.getDefaultReadConsistencyLevel())); + List entities = findListByStatement(QueryBuilder.select().all().from(getColumnFamilyName()).setConsistencyLevel(cluster.getDefaultReadConsistencyLevel())); + return DaoUtil.convertDataList(entities); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/AbstractSearchTextDao.java b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTextDao.java similarity index 86% rename from dao/src/main/java/org/thingsboard/server/dao/AbstractSearchTextDao.java rename to dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTextDao.java index 51aa20d0d7..3217043137 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/AbstractSearchTextDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTextDao.java @@ -19,27 +19,28 @@ import com.datastax.driver.core.querybuilder.Clause; import com.datastax.driver.core.querybuilder.QueryBuilder; import com.datastax.driver.core.querybuilder.Select; import com.datastax.driver.core.querybuilder.Select.Where; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.thingsboard.server.common.data.page.TextPageLink; -import org.thingsboard.server.dao.model.SearchTextEntity; import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.model.SearchTextEntity; import java.util.List; import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; -import static com.datastax.driver.core.querybuilder.QueryBuilder.gt; -import static com.datastax.driver.core.querybuilder.QueryBuilder.gte; -import static com.datastax.driver.core.querybuilder.QueryBuilder.lt; import static com.datastax.driver.core.querybuilder.QueryBuilder.select; -public abstract class AbstractSearchTextDao> extends AbstractModelDao { +@Slf4j +public abstract class CassandraAbstractSearchTextDao, D> extends CassandraAbstractModelDao { + + public D save(D domain) { - public T save(T entity) { entity.setSearchText(entity.getSearchTextSource().toLowerCase()); + return super.save(entity); } - - protected List findPageWithTextSearch(String searchView, List clauses, TextPageLink pageLink) { + + protected List findPageWithTextSearch(String searchView, List clauses, TextPageLink pageLink) { Select select = select().from(searchView); Where query = select.where(); for (Clause clause : clauses) { @@ -49,7 +50,7 @@ public abstract class AbstractSearchTextDao> exten if (!StringUtils.isEmpty(pageLink.getTextOffset())) { query.and(eq(ModelConstants.SEARCH_TEXT_PROPERTY, pageLink.getTextOffset())); query.and(QueryBuilder.lt(ModelConstants.ID_PROPERTY, pageLink.getIdOffset())); - List result = findListByStatement(query); + List result = findListByStatement(query); if (result.size() < pageLink.getLimit()) { select = select().from(searchView); query = select.where(); diff --git a/dao/src/main/java/org/thingsboard/server/dao/Dao.java b/dao/src/main/java/org/thingsboard/server/dao/Dao.java index 2703cdc23a..f0580eba3e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/Dao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/Dao.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.dao; -import com.datastax.driver.core.ResultSet; import com.google.common.util.concurrent.ListenableFuture; import java.util.List; @@ -31,6 +30,6 @@ public interface Dao { T save(T t); - ResultSet removeById(UUID id); + boolean removeById(UUID id); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java b/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java index 27499bb1bd..42823a1e68 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java +++ b/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java @@ -15,15 +15,11 @@ */ package org.thingsboard.server.dao; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.UUID; - import org.thingsboard.server.common.data.id.UUIDBased; import org.thingsboard.server.dao.model.ToData; +import java.util.*; + public abstract class DaoUtil { private DaoUtil() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/EncryptionUtil.java b/dao/src/main/java/org/thingsboard/server/dao/EncryptionUtil.java index 9a4e592e07..1d74d30a08 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/EncryptionUtil.java +++ b/dao/src/main/java/org/thingsboard/server/dao/EncryptionUtil.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.dao; -import com.google.common.base.CharMatcher; import lombok.extern.slf4j.Slf4j; import org.bouncycastle.crypto.digests.SHA3Digest; import org.bouncycastle.pqc.math.linearalgebra.ByteUtils; diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java index ae58d4d9c6..3fb8ee2ffc 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.attributes; +// CASSANDRA ??? import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.ResultSetFuture; import com.google.common.util.concurrent.ListenableFuture; diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java index 6bf9fb2bd5..ccca460917 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java @@ -15,12 +15,10 @@ */ package org.thingsboard.server.dao.attributes; +// CASSANDRA ??? import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.ResultSetFuture; import com.google.common.util.concurrent.ListenableFuture; -import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.EntityId; -import org.thingsboard.server.common.data.id.UUIDBased; import org.thingsboard.server.common.data.kv.AttributeKvEntry; import java.util.Collection; diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java index 43612419d0..6fd734a191 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java @@ -15,16 +15,17 @@ */ package org.thingsboard.server.dao.attributes; +// CASSANDRA ??? import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.ResultSetFuture; import com.google.common.collect.Lists; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.kv.AttributeKvEntry; import org.thingsboard.server.dao.exception.IncorrectParameterException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import org.thingsboard.server.dao.service.Validator; import java.util.Collection; diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesDao.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java similarity index 93% rename from dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesDao.java rename to dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java index fd50f4d2ef..f19dee4d61 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java @@ -24,10 +24,11 @@ import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.EntityId; -import org.thingsboard.server.dao.AbstractAsyncDao; +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.model.ModelConstants; -import org.thingsboard.server.common.data.kv.*; -import org.thingsboard.server.dao.timeseries.BaseTimeseriesDao; +import org.thingsboard.server.dao.timeseries.CassandraBaseTimeseriesDao; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; @@ -37,15 +38,16 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; +import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; +import static com.datastax.driver.core.querybuilder.QueryBuilder.select; import static org.thingsboard.server.dao.model.ModelConstants.*; -import static com.datastax.driver.core.querybuilder.QueryBuilder.*; /** * @author Andrew Shvayka */ @Component @Slf4j -public class BaseAttributesDao extends AbstractAsyncDao implements AttributesDao { +public class CassandraBaseAttributesDao extends CassandraAbstractAsyncDao implements AttributesDao { private PreparedStatement saveStmt; @@ -161,7 +163,7 @@ public class BaseAttributesDao extends AbstractAsyncDao implements AttributesDao AttributeKvEntry attributeEntry = null; if (row != null) { long lastUpdateTs = row.get(LAST_UPDATE_TS_COLUMN, Long.class); - attributeEntry = new BaseAttributeKvEntry(BaseTimeseriesDao.toKvEntry(row, key), lastUpdateTs); + attributeEntry = new BaseAttributeKvEntry(CassandraBaseTimeseriesDao.toKvEntry(row, key), lastUpdateTs); } return attributeEntry; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java index 62e376245a..efe05f8fb8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java +++ b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java @@ -16,13 +16,8 @@ package org.thingsboard.server.dao.cassandra; -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.ConsistencyLevel; -import com.datastax.driver.core.HostDistance; -import com.datastax.driver.core.PoolingOptions; +import com.datastax.driver.core.*; import com.datastax.driver.core.ProtocolOptions.Compression; -import com.datastax.driver.core.Session; -import com.datastax.driver.core.exceptions.NoHostAvailableException; import com.datastax.driver.mapping.Mapper; import com.datastax.driver.mapping.MappingManager; import lombok.Data; @@ -31,16 +26,13 @@ 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.exception.DatabaseException; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -import java.io.Closeable; import java.net.InetSocketAddress; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.StringTokenizer; @Component @Slf4j diff --git a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraQueryOptions.java b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraQueryOptions.java index d5460b0081..27ac661231 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraQueryOptions.java +++ b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraQueryOptions.java @@ -21,12 +21,9 @@ import lombok.Data; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; import javax.annotation.PostConstruct; -import static org.apache.commons.lang3.StringUtils.isNotBlank; - @Component @Configuration @Data diff --git a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraSocketOptions.java b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraSocketOptions.java index c6f51d108e..b4cb7ba120 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraSocketOptions.java +++ b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraSocketOptions.java @@ -15,13 +15,12 @@ */ package org.thingsboard.server.dao.cassandra; +import com.datastax.driver.core.SocketOptions; import lombok.Data; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; -import com.datastax.driver.core.SocketOptions; - import javax.annotation.PostConstruct; @Component diff --git a/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorDao.java b/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorDao.java index 7c43a765ae..330790d81b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorDao.java @@ -27,9 +27,10 @@ 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.AbstractSearchTextDao; -import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.CassandraAbstractSearchTextDao; +import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.ComponentDescriptorEntity; +import org.thingsboard.server.dao.model.ModelConstants; import java.util.Arrays; import java.util.List; @@ -44,7 +45,7 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.select; */ @Component @Slf4j -public class BaseComponentDescriptorDao extends AbstractSearchTextDao implements ComponentDescriptorDao { +public class BaseComponentDescriptorDao extends CassandraAbstractSearchTextDao implements ComponentDescriptorDao { @Override protected Class getColumnFamilyClass() { @@ -57,10 +58,10 @@ public class BaseComponentDescriptorDao extends AbstractSearchTextDao save(ComponentDescriptor component) { + public Optional saveIfNotExist(ComponentDescriptor component) { ComponentDescriptorEntity entity = new ComponentDescriptorEntity(component); log.debug("Save component entity [{}]", entity); - Optional result = saveIfNotExist(entity); + Optional result = saveIfNotExist(entity); if (log.isTraceEnabled()) { log.trace("Saved result: [{}] for component entity [{}]", result.isPresent(), result.orElse(null)); } else { @@ -70,19 +71,19 @@ public class BaseComponentDescriptorDao extends AbstractSearchTextDao findByTypeAndPageLink(ComponentType type, TextPageLink pageLink) { + public List findByTypeAndPageLink(ComponentType type, TextPageLink pageLink) { log.debug("Try to find component by type [{}] and pageLink [{}]", type, pageLink); List entities = findPageWithTextSearch(ModelConstants.COMPONENT_DESCRIPTOR_BY_TYPE_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, Arrays.asList(eq(ModelConstants.COMPONENT_DESCRIPTOR_TYPE_PROPERTY, type.name())), pageLink); @@ -105,11 +106,11 @@ public class BaseComponentDescriptorDao extends AbstractSearchTextDao findByScopeAndTypeAndPageLink(ComponentScope scope, ComponentType type, TextPageLink pageLink) { + public List findByScopeAndTypeAndPageLink(ComponentScope scope, ComponentType type, TextPageLink pageLink) { log.debug("Try to find component by scope [{}] and type [{}] and pageLink [{}]", scope, type, pageLink); List entities = findPageWithTextSearch(ModelConstants.COMPONENT_DESCRIPTOR_BY_SCOPE_TYPE_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, Arrays.asList(eq(ModelConstants.COMPONENT_DESCRIPTOR_TYPE_PROPERTY, type.name()), @@ -119,20 +120,20 @@ public class BaseComponentDescriptorDao extends AbstractSearchTextDao saveIfNotExist(ComponentDescriptorEntity entity) { + private Optional saveIfNotExist(ComponentDescriptorEntity entity) { if (entity.getId() == null) { entity.setId(UUIDs.timeBased()); } @@ -161,7 +162,7 @@ public class BaseComponentDescriptorDao extends AbstractSearchTextDao result = componentDescriptorDao.save(component); + Optional result = componentDescriptorDao.saveIfNotExist(component); if (result.isPresent()) { - return getData(result.get()); + return result.get(); } else { - return getData(componentDescriptorDao.findByClazz(component.getClazz())); + return componentDescriptorDao.findByClazz(component.getClazz()); } } @Override public ComponentDescriptor findById(ComponentDescriptorId componentId) { Validator.validateId(componentId, "Incorrect component id for search request."); - return getData(componentDescriptorDao.findById(componentId)); + return componentDescriptorDao.findById(componentId); } @Override public ComponentDescriptor findByClazz(String clazz) { Validator.validateString(clazz, "Incorrect clazz for search request."); - return getData(componentDescriptorDao.findByClazz(clazz)); + return componentDescriptorDao.findByClazz(clazz); } @Override public TextPageData findByTypeAndPageLink(ComponentType type, TextPageLink pageLink) { Validator.validatePageLink(pageLink, "Incorrect PageLink object for search plugin components request."); - List pluginEntities = componentDescriptorDao.findByTypeAndPageLink(type, pageLink); - List components = convertDataList(pluginEntities); + List components = componentDescriptorDao.findByTypeAndPageLink(type, pageLink); return new TextPageData<>(components, pageLink); } @Override public TextPageData findByScopeAndTypeAndPageLink(ComponentScope scope, ComponentType type, TextPageLink pageLink) { Validator.validatePageLink(pageLink, "Incorrect PageLink object for search plugin components request."); - List pluginEntities = componentDescriptorDao.findByScopeAndTypeAndPageLink(scope, type, pageLink); - List components = convertDataList(pluginEntities); + List components = componentDescriptorDao.findByScopeAndTypeAndPageLink(scope, type, pageLink); return new TextPageData<>(components, pageLink); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/component/ComponentDescriptorDao.java b/dao/src/main/java/org/thingsboard/server/dao/component/ComponentDescriptorDao.java index 0496068d33..cfbcaae8dd 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/component/ComponentDescriptorDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/component/ComponentDescriptorDao.java @@ -21,7 +21,6 @@ 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.Dao; -import org.thingsboard.server.dao.model.ComponentDescriptorEntity; import java.util.List; import java.util.Optional; @@ -29,17 +28,17 @@ import java.util.Optional; /** * @author Andrew Shvayka */ -public interface ComponentDescriptorDao extends Dao { +public interface ComponentDescriptorDao extends Dao { - Optional save(ComponentDescriptor component); + Optional saveIfNotExist(ComponentDescriptor component); - ComponentDescriptorEntity findById(ComponentDescriptorId componentId); + ComponentDescriptor findById(ComponentDescriptorId componentId); - ComponentDescriptorEntity findByClazz(String clazz); + ComponentDescriptor findByClazz(String clazz); - List findByTypeAndPageLink(ComponentType type, TextPageLink pageLink); + List findByTypeAndPageLink(ComponentType type, TextPageLink pageLink); - List findByScopeAndTypeAndPageLink(ComponentScope scope, ComponentType type, TextPageLink pageLink); + List findByScopeAndTypeAndPageLink(ComponentScope scope, ComponentType type, TextPageLink pageLink); void deleteById(ComponentDescriptorId componentId); diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CassandraCustomerDao.java similarity index 78% rename from dao/src/main/java/org/thingsboard/server/dao/customer/CustomerDaoImpl.java rename to dao/src/main/java/org/thingsboard/server/dao/customer/CassandraCustomerDao.java index 7b53836274..18f35e6dc3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerDaoImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CassandraCustomerDao.java @@ -15,24 +15,23 @@ */ package org.thingsboard.server.dao.customer; -import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; - -import java.util.Arrays; -import java.util.List; -import java.util.UUID; - 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.AbstractSearchTextDao; +import org.thingsboard.server.dao.CassandraAbstractSearchTextDao; +import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.CustomerEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.thingsboard.server.dao.model.ModelConstants; + +import java.util.Arrays; +import java.util.List; +import java.util.UUID; + +import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; @Component @Slf4j -public class CustomerDaoImpl extends AbstractSearchTextDao implements CustomerDao { +public class CassandraCustomerDao extends CassandraAbstractSearchTextDao implements CustomerDao { @Override protected Class getColumnFamilyClass() { @@ -43,21 +42,15 @@ public class CustomerDaoImpl extends AbstractSearchTextDao imple protected String getColumnFamilyName() { return ModelConstants.CUSTOMER_COLUMN_FAMILY_NAME; } - - @Override - public CustomerEntity save(Customer customer) { - log.debug("Save customer [{}] ", customer); - return save(new CustomerEntity(customer)); - } @Override - public List findCustomersByTenantId(UUID tenantId, TextPageLink pageLink) { + public List findCustomersByTenantId(UUID tenantId, TextPageLink pageLink) { log.debug("Try to find customers by tenantId [{}] and pageLink [{}]", tenantId, pageLink); List customerEntities = findPageWithTextSearch(ModelConstants.CUSTOMER_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, Arrays.asList(eq(ModelConstants.CUSTOMER_TENANT_ID_PROPERTY, tenantId)), pageLink); log.trace("Found customers [{}] by tenantId [{}] and pageLink [{}]", customerEntities, tenantId, pageLink); - return customerEntities; + return DaoUtil.convertDataList(customerEntities); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerDao.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerDao.java index 6d7247b3a6..e26fc986bf 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerDao.java @@ -15,18 +15,17 @@ */ package org.thingsboard.server.dao.customer; -import java.util.List; -import java.util.UUID; - import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.dao.Dao; -import org.thingsboard.server.dao.model.CustomerEntity; + +import java.util.List; +import java.util.UUID; /** * The Interface CustomerDao. */ -public interface CustomerDao extends Dao { +public interface CustomerDao extends Dao { /** * Save or update customer object @@ -34,7 +33,7 @@ public interface CustomerDao extends Dao { * @param customer the customer object * @return saved customer object */ - CustomerEntity save(Customer customer); + Customer save(Customer customer); /** * Find customers by tenant id and page link. @@ -43,6 +42,6 @@ public interface CustomerDao extends Dao { * @param pageLink the page link * @return the list of customer objects */ - List findCustomersByTenantId(UUID tenantId, TextPageLink pageLink); + List findCustomersByTenantId(UUID tenantId, TextPageLink pageLink); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerService.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerService.java index 70321a20b0..566d71818e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerService.java @@ -23,14 +23,14 @@ import org.thingsboard.server.common.data.page.TextPageLink; public interface CustomerService { - public Customer findCustomerById(CustomerId customerId); + Customer findCustomerById(CustomerId customerId); - public Customer saveCustomer(Customer customer); + Customer saveCustomer(Customer customer); - public void deleteCustomer(CustomerId customerId); + void deleteCustomer(CustomerId customerId); - public TextPageData findCustomersByTenantId(TenantId tenantId, TextPageLink pageLink); + TextPageData findCustomersByTenantId(TenantId tenantId, TextPageLink pageLink); - public void deleteCustomersByTenantId(TenantId tenantId); + void deleteCustomersByTenantId(TenantId tenantId); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java index 18ead42d5a..3e9e472c06 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java @@ -15,14 +15,12 @@ */ package org.thingsboard.server.dao.customer; -import static org.thingsboard.server.dao.DaoUtil.convertDataList; -import static org.thingsboard.server.dao.DaoUtil.getData; - -import java.util.List; - import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.thingsboard.server.common.data.Customer; +import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.TextPageData; @@ -31,17 +29,13 @@ import org.thingsboard.server.dao.dashboard.DashboardService; import org.thingsboard.server.dao.device.DeviceService; import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.exception.IncorrectParameterException; -import org.thingsboard.server.dao.model.CustomerEntity; -import org.thingsboard.server.dao.model.TenantEntity; import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.PaginatedRemover; +import org.thingsboard.server.dao.service.Validator; import org.thingsboard.server.dao.tenant.TenantDao; import org.thingsboard.server.dao.user.UserService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.thingsboard.server.dao.service.Validator; + +import java.util.List; @Service @Slf4j public class CustomerServiceImpl implements CustomerService { @@ -65,16 +59,14 @@ public class CustomerServiceImpl implements CustomerService { public Customer findCustomerById(CustomerId customerId) { log.trace("Executing findCustomerById [{}]", customerId); Validator.validateId(customerId, "Incorrect customerId " + customerId); - CustomerEntity customerEntity = customerDao.findById(customerId.getId()); - return getData(customerEntity); + return customerDao.findById(customerId.getId()); } @Override public Customer saveCustomer(Customer customer) { log.trace("Executing saveCustomer [{}]", customer); customerValidator.validate(customer); - CustomerEntity customerEntity = customerDao.save(customer); - return getData(customerEntity); + return customerDao.save(customer); } @Override @@ -96,8 +88,7 @@ public class CustomerServiceImpl implements CustomerService { log.trace("Executing findCustomersByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink); Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink); - List customerEntities = customerDao.findCustomersByTenantId(tenantId.getId(), pageLink); - List customers = convertDataList(customerEntities); + List customers = customerDao.findCustomersByTenantId(tenantId.getId(), pageLink); return new TextPageData(customers, pageLink); } @@ -121,7 +112,7 @@ public class CustomerServiceImpl implements CustomerService { if (customer.getTenantId() == null) { throw new DataValidationException("Customer should be assigned to tenant!"); } else { - TenantEntity tenant = tenantDao.findById(customer.getTenantId().getId()); + Tenant tenant = tenantDao.findById(customer.getTenantId().getId()); if (tenant == null) { throw new DataValidationException("Customer is referencing to non-existent tenant!"); } @@ -129,17 +120,17 @@ public class CustomerServiceImpl implements CustomerService { } }; - private PaginatedRemover customersByTenantRemover = - new PaginatedRemover() { + private PaginatedRemover customersByTenantRemover = + new PaginatedRemover() { @Override - protected List findEntities(TenantId id, TextPageLink pageLink) { + protected List findEntities(TenantId id, TextPageLink pageLink) { return customerDao.findCustomersByTenantId(id.getId(), pageLink); } @Override - protected void removeEntity(CustomerEntity entity) { - deleteCustomer(new CustomerId(entity.getId())); + protected void removeEntity(Customer entity) { + deleteCustomer(new CustomerId(entity.getUuidId())); } }; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardDao.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardDao.java new file mode 100644 index 0000000000..97a5c7a614 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardDao.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.dashboard; + +import org.springframework.stereotype.Component; +import org.thingsboard.server.common.data.Dashboard; +import org.thingsboard.server.dao.CassandraAbstractSearchTextDao; +import org.thingsboard.server.dao.model.DashboardEntity; + +import static org.thingsboard.server.dao.model.ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME; + +@Component +public class CassandraDashboardDao extends CassandraAbstractSearchTextDao implements DashboardDao { + + @Override + protected Class getColumnFamilyClass() { + return DashboardEntity.class; + } + + @Override + protected String getColumnFamilyName() { + return DASHBOARD_COLUMN_FAMILY_NAME; + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardInfoDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardInfoDao.java similarity index 79% rename from dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardInfoDaoImpl.java rename to dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardInfoDao.java index 007bc8d7bb..19527c7407 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardInfoDaoImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardInfoDao.java @@ -17,8 +17,10 @@ package org.thingsboard.server.dao.dashboard; 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.AbstractSearchTextDao; +import org.thingsboard.server.dao.CassandraAbstractSearchTextDao; +import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.DashboardInfoEntity; import java.util.Arrays; @@ -31,7 +33,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Component @Slf4j -public class DashboardInfoDaoImpl extends AbstractSearchTextDao implements DashboardInfoDao { +public class CassandraDashboardInfoDao extends CassandraAbstractSearchTextDao implements DashboardInfoDao { @Override protected Class getColumnFamilyClass() { @@ -44,18 +46,18 @@ public class DashboardInfoDaoImpl extends AbstractSearchTextDao findDashboardsByTenantId(UUID tenantId, TextPageLink pageLink) { + public List findDashboardsByTenantId(UUID tenantId, TextPageLink pageLink) { log.debug("Try to find dashboards by tenantId [{}] and pageLink [{}]", tenantId, pageLink); List dashboardEntities = findPageWithTextSearch(DASHBOARD_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, Collections.singletonList(eq(DASHBOARD_TENANT_ID_PROPERTY, tenantId)), pageLink); log.trace("Found dashboards [{}] by tenantId [{}] and pageLink [{}]", dashboardEntities, tenantId, pageLink); - return dashboardEntities; + return DaoUtil.convertDataList(dashboardEntities); } @Override - public List findDashboardsByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink) { + public List findDashboardsByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink) { log.debug("Try to find dashboards by tenantId [{}], customerId[{}] and pageLink [{}]", tenantId, customerId, pageLink); List dashboardEntities = findPageWithTextSearch(DASHBOARD_BY_CUSTOMER_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, Arrays.asList(eq(DASHBOARD_CUSTOMER_ID_PROPERTY, customerId), @@ -63,7 +65,7 @@ public class DashboardInfoDaoImpl extends AbstractSearchTextDao the generic type */ -public interface DashboardDao extends Dao { +public interface DashboardDao extends Dao { /** * Save or update dashboard object @@ -37,6 +29,6 @@ public interface DashboardDao extends Dao { * @param dashboard the dashboard object * @return saved dashboard object */ - DashboardEntity save(Dashboard dashboard); + Dashboard save(Dashboard dashboard); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardDaoImpl.java deleted file mode 100644 index 23546fde69..0000000000 --- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardDaoImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -/** - * 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.dashboard; - -import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; -import static org.thingsboard.server.dao.model.ModelConstants.DASHBOARD_BY_CUSTOMER_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME; -import static org.thingsboard.server.dao.model.ModelConstants.DASHBOARD_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME; -import static org.thingsboard.server.dao.model.ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME; -import static org.thingsboard.server.dao.model.ModelConstants.DASHBOARD_CUSTOMER_ID_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.DASHBOARD_TENANT_ID_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; - -import java.util.Arrays; -import java.util.List; -import java.util.UUID; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.thingsboard.server.common.data.Dashboard; -import org.thingsboard.server.common.data.page.TextPageLink; -import org.thingsboard.server.dao.AbstractSearchTextDao; -import org.thingsboard.server.dao.model.DashboardEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.thingsboard.server.dao.model.DashboardInfoEntity; - -@Component -@Slf4j -public class DashboardDaoImpl extends AbstractSearchTextDao implements DashboardDao { - - @Override - protected Class getColumnFamilyClass() { - return DashboardEntity.class; - } - - @Override - protected String getColumnFamilyName() { - return DASHBOARD_COLUMN_FAMILY_NAME; - } - - @Override - public DashboardEntity save(Dashboard dashboard) { - log.debug("Save dashboard [{}] ", dashboard); - return save(new DashboardEntity(dashboard)); - } - -} diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardInfoDao.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardInfoDao.java index 9852b358be..a26bd1410f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardInfoDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardInfoDao.java @@ -15,21 +15,17 @@ */ package org.thingsboard.server.dao.dashboard; -import java.util.List; -import java.util.UUID; - -import org.thingsboard.server.common.data.Dashboard; +import org.thingsboard.server.common.data.DashboardInfo; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.dao.Dao; -import org.thingsboard.server.dao.model.DashboardEntity; -import org.thingsboard.server.dao.model.DashboardInfoEntity; + +import java.util.List; +import java.util.UUID; /** * The Interface DashboardInfoDao. - * - * @param the generic type */ -public interface DashboardInfoDao extends Dao { +public interface DashboardInfoDao extends Dao { /** * Find dashboards by tenantId and page link. @@ -38,7 +34,7 @@ public interface DashboardInfoDao extends Dao { * @param pageLink the page link * @return the list of dashboard objects */ - List findDashboardsByTenantId(UUID tenantId, TextPageLink pageLink); + List findDashboardsByTenantId(UUID tenantId, TextPageLink pageLink); /** * Find dashboards by tenantId, customerId and page link. @@ -48,6 +44,6 @@ public interface DashboardInfoDao extends Dao { * @param pageLink the page link * @return the list of dashboard objects */ - List findDashboardsByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink); + List findDashboardsByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardService.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardService.java index 8c860646bd..b49b5b44fe 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardService.java @@ -25,22 +25,22 @@ import org.thingsboard.server.common.data.page.TextPageLink; public interface DashboardService { - public Dashboard findDashboardById(DashboardId dashboardId); - - public Dashboard saveDashboard(Dashboard dashboard); - - public Dashboard assignDashboardToCustomer(DashboardId dashboardId, CustomerId customerId); + Dashboard findDashboardById(DashboardId dashboardId); - public Dashboard unassignDashboardFromCustomer(DashboardId dashboardId); + Dashboard saveDashboard(Dashboard dashboard); - public void deleteDashboard(DashboardId dashboardId); - - public TextPageData findDashboardsByTenantId(TenantId tenantId, TextPageLink pageLink); + Dashboard assignDashboardToCustomer(DashboardId dashboardId, CustomerId customerId); - public void deleteDashboardsByTenantId(TenantId tenantId); - - public TextPageData findDashboardsByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, TextPageLink pageLink); + Dashboard unassignDashboardFromCustomer(DashboardId dashboardId); + + void deleteDashboard(DashboardId dashboardId); + + TextPageData findDashboardsByTenantId(TenantId tenantId, TextPageLink pageLink); + + void deleteDashboardsByTenantId(TenantId tenantId); + + TextPageData findDashboardsByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, TextPageLink pageLink); + + void unassignCustomerDashboards(TenantId tenantId, CustomerId customerId); - public void unassignCustomerDashboards(TenantId tenantId, CustomerId customerId); - } diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java index 2e0abfbdfd..fca73c4ae4 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java @@ -15,15 +15,14 @@ */ package org.thingsboard.server.dao.dashboard; -import static org.thingsboard.server.dao.DaoUtil.convertDataList; -import static org.thingsboard.server.dao.DaoUtil.getData; - -import java.util.List; - import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.Dashboard; import org.thingsboard.server.common.data.DashboardInfo; +import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DashboardId; import org.thingsboard.server.common.data.id.TenantId; @@ -31,15 +30,13 @@ import org.thingsboard.server.common.data.page.TextPageData; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.dao.customer.CustomerDao; import org.thingsboard.server.dao.exception.DataValidationException; -import org.thingsboard.server.dao.model.*; +import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.PaginatedRemover; -import org.thingsboard.server.dao.tenant.TenantDao; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import org.thingsboard.server.dao.service.Validator; +import org.thingsboard.server.dao.tenant.TenantDao; + +import java.util.List; @Service @Slf4j @@ -61,16 +58,14 @@ public class DashboardServiceImpl implements DashboardService { public Dashboard findDashboardById(DashboardId dashboardId) { log.trace("Executing findDashboardById [{}]", dashboardId); Validator.validateId(dashboardId, "Incorrect dashboardId " + dashboardId); - DashboardEntity dashboardEntity = dashboardDao.findById(dashboardId.getId()); - return getData(dashboardEntity); + return dashboardDao.findById(dashboardId.getId()); } @Override public Dashboard saveDashboard(Dashboard dashboard) { log.trace("Executing saveDashboard [{}]", dashboard); dashboardValidator.validate(dashboard); - DashboardEntity dashboardEntity = dashboardDao.save(dashboard); - return getData(dashboardEntity); + return dashboardDao.save(dashboard); } @Override @@ -99,9 +94,8 @@ public class DashboardServiceImpl implements DashboardService { log.trace("Executing findDashboardsByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink); Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink); - List dashboardEntities = dashboardInfoDao.findDashboardsByTenantId(tenantId.getId(), pageLink); - List dashboards = convertDataList(dashboardEntities); - return new TextPageData(dashboards, pageLink); + List dashboards = dashboardInfoDao.findDashboardsByTenantId(tenantId.getId(), pageLink); + return new TextPageData<>(dashboards, pageLink); } @Override @@ -117,9 +111,8 @@ public class DashboardServiceImpl implements DashboardService { Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); Validator.validateId(customerId, "Incorrect customerId " + customerId); Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink); - List dashboardEntities = dashboardInfoDao.findDashboardsByTenantIdAndCustomerId(tenantId.getId(), customerId.getId(), pageLink); - List dashboards = convertDataList(dashboardEntities); - return new TextPageData(dashboards, pageLink); + List dashboards = dashboardInfoDao.findDashboardsByTenantIdAndCustomerId(tenantId.getId(), customerId.getId(), pageLink); + return new TextPageData<>(dashboards, pageLink); } @Override @@ -140,7 +133,7 @@ public class DashboardServiceImpl implements DashboardService { if (dashboard.getTenantId() == null) { throw new DataValidationException("Dashboard should be assigned to tenant!"); } else { - TenantEntity tenant = tenantDao.findById(dashboard.getTenantId().getId()); + Tenant tenant = tenantDao.findById(dashboard.getTenantId().getId()); if (tenant == null) { throw new DataValidationException("Dashboard is referencing to non-existent tenant!"); } @@ -148,32 +141,32 @@ public class DashboardServiceImpl implements DashboardService { if (dashboard.getCustomerId() == null) { dashboard.setCustomerId(new CustomerId(ModelConstants.NULL_UUID)); } else if (!dashboard.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) { - CustomerEntity customer = customerDao.findById(dashboard.getCustomerId().getId()); + Customer customer = customerDao.findById(dashboard.getCustomerId().getId()); if (customer == null) { throw new DataValidationException("Can't assign dashboard to non-existent customer!"); } - if (!customer.getTenantId().equals(dashboard.getTenantId().getId())) { + if (!customer.getTenantId().getId().equals(dashboard.getTenantId().getId())) { throw new DataValidationException("Can't assign dashboard to customer from different tenant!"); } } } }; - private PaginatedRemover tenantDashboardsRemover = - new PaginatedRemover() { + private PaginatedRemover tenantDashboardsRemover = + new PaginatedRemover() { @Override - protected List findEntities(TenantId id, TextPageLink pageLink) { + protected List findEntities(TenantId id, TextPageLink pageLink) { return dashboardInfoDao.findDashboardsByTenantId(id.getId(), pageLink); } @Override - protected void removeEntity(DashboardInfoEntity entity) { - deleteDashboard(new DashboardId(entity.getId())); + protected void removeEntity(DashboardInfo entity) { + deleteDashboard(new DashboardId(entity.getUuidId())); } }; - class CustomerDashboardsUnassigner extends PaginatedRemover { + private class CustomerDashboardsUnassigner extends PaginatedRemover { private TenantId tenantId; @@ -182,13 +175,13 @@ public class DashboardServiceImpl implements DashboardService { } @Override - protected List findEntities(CustomerId id, TextPageLink pageLink) { + protected List findEntities(CustomerId id, TextPageLink pageLink) { return dashboardInfoDao.findDashboardsByTenantIdAndCustomerId(tenantId.getId(), id.getId(), pageLink); } @Override - protected void removeEntity(DashboardInfoEntity entity) { - unassignDashboardFromCustomer(new DashboardId(entity.getId())); + protected void removeEntity(DashboardInfo entity) { + unassignDashboardFromCustomer(new DashboardId(entity.getUuidId())); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceCredentialsDao.java similarity index 77% rename from dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsDaoImpl.java rename to dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceCredentialsDao.java index 68fbc8ca64..c96367e945 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsDaoImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceCredentialsDao.java @@ -15,26 +15,23 @@ */ package org.thingsboard.server.dao.device; -import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; -import static com.datastax.driver.core.querybuilder.QueryBuilder.select; - -import java.util.UUID; - +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.AbstractModelDao; +import org.thingsboard.server.dao.CassandraAbstractModelDao; +import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.DeviceCredentialsEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Repository; - -import com.datastax.driver.core.querybuilder.Select.Where; import org.thingsboard.server.dao.model.ModelConstants; +import java.util.UUID; + +import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; +import static com.datastax.driver.core.querybuilder.QueryBuilder.select; + @Component @Slf4j -public class DeviceCredentialsDaoImpl extends AbstractModelDao implements DeviceCredentialsDao { +public class CassandraDeviceCredentialsDao extends CassandraAbstractModelDao implements DeviceCredentialsDao { @Override protected Class getColumnFamilyClass() { @@ -47,31 +44,24 @@ public class DeviceCredentialsDaoImpl extends AbstractModelDao implements DeviceDao { +public class CassandraDeviceDao extends CassandraAbstractSearchTextDao implements DeviceDao { @Override protected Class getColumnFamilyClass() { @@ -48,23 +45,17 @@ public class DeviceDaoImpl extends AbstractSearchTextDao implement } @Override - public DeviceEntity save(Device device) { - log.debug("Save device [{}] ", device); - return save(new DeviceEntity(device)); - } - - @Override - public List findDevicesByTenantId(UUID tenantId, TextPageLink pageLink) { + public List findDevicesByTenantId(UUID tenantId, TextPageLink pageLink) { log.debug("Try to find devices by tenantId [{}] and pageLink [{}]", tenantId, pageLink); List deviceEntities = findPageWithTextSearch(DEVICE_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, Collections.singletonList(eq(DEVICE_TENANT_ID_PROPERTY, tenantId)), pageLink); log.trace("Found devices [{}] by tenantId [{}] and pageLink [{}]", deviceEntities, tenantId, pageLink); - return deviceEntities; + return DaoUtil.convertDataList(deviceEntities); } @Override - public ListenableFuture> findDevicesByTenantIdAndIdsAsync(UUID tenantId, List deviceIds) { + public ListenableFuture> findDevicesByTenantIdAndIdsAsync(UUID tenantId, List deviceIds) { log.debug("Try to find devices by tenantId [{}] and device Ids [{}]", tenantId, deviceIds); Select select = select().from(getColumnFamilyName()); Select.Where query = select.where(); @@ -74,7 +65,7 @@ public class DeviceDaoImpl extends AbstractSearchTextDao implement } @Override - public List findDevicesByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink) { + public List findDevicesByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink) { log.debug("Try to find devices by tenantId [{}], customerId[{}] and pageLink [{}]", tenantId, customerId, pageLink); List deviceEntities = findPageWithTextSearch(DEVICE_BY_CUSTOMER_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, Arrays.asList(eq(DEVICE_CUSTOMER_ID_PROPERTY, customerId), @@ -82,11 +73,11 @@ public class DeviceDaoImpl extends AbstractSearchTextDao implement pageLink); log.trace("Found devices [{}] by tenantId [{}], customerId [{}] and pageLink [{}]", deviceEntities, tenantId, customerId, pageLink); - return deviceEntities; + return DaoUtil.convertDataList(deviceEntities); } @Override - public ListenableFuture> findDevicesByTenantIdCustomerIdAndIdsAsync(UUID tenantId, UUID customerId, List deviceIds) { + public ListenableFuture> findDevicesByTenantIdCustomerIdAndIdsAsync(UUID tenantId, UUID customerId, List deviceIds) { log.debug("Try to find devices by tenantId [{}], customerId [{}] and device Ids [{}]", tenantId, customerId, deviceIds); Select select = select().from(getColumnFamilyName()); Select.Where query = select.where(); @@ -97,12 +88,12 @@ public class DeviceDaoImpl extends AbstractSearchTextDao implement } @Override - public Optional findDevicesByTenantIdAndName(UUID tenantId, String deviceName) { + public Optional findDevicesByTenantIdAndName(UUID tenantId, String deviceName) { Select select = select().from(DEVICE_BY_TENANT_AND_NAME_VIEW_NAME); Select.Where query = select.where(); query.and(eq(DEVICE_TENANT_ID_PROPERTY, tenantId)); query.and(eq(DEVICE_NAME_PROPERTY, deviceName)); - return Optional.ofNullable(findOneByStatement(query)); + return Optional.ofNullable(DaoUtil.getData(findOneByStatement(query))); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsDao.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsDao.java index 89a4a025c5..c13129ad1d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsDao.java @@ -15,18 +15,15 @@ */ package org.thingsboard.server.dao.device; -import java.util.UUID; - import org.thingsboard.server.common.data.security.DeviceCredentials; import org.thingsboard.server.dao.Dao; -import org.thingsboard.server.dao.model.DeviceCredentialsEntity; + +import java.util.UUID; /** * The Interface DeviceCredentialsDao. - * - * @param the generic type */ -public interface DeviceCredentialsDao extends Dao { +public interface DeviceCredentialsDao extends Dao { /** * Save or update device credentials object @@ -34,7 +31,7 @@ public interface DeviceCredentialsDao extends Dao { * @param deviceCredentials the device credentials object * @return saved device credentials object */ - DeviceCredentialsEntity save(DeviceCredentials deviceCredentials); + DeviceCredentials save(DeviceCredentials deviceCredentials); /** * Find device credentials by device id. @@ -42,7 +39,7 @@ public interface DeviceCredentialsDao extends Dao { * @param deviceId the device id * @return the device credentials object */ - DeviceCredentialsEntity findByDeviceId(UUID deviceId); + DeviceCredentials findByDeviceId(UUID deviceId); /** * Find device credentials by credentials id. @@ -50,6 +47,6 @@ public interface DeviceCredentialsDao extends Dao { * @param credentialsId the credentials id * @return the device credentials object */ - DeviceCredentialsEntity findByCredentialsId(String credentialsId); + DeviceCredentials findByCredentialsId(String credentialsId); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java index 10e329ad4d..ae2322121c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java @@ -26,10 +26,8 @@ import org.thingsboard.server.common.data.security.DeviceCredentials; import org.thingsboard.server.common.data.security.DeviceCredentialsType; import org.thingsboard.server.dao.EncryptionUtil; import org.thingsboard.server.dao.exception.DataValidationException; -import org.thingsboard.server.dao.model.DeviceCredentialsEntity; import org.thingsboard.server.dao.service.DataValidator; -import static org.thingsboard.server.dao.DaoUtil.getData; import static org.thingsboard.server.dao.service.Validator.validateId; import static org.thingsboard.server.dao.service.Validator.validateString; @@ -47,16 +45,14 @@ public class DeviceCredentialsServiceImpl implements DeviceCredentialsService { public DeviceCredentials findDeviceCredentialsByDeviceId(DeviceId deviceId) { log.trace("Executing findDeviceCredentialsByDeviceId [{}]", deviceId); validateId(deviceId, "Incorrect deviceId " + deviceId); - DeviceCredentialsEntity deviceCredentialsEntity = deviceCredentialsDao.findByDeviceId(deviceId.getId()); - return getData(deviceCredentialsEntity); + return deviceCredentialsDao.findByDeviceId(deviceId.getId()); } @Override public DeviceCredentials findDeviceCredentialsByCredentialsId(String credentialsId) { log.trace("Executing findDeviceCredentialsByCredentialsId [{}]", credentialsId); validateString(credentialsId, "Incorrect credentialsId " + credentialsId); - DeviceCredentialsEntity deviceCredentialsEntity = deviceCredentialsDao.findByCredentialsId(credentialsId); - return getData(deviceCredentialsEntity); + return deviceCredentialsDao.findByCredentialsId(credentialsId); } @Override @@ -75,7 +71,7 @@ public class DeviceCredentialsServiceImpl implements DeviceCredentialsService { } log.trace("Executing updateDeviceCredentials [{}]", deviceCredentials); credentialsValidator.validate(deviceCredentials); - return getData(deviceCredentialsDao.save(deviceCredentials)); + return deviceCredentialsDao.save(deviceCredentials); } private void formatCertData(DeviceCredentials deviceCredentials) { @@ -96,7 +92,7 @@ public class DeviceCredentialsServiceImpl implements DeviceCredentialsService { @Override protected void validateCreate(DeviceCredentials deviceCredentials) { - DeviceCredentialsEntity existingCredentialsEntity = deviceCredentialsDao.findByCredentialsId(deviceCredentials.getCredentialsId()); + DeviceCredentials existingCredentialsEntity = deviceCredentialsDao.findByCredentialsId(deviceCredentials.getCredentialsId()); if (existingCredentialsEntity != null) { throw new DataValidationException("Create of existent device credentials!"); } @@ -104,12 +100,12 @@ public class DeviceCredentialsServiceImpl implements DeviceCredentialsService { @Override protected void validateUpdate(DeviceCredentials deviceCredentials) { - DeviceCredentialsEntity existingCredentialsEntity = deviceCredentialsDao.findById(deviceCredentials.getUuidId()); - if (existingCredentialsEntity == null) { + DeviceCredentials existingCredentials = deviceCredentialsDao.findById(deviceCredentials.getUuidId()); + if (existingCredentials == null) { throw new DataValidationException("Unable to update non-existent device credentials!"); } - DeviceCredentialsEntity sameCredentialsIdEntity = deviceCredentialsDao.findByCredentialsId(deviceCredentials.getCredentialsId()); - if (sameCredentialsIdEntity != null && !sameCredentialsIdEntity.getId().equals(deviceCredentials.getUuidId())) { + DeviceCredentials sameCredentialsId = deviceCredentialsDao.findByCredentialsId(deviceCredentials.getCredentialsId()); + if (sameCredentialsId != null && !sameCredentialsId.getUuidId().equals(deviceCredentials.getUuidId())) { throw new DataValidationException("Specified credentials are already registered!"); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java index b8d395c8e2..86d2f8f7e6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java @@ -15,21 +15,20 @@ */ package org.thingsboard.server.dao.device; -import java.util.List; -import java.util.Optional; -import java.util.UUID; - import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.dao.Dao; -import org.thingsboard.server.dao.model.DeviceEntity; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; /** * The Interface DeviceDao. * */ -public interface DeviceDao extends Dao { +public interface DeviceDao extends Dao { /** * Save or update device object @@ -37,7 +36,7 @@ public interface DeviceDao extends Dao { * @param device the device object * @return saved device object */ - DeviceEntity save(Device device); + Device save(Device device); /** * Find devices by tenantId and page link. @@ -46,7 +45,7 @@ public interface DeviceDao extends Dao { * @param pageLink the page link * @return the list of device objects */ - List findDevicesByTenantId(UUID tenantId, TextPageLink pageLink); + List findDevicesByTenantId(UUID tenantId, TextPageLink pageLink); /** * Find devices by tenantId and devices Ids. @@ -55,7 +54,7 @@ public interface DeviceDao extends Dao { * @param deviceIds the device Ids * @return the list of device objects */ - ListenableFuture> findDevicesByTenantIdAndIdsAsync(UUID tenantId, List deviceIds); + ListenableFuture> findDevicesByTenantIdAndIdsAsync(UUID tenantId, List deviceIds); /** * Find devices by tenantId, customerId and page link. @@ -65,7 +64,7 @@ public interface DeviceDao extends Dao { * @param pageLink the page link * @return the list of device objects */ - List findDevicesByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink); + List findDevicesByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink); /** * Find devices by tenantId, customerId and devices Ids. @@ -75,7 +74,7 @@ public interface DeviceDao extends Dao { * @param deviceIds the device Ids * @return the list of device objects */ - ListenableFuture> findDevicesByTenantIdCustomerIdAndIdsAsync(UUID tenantId, UUID customerId, List deviceIds); + ListenableFuture> findDevicesByTenantIdCustomerIdAndIdsAsync(UUID tenantId, UUID customerId, List deviceIds); /** * Find devices by tenantId and device name. @@ -84,5 +83,5 @@ public interface DeviceDao extends Dao { * @param name the device name * @return the optional device object */ - Optional findDevicesByTenantIdAndName(UUID tenantId, String name); + Optional findDevicesByTenantIdAndName(UUID tenantId, String name); } 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 3d1ce31349..4a365949cc 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 @@ -43,13 +43,9 @@ import org.thingsboard.server.dao.tenant.TenantDao; import java.util.List; import java.util.Optional; -import static org.thingsboard.server.dao.DaoUtil.convertDataList; -import static org.thingsboard.server.dao.DaoUtil.getData; -import static org.thingsboard.server.dao.DaoUtil.toUUIDs; +import static org.thingsboard.server.dao.DaoUtil.*; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; -import static org.thingsboard.server.dao.service.Validator.validateId; -import static org.thingsboard.server.dao.service.Validator.validateIds; -import static org.thingsboard.server.dao.service.Validator.validatePageLink; +import static org.thingsboard.server.dao.service.Validator.*; @Service @Slf4j @@ -71,15 +67,14 @@ public class DeviceServiceImpl implements DeviceService { public Device findDeviceById(DeviceId deviceId) { log.trace("Executing findDeviceById [{}]", deviceId); validateId(deviceId, "Incorrect deviceId " + deviceId); - DeviceEntity deviceEntity = deviceDao.findById(deviceId.getId()); - return getData(deviceEntity); + return deviceDao.findById(deviceId.getId()); } @Override public ListenableFuture findDeviceByIdAsync(DeviceId deviceId) { log.trace("Executing findDeviceById [{}]", deviceId); validateId(deviceId, "Incorrect deviceId " + deviceId); - ListenableFuture deviceEntity = deviceDao.findByIdAsync(deviceId.getId()); + ListenableFuture deviceEntity = deviceDao.findByIdAsync(deviceId.getId()); return Futures.transform(deviceEntity, (Function) input -> getData(input)); } @@ -87,9 +82,9 @@ public class DeviceServiceImpl implements DeviceService { public Optional findDeviceByTenantIdAndName(TenantId tenantId, String name) { log.trace("Executing findDeviceByTenantIdAndName [{}][{}]", tenantId, name); validateId(tenantId, "Incorrect tenantId " + tenantId); - Optional deviceEntityOpt = deviceDao.findDevicesByTenantIdAndName(tenantId.getId(), name); + Optional deviceEntityOpt = deviceDao.findDevicesByTenantIdAndName(tenantId.getId(), name); if (deviceEntityOpt.isPresent()) { - return Optional.of(getData(deviceEntityOpt.get())); + return Optional.of(deviceEntityOpt.get()); } else { return Optional.empty(); } @@ -99,15 +94,15 @@ public class DeviceServiceImpl implements DeviceService { public Device saveDevice(Device device) { log.trace("Executing saveDevice [{}]", device); deviceValidator.validate(device); - DeviceEntity deviceEntity = deviceDao.save(device); + Device savedDevice = deviceDao.save(device); if (device.getId() == null) { DeviceCredentials deviceCredentials = new DeviceCredentials(); - deviceCredentials.setDeviceId(new DeviceId(deviceEntity.getId())); + deviceCredentials.setDeviceId(new DeviceId(savedDevice.getUuidId())); deviceCredentials.setCredentialsType(DeviceCredentialsType.ACCESS_TOKEN); deviceCredentials.setCredentialsId(RandomStringUtils.randomAlphanumeric(20)); deviceCredentialsService.createDeviceCredentials(deviceCredentials); } - return getData(deviceEntity); + return savedDevice; } @Override @@ -140,8 +135,7 @@ public class DeviceServiceImpl implements DeviceService { log.trace("Executing findDevicesByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink); validateId(tenantId, "Incorrect tenantId " + tenantId); validatePageLink(pageLink, "Incorrect page link " + pageLink); - List deviceEntities = deviceDao.findDevicesByTenantId(tenantId.getId(), pageLink); - List devices = convertDataList(deviceEntities); + List devices = deviceDao.findDevicesByTenantId(tenantId.getId(), pageLink); return new TextPageData(devices, pageLink); } @@ -150,7 +144,7 @@ public class DeviceServiceImpl implements DeviceService { log.trace("Executing findDevicesByTenantIdAndIdsAsync, tenantId [{}], deviceIds [{}]", tenantId, deviceIds); validateId(tenantId, "Incorrect tenantId " + tenantId); validateIds(deviceIds, "Incorrect deviceIds " + deviceIds); - ListenableFuture> deviceEntities = deviceDao.findDevicesByTenantIdAndIdsAsync(tenantId.getId(), toUUIDs(deviceIds)); + ListenableFuture> devices = deviceDao.findDevicesByTenantIdAndIdsAsync(tenantId.getId(), toUUIDs(deviceIds)); return Futures.transform(deviceEntities, (Function, List>) input -> convertDataList(input)); } @@ -168,8 +162,7 @@ public class DeviceServiceImpl implements DeviceService { validateId(tenantId, "Incorrect tenantId " + tenantId); validateId(customerId, "Incorrect customerId " + customerId); validatePageLink(pageLink, "Incorrect page link " + pageLink); - List deviceEntities = deviceDao.findDevicesByTenantIdAndCustomerId(tenantId.getId(), customerId.getId(), pageLink); - List devices = convertDataList(deviceEntities); + List devices = deviceDao.findDevicesByTenantIdAndCustomerId(tenantId.getId(), customerId.getId(), pageLink); return new TextPageData(devices, pageLink); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java b/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java index 625f1f58ff..65fc5679f1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.event; +// CASSANDRA ??? import com.datastax.driver.core.utils.UUIDs; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -27,14 +28,11 @@ import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.TimePageData; import org.thingsboard.server.common.data.page.TimePageLink; import org.thingsboard.server.dao.exception.DataValidationException; -import org.thingsboard.server.dao.model.EventEntity; import org.thingsboard.server.dao.service.DataValidator; import java.util.List; import java.util.Optional; -import static org.thingsboard.server.dao.DaoUtil.convertDataList; -import static org.thingsboard.server.dao.DaoUtil.getData; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @Service @@ -59,7 +57,7 @@ public class BaseEventService implements EventService { if (StringUtils.isEmpty(event.getUid())) { event.setUid(event.getId().toString()); } - return getData(eventDao.save(event)); + return eventDao.save(event); } @Override @@ -75,8 +73,8 @@ public class BaseEventService implements EventService { if (event.getId() == null) { event.setId(new EventId(UUIDs.timeBased())); } - Optional result = eventDao.saveIfNotExists(event); - return result.isPresent() ? Optional.of(getData(result.get())) : Optional.empty(); + Optional result = eventDao.saveIfNotExists(event); + return result.isPresent() ? Optional.of(result.get()) : Optional.empty(); } @Override @@ -93,22 +91,19 @@ public class BaseEventService implements EventService { if (StringUtils.isEmpty(eventUid)) { throw new DataValidationException("Event uid should be specified!."); } - EventEntity entity = eventDao.findEvent(tenantId.getId(), entityId, eventType, eventUid); - return entity != null ? Optional.of(getData(entity)) : Optional.empty(); + Event event = eventDao.findEvent(tenantId.getId(), entityId, eventType, eventUid); + return event != null ? Optional.of(event) : Optional.empty(); } @Override public TimePageData findEvents(TenantId tenantId, EntityId entityId, TimePageLink pageLink) { - List entities = eventDao.findEvents(tenantId.getId(), entityId, pageLink); - List events = convertDataList(entities); + List events = eventDao.findEvents(tenantId.getId(), entityId, pageLink); return new TimePageData(events, pageLink); } - @Override public TimePageData findEvents(TenantId tenantId, EntityId entityId, String eventType, TimePageLink pageLink) { - List entities = eventDao.findEvents(tenantId.getId(), entityId, eventType, pageLink); - List events = convertDataList(entities); + List events = eventDao.findEvents(tenantId.getId(), entityId, eventType, pageLink); return new TimePageData(events, pageLink); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java similarity index 84% rename from dao/src/main/java/org/thingsboard/server/dao/event/BaseEventDao.java rename to dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java index ce50466a8b..adfef10539 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java @@ -26,6 +26,7 @@ import org.thingsboard.server.common.data.Event; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.page.TimePageLink; import org.thingsboard.server.dao.AbstractSearchTimeDao; +import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.EventEntity; import org.thingsboard.server.dao.model.ModelConstants; @@ -36,13 +37,11 @@ import java.util.UUID; import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; import static com.datastax.driver.core.querybuilder.QueryBuilder.select; -import static org.thingsboard.server.dao.model.ModelConstants.EVENT_BY_ID_VIEW_NAME; -import static org.thingsboard.server.dao.model.ModelConstants.EVENT_BY_TYPE_AND_ID_VIEW_NAME; -import static org.thingsboard.server.dao.model.ModelConstants.EVENT_COLUMN_FAMILY_NAME; +import static org.thingsboard.server.dao.model.ModelConstants.*; @Component @Slf4j -public class BaseEventDao extends AbstractSearchTimeDao implements EventDao { +public class CassandraBaseEventDao extends AbstractSearchTimeDao implements EventDao { @Override protected Class getColumnFamilyClass() { @@ -55,18 +54,18 @@ public class BaseEventDao extends AbstractSearchTimeDao implements } @Override - public EventEntity save(Event event) { + public Event save(Event event) { log.debug("Save event [{}] ", event); return save(new EventEntity(event), false).orElse(null); } @Override - public Optional saveIfNotExists(Event event) { + public Optional saveIfNotExists(Event event) { return save(new EventEntity(event), true); } @Override - public EventEntity findEvent(UUID tenantId, EntityId entityId, String eventType, String eventUid) { + public Event findEvent(UUID tenantId, EntityId entityId, String eventType, String eventUid) { log.debug("Search event entity by [{}][{}][{}][{}]", tenantId, entityId, eventType, eventUid); Select.Where query = select().from(getColumnFamilyName()).where( eq(ModelConstants.EVENT_TENANT_ID_PROPERTY, tenantId)) @@ -81,11 +80,11 @@ public class BaseEventDao extends AbstractSearchTimeDao implements } else { log.debug("Search result: [{}]", entity != null); } - return entity; + return DaoUtil.getData(entity); } @Override - public List findEvents(UUID tenantId, EntityId entityId, TimePageLink pageLink) { + public List findEvents(UUID tenantId, EntityId entityId, TimePageLink pageLink) { log.trace("Try to find events by tenant [{}], entity [{}]and pageLink [{}]", tenantId, entityId, pageLink); List entities = findPageWithTimeSearch(EVENT_BY_ID_VIEW_NAME, Arrays.asList(eq(ModelConstants.EVENT_TENANT_ID_PROPERTY, tenantId), @@ -93,11 +92,11 @@ public class BaseEventDao extends AbstractSearchTimeDao implements eq(ModelConstants.EVENT_ENTITY_ID_PROPERTY, entityId.getId())), pageLink); log.trace("Found events by tenant [{}], entity [{}] and pageLink [{}]", tenantId, entityId, pageLink); - return entities; + return DaoUtil.convertDataList(entities); } @Override - public List findEvents(UUID tenantId, EntityId entityId, String eventType, TimePageLink pageLink) { + public List findEvents(UUID tenantId, EntityId entityId, String eventType, TimePageLink pageLink) { log.trace("Try to find events by tenant [{}], entity [{}], type [{}] and pageLink [{}]", tenantId, entityId, eventType, pageLink); List entities = findPageWithTimeSearch(EVENT_BY_TYPE_AND_ID_VIEW_NAME, Arrays.asList(eq(ModelConstants.EVENT_TENANT_ID_PROPERTY, tenantId), @@ -108,10 +107,10 @@ public class BaseEventDao extends AbstractSearchTimeDao implements QueryBuilder.desc(ModelConstants.EVENT_TYPE_PROPERTY), pageLink); log.trace("Found events by tenant [{}], entity [{}], type [{}] and pageLink [{}]", tenantId, entityId, eventType, pageLink); - return entities; + return DaoUtil.convertDataList(entities); } - private Optional save(EventEntity entity, boolean ifNotExists) { + private Optional save(EventEntity entity, boolean ifNotExists) { if (entity.getId() == null) { entity.setId(UUIDs.timeBased()); } @@ -128,7 +127,7 @@ public class BaseEventDao extends AbstractSearchTimeDao implements } ResultSet rs = executeWrite(insert); if (rs.wasApplied()) { - return Optional.of(entity); + return Optional.of(DaoUtil.getData(entity)); } else { return Optional.empty(); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/EventDao.java b/dao/src/main/java/org/thingsboard/server/dao/event/EventDao.java index 1556a5c089..846c4768d6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/event/EventDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/event/EventDao.java @@ -19,7 +19,6 @@ import org.thingsboard.server.common.data.Event; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.page.TimePageLink; import org.thingsboard.server.dao.Dao; -import org.thingsboard.server.dao.model.EventEntity; import java.util.List; import java.util.Optional; @@ -27,10 +26,8 @@ import java.util.UUID; /** * The Interface DeviceDao. - * - * @param the generic type */ -public interface EventDao extends Dao { +public interface EventDao extends Dao { /** * Save or update event object @@ -38,7 +35,7 @@ public interface EventDao extends Dao { * @param event the event object * @return saved event object */ - EventEntity save(Event event); + Event save(Event event); /** * Save event object if it is not yet saved @@ -46,7 +43,7 @@ public interface EventDao extends Dao { * @param event the event object * @return saved event object */ - Optional saveIfNotExists(Event event); + Optional saveIfNotExists(Event event); /** * Find event by tenantId, entityId and eventUid. @@ -57,7 +54,7 @@ public interface EventDao extends Dao { * @param eventUid the eventUid * @return the event */ - EventEntity findEvent(UUID tenantId, EntityId entityId, String eventType, String eventUid); + Event findEvent(UUID tenantId, EntityId entityId, String eventType, String eventUid); /** * Find events by tenantId, entityId and pageLink. @@ -67,7 +64,7 @@ public interface EventDao extends Dao { * @param pageLink the pageLink * @return the event list */ - List findEvents(UUID tenantId, EntityId entityId, TimePageLink pageLink); + List findEvents(UUID tenantId, EntityId entityId, TimePageLink pageLink); /** * Find events by tenantId, entityId, eventType and pageLink. @@ -78,5 +75,5 @@ public interface EventDao extends Dao { * @param pageLink the pageLink * @return the event list */ - List findEvents(UUID tenantId, EntityId entityId, String eventType, TimePageLink pageLink); + List findEvents(UUID tenantId, EntityId entityId, String eventType, TimePageLink pageLink); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/EventService.java b/dao/src/main/java/org/thingsboard/server/dao/event/EventService.java index 9237c89331..1fb40f1943 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/event/EventService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/event/EventService.java @@ -21,7 +21,6 @@ import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.TimePageData; import org.thingsboard.server.common.data.page.TimePageLink; -import java.util.List; import java.util.Optional; public interface EventService { diff --git a/dao/src/main/java/org/thingsboard/server/dao/plugin/BasePluginService.java b/dao/src/main/java/org/thingsboard/server/dao/plugin/BasePluginService.java index 99560d2b8a..b9b73c6c89 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/plugin/BasePluginService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/plugin/BasePluginService.java @@ -17,8 +17,6 @@ package org.thingsboard.server.dao.plugin; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.thingsboard.server.common.data.id.PluginId; @@ -29,13 +27,12 @@ import org.thingsboard.server.common.data.plugin.ComponentDescriptor; import org.thingsboard.server.common.data.plugin.ComponentLifecycleState; import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.common.data.plugin.PluginMetaData; +import org.thingsboard.server.common.data.rule.RuleMetaData; import org.thingsboard.server.dao.component.ComponentDescriptorService; import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.exception.DatabaseException; import org.thingsboard.server.dao.exception.IncorrectParameterException; import org.thingsboard.server.dao.model.ModelConstants; -import org.thingsboard.server.dao.model.PluginMetaDataEntity; -import org.thingsboard.server.dao.model.RuleMetaDataEntity; import org.thingsboard.server.dao.rule.RuleDao; import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.PaginatedRemover; @@ -46,9 +43,6 @@ import java.util.List; import java.util.UUID; import java.util.stream.Collectors; -import static org.thingsboard.server.dao.DaoUtil.convertDataList; -import static org.thingsboard.server.dao.DaoUtil.getData; - @Service @Slf4j public class BasePluginService implements PluginService { @@ -73,7 +67,7 @@ public class BasePluginService implements PluginService { plugin.setTenantId(SYSTEM_TENANT); } if (plugin.getId() != null) { - PluginMetaData oldVersion = getData(pluginDao.findById(plugin.getId())); + PluginMetaData oldVersion = pluginDao.findById(plugin.getId()); if (plugin.getState() == null) { plugin.setState(oldVersion.getState()); } else if (plugin.getState() != oldVersion.getState()) { @@ -92,33 +86,32 @@ public class BasePluginService implements PluginService { } else if (!ComponentType.PLUGIN.equals(descriptor.getType())) { throw new IncorrectParameterException("Plugin class is actually " + descriptor.getType() + "!"); } - PluginMetaDataEntity entity = pluginDao.findByApiToken(plugin.getApiToken()); - if (entity != null && (plugin.getId() == null || !entity.getId().equals(plugin.getId().getId()))) { + PluginMetaData savedPlugin = pluginDao.findByApiToken(plugin.getApiToken()); + if (savedPlugin != null && (plugin.getId() == null || !savedPlugin.getId().getId().equals(plugin.getId().getId()))) { throw new IncorrectParameterException("API token is already reserved!"); } if (!componentDescriptorService.validate(descriptor, plugin.getConfiguration())) { throw new IncorrectParameterException("Filters configuration is not valid!"); } - return getData(pluginDao.save(plugin)); + return pluginDao.save(plugin); } @Override public PluginMetaData findPluginById(PluginId pluginId) { Validator.validateId(pluginId, "Incorrect plugin id for search request."); - return getData(pluginDao.findById(pluginId)); + return pluginDao.findById(pluginId); } @Override public PluginMetaData findPluginByApiToken(String apiToken) { Validator.validateString(apiToken, "Incorrect plugin apiToken for search request."); - return getData(pluginDao.findByApiToken(apiToken)); + return pluginDao.findByApiToken(apiToken); } @Override public TextPageData findSystemPlugins(TextPageLink pageLink) { Validator.validatePageLink(pageLink, "Incorrect PageLink object for search system plugin request."); - List pluginEntities = pluginDao.findByTenantIdAndPageLink(SYSTEM_TENANT, pageLink); - List plugins = convertDataList(pluginEntities); + List plugins = pluginDao.findByTenantIdAndPageLink(SYSTEM_TENANT, pageLink); return new TextPageData<>(plugins, pageLink); } @@ -126,8 +119,7 @@ public class BasePluginService implements PluginService { public TextPageData findTenantPlugins(TenantId tenantId, TextPageLink pageLink) { Validator.validateId(tenantId, "Incorrect tenant id for search plugins request."); Validator.validatePageLink(pageLink, "Incorrect PageLink object for search plugin request."); - List pluginEntities = pluginDao.findByTenantIdAndPageLink(tenantId, pageLink); - List plugins = convertDataList(pluginEntities); + List plugins = pluginDao.findByTenantIdAndPageLink(tenantId, pageLink); return new TextPageData<>(plugins, pageLink); } @@ -152,8 +144,7 @@ public class BasePluginService implements PluginService { log.trace("Executing findAllTenantPluginsByTenantIdAndPageLink, tenantId [{}], pageLink [{}]", tenantId, pageLink); Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink); - List pluginsEntities = pluginDao.findAllTenantPluginsByTenantId(tenantId.getId(), pageLink); - List plugins = convertDataList(pluginsEntities); + List plugins = pluginDao.findAllTenantPluginsByTenantId(tenantId.getId(), pageLink); return new TextPageData<>(plugins, pageLink); } @@ -181,8 +172,8 @@ public class BasePluginService implements PluginService { @Override public void suspendPluginById(PluginId pluginId) { - PluginMetaDataEntity plugin = pluginDao.findById(pluginId); - List affectedRules = ruleDao.findRulesByPlugin(plugin.getApiToken()) + PluginMetaData plugin = pluginDao.findById(pluginId); + List affectedRules = ruleDao.findRulesByPlugin(plugin.getApiToken()) .stream().filter(rule -> rule.getState() == ComponentLifecycleState.ACTIVE).collect(Collectors.toList()); if (affectedRules.isEmpty()) { updateLifeCycleState(pluginId, ComponentLifecycleState.SUSPENDED); @@ -193,7 +184,7 @@ public class BasePluginService implements PluginService { private void updateLifeCycleState(PluginId pluginId, ComponentLifecycleState state) { Validator.validateId(pluginId, "Incorrect plugin id for state change request."); - PluginMetaDataEntity plugin = pluginDao.findById(pluginId); + PluginMetaData plugin = pluginDao.findById(pluginId); if (plugin != null) { plugin.setState(state); pluginDao.save(plugin); @@ -209,8 +200,8 @@ public class BasePluginService implements PluginService { } private void checkRulesAndDelete(UUID pluginId) { - PluginMetaDataEntity plugin = pluginDao.findById(pluginId); - List affectedRules = ruleDao.findRulesByPlugin(plugin.getApiToken()); + PluginMetaData plugin = pluginDao.findById(pluginId); + List affectedRules = ruleDao.findRulesByPlugin(plugin.getApiToken()); if (affectedRules.isEmpty()) { pluginDao.deleteById(pluginId); } else { @@ -244,17 +235,17 @@ public class BasePluginService implements PluginService { } }; - private PaginatedRemover tenantPluginRemover = - new PaginatedRemover() { + private PaginatedRemover tenantPluginRemover = + new PaginatedRemover() { @Override - protected List findEntities(TenantId id, TextPageLink pageLink) { + protected List findEntities(TenantId id, TextPageLink pageLink) { return pluginDao.findByTenantIdAndPageLink(id, pageLink); } @Override - protected void removeEntity(PluginMetaDataEntity entity) { - checkRulesAndDelete(entity.getId()); + protected void removeEntity(PluginMetaData entity) { + checkRulesAndDelete(entity.getUuidId()); } }; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/plugin/BasePluginDao.java b/dao/src/main/java/org/thingsboard/server/dao/plugin/CassandraBasePluginDao.java similarity index 77% rename from dao/src/main/java/org/thingsboard/server/dao/plugin/BasePluginDao.java rename to dao/src/main/java/org/thingsboard/server/dao/plugin/CassandraBasePluginDao.java index ae721541a6..054a3655fb 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/plugin/BasePluginDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/plugin/CassandraBasePluginDao.java @@ -15,17 +15,15 @@ */ package org.thingsboard.server.dao.plugin; -import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.querybuilder.Select; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; 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.AbstractSearchTextDao; +import org.thingsboard.server.dao.CassandraAbstractSearchTextDao; +import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.PluginMetaDataEntity; @@ -38,7 +36,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @Component @Slf4j -public class BasePluginDao extends AbstractSearchTextDao implements PluginDao { +public class CassandraBasePluginDao extends CassandraAbstractSearchTextDao implements PluginDao { @Override protected Class getColumnFamilyClass() { @@ -51,24 +49,19 @@ public class BasePluginDao extends AbstractSearchTextDao i } @Override - public PluginMetaDataEntity save(PluginMetaData plugin) { - return save(new PluginMetaDataEntity(plugin)); - } - - @Override - public PluginMetaDataEntity findById(PluginId pluginId) { + public PluginMetaData findById(PluginId pluginId) { log.debug("Search plugin meta-data entity by id [{}]", pluginId); - PluginMetaDataEntity entity = super.findById(pluginId.getId()); + PluginMetaData pluginMetaData = super.findById(pluginId.getId()); if (log.isTraceEnabled()) { - log.trace("Search result: [{}] for plugin entity [{}]", entity != null, entity); + log.trace("Search result: [{}] for plugin entity [{}]", pluginMetaData != null, pluginMetaData); } else { - log.debug("Search result: [{}]", entity != null); + log.debug("Search result: [{}]", pluginMetaData != null); } - return entity; + return pluginMetaData; } @Override - public PluginMetaDataEntity findByApiToken(String apiToken) { + public PluginMetaData findByApiToken(String apiToken) { log.debug("Search plugin meta-data entity by api token [{}]", apiToken); Select.Where query = select().from(ModelConstants.PLUGIN_BY_API_TOKEN_COLUMN_FAMILY_NAME).where(eq(ModelConstants.PLUGIN_API_TOKEN_PROPERTY, apiToken)); log.trace("Execute query [{}]", query); @@ -78,14 +71,14 @@ public class BasePluginDao extends AbstractSearchTextDao i } else { log.debug("Search result: [{}]", entity != null); } - return entity; + return DaoUtil.getData(entity); } @Override public void deleteById(UUID id) { log.debug("Delete plugin meta-data entity by id [{}]", id); - ResultSet resultSet = removeById(id); - log.debug("Delete result: [{}]", resultSet.wasApplied()); + boolean result = removeById(id); + log.debug("Delete result: [{}]", result); } @Override @@ -94,7 +87,7 @@ public class BasePluginDao extends AbstractSearchTextDao i } @Override - public List findByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink) { + public List findByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink) { log.debug("Try to find plugins by tenantId [{}] and pageLink [{}]", tenantId, pageLink); List entities = findPageWithTextSearch(ModelConstants.PLUGIN_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, Arrays.asList(eq(ModelConstants.PLUGIN_TENANT_ID_PROPERTY, tenantId.getId())), pageLink); @@ -103,11 +96,11 @@ public class BasePluginDao extends AbstractSearchTextDao i } else { log.debug("Search result: [{}]", entities.size()); } - return entities; + return DaoUtil.convertDataList(entities); } @Override - public List findAllTenantPluginsByTenantId(UUID tenantId, TextPageLink pageLink) { + public List findAllTenantPluginsByTenantId(UUID tenantId, TextPageLink pageLink) { log.debug("Try to find all tenant plugins by tenantId [{}] and pageLink [{}]", tenantId, pageLink); List pluginEntities = findPageWithTextSearch(ModelConstants.PLUGIN_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, Arrays.asList(in(ModelConstants.PLUGIN_TENANT_ID_PROPERTY, Arrays.asList(NULL_UUID, tenantId))), @@ -117,7 +110,7 @@ public class BasePluginDao extends AbstractSearchTextDao i } else { log.debug("Search result: [{}]", pluginEntities.size()); } - return pluginEntities; + return DaoUtil.convertDataList(pluginEntities); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/plugin/PluginDao.java b/dao/src/main/java/org/thingsboard/server/dao/plugin/PluginDao.java index 0adf1257f6..1a48b2069f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/plugin/PluginDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/plugin/PluginDao.java @@ -20,24 +20,23 @@ 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.Dao; -import org.thingsboard.server.dao.model.PluginMetaDataEntity; import java.util.List; import java.util.UUID; -public interface PluginDao extends Dao { +public interface PluginDao extends Dao { - PluginMetaDataEntity save(PluginMetaData plugin); + PluginMetaData save(PluginMetaData plugin); - PluginMetaDataEntity findById(PluginId pluginId); + PluginMetaData findById(PluginId pluginId); - PluginMetaDataEntity findByApiToken(String apiToken); + PluginMetaData findByApiToken(String apiToken); void deleteById(UUID id); void deleteById(PluginId pluginId); - List findByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink); + List findByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink); /** * Find all tenant plugins (including system) by tenantId and page link. @@ -46,6 +45,6 @@ public interface PluginDao extends Dao { * @param pageLink the page link * @return the list of plugins objects */ - List findAllTenantPluginsByTenantId(UUID tenantId, TextPageLink pageLink); + List findAllTenantPluginsByTenantId(UUID tenantId, TextPageLink pageLink); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleService.java index e57c9f99d5..87e35ed3e1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleService.java @@ -34,7 +34,6 @@ import org.thingsboard.server.dao.component.ComponentDescriptorService; import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.exception.DatabaseException; import org.thingsboard.server.dao.exception.IncorrectParameterException; -import org.thingsboard.server.dao.model.RuleMetaDataEntity; import org.thingsboard.server.dao.plugin.PluginService; import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.PaginatedRemover; @@ -45,8 +44,6 @@ import java.util.Arrays; import java.util.List; import java.util.function.Function; -import static org.thingsboard.server.dao.DaoUtil.convertDataList; -import static org.thingsboard.server.dao.DaoUtil.getData; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; import static org.thingsboard.server.dao.service.Validator.validateId; import static org.thingsboard.server.dao.service.Validator.validatePageLink; @@ -74,7 +71,7 @@ public class BaseRuleService implements RuleService { rule.setTenantId(systemTenantId); } if (rule.getId() != null) { - RuleMetaData oldVersion = getData(ruleDao.findById(rule.getId())); + RuleMetaData oldVersion = ruleDao.findById(rule.getId()); if (rule.getState() == null) { rule.setState(oldVersion.getState()); } else if (rule.getState() != oldVersion.getState()) { @@ -94,7 +91,7 @@ public class BaseRuleService implements RuleService { } validateComponentJson(rule.getAction(), ComponentType.ACTION); validateRuleAndPluginState(rule); - return getData(ruleDao.save(rule)); + return ruleDao.save(rule); } private void validateFilters(JsonNode filtersJson) { @@ -163,30 +160,27 @@ public class BaseRuleService implements RuleService { @Override public RuleMetaData findRuleById(RuleId ruleId) { validateId(ruleId, "Incorrect rule id for search rule request."); - return getData(ruleDao.findById(ruleId.getId())); + return ruleDao.findById(ruleId.getId()); } @Override public List findPluginRules(String pluginToken) { - List ruleEntities = ruleDao.findRulesByPlugin(pluginToken); - return convertDataList(ruleEntities); + return ruleDao.findRulesByPlugin(pluginToken); } @Override public TextPageData findSystemRules(TextPageLink pageLink) { validatePageLink(pageLink, "Incorrect PageLink object for search rule request."); - List ruleEntities = ruleDao.findByTenantIdAndPageLink(systemTenantId, pageLink); - List plugins = convertDataList(ruleEntities); - return new TextPageData<>(plugins, pageLink); + List rules = ruleDao.findByTenantIdAndPageLink(systemTenantId, pageLink); + return new TextPageData<>(rules, pageLink); } @Override public TextPageData findTenantRules(TenantId tenantId, TextPageLink pageLink) { validateId(tenantId, "Incorrect tenant id for search rule request."); validatePageLink(pageLink, "Incorrect PageLink object for search rule request."); - List ruleEntities = ruleDao.findByTenantIdAndPageLink(tenantId, pageLink); - List plugins = convertDataList(ruleEntities); - return new TextPageData<>(plugins, pageLink); + List rules = ruleDao.findByTenantIdAndPageLink(tenantId, pageLink); + return new TextPageData<>(rules, pageLink); } @Override @@ -210,8 +204,7 @@ public class BaseRuleService implements RuleService { log.trace("Executing findAllTenantRulesByTenantIdAndPageLink, tenantId [{}], pageLink [{}]", tenantId, pageLink); Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink); - List rulesEntities = ruleDao.findAllTenantRulesByTenantId(tenantId.getId(), pageLink); - List rules = convertDataList(rulesEntities); + List rules = ruleDao.findAllTenantRulesByTenantId(tenantId.getId(), pageLink); return new TextPageData<>(rules, pageLink); } @@ -251,10 +244,10 @@ public class BaseRuleService implements RuleService { private void updateLifeCycleState(RuleId ruleId, ComponentLifecycleState state) { Validator.validateId(ruleId, "Incorrect rule id for state change request."); - RuleMetaDataEntity rule = ruleDao.findById(ruleId); + RuleMetaData rule = ruleDao.findById(ruleId); if (rule != null) { rule.setState(state); - validateRuleAndPluginState(getData(rule)); + validateRuleAndPluginState(rule); ruleDao.save(rule); } else { throw new DatabaseException("Plugin not found!"); @@ -277,17 +270,17 @@ public class BaseRuleService implements RuleService { } }; - private PaginatedRemover tenantRulesRemover = - new PaginatedRemover() { + private PaginatedRemover tenantRulesRemover = + new PaginatedRemover() { @Override - protected List findEntities(TenantId id, TextPageLink pageLink) { + protected List findEntities(TenantId id, TextPageLink pageLink) { return ruleDao.findByTenantIdAndPageLink(id, pageLink); } @Override - protected void removeEntity(RuleMetaDataEntity entity) { - ruleDao.deleteById(entity.getId()); + protected void removeEntity(RuleMetaData entity) { + ruleDao.deleteById(entity.getUuidId()); } }; diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleDao.java b/dao/src/main/java/org/thingsboard/server/dao/rule/CassandraBaseRuleDao.java similarity index 79% rename from dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleDao.java rename to dao/src/main/java/org/thingsboard/server/dao/rule/CassandraBaseRuleDao.java index 9f75c2907d..a750940968 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/CassandraBaseRuleDao.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.dao.rule; -import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.querybuilder.Select; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -23,7 +22,8 @@ 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.AbstractSearchTextDao; +import org.thingsboard.server.dao.CassandraAbstractSearchTextDao; +import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.RuleMetaDataEntity; @@ -36,7 +36,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @Component @Slf4j -public class BaseRuleDao extends AbstractSearchTextDao implements RuleDao { +public class CassandraBaseRuleDao extends CassandraAbstractSearchTextDao implements RuleDao { @Override protected Class getColumnFamilyClass() { @@ -49,17 +49,12 @@ public class BaseRuleDao extends AbstractSearchTextDao imple } @Override - public RuleMetaDataEntity findById(RuleId ruleId) { + public RuleMetaData findById(RuleId ruleId) { return findById(ruleId.getId()); } @Override - public RuleMetaDataEntity save(RuleMetaData rule) { - return save(new RuleMetaDataEntity(rule)); - } - - @Override - public List findByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink) { + public List findByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink) { log.debug("Try to find rules by tenantId [{}] and pageLink [{}]", tenantId, pageLink); List entities = findPageWithTextSearch(ModelConstants.RULE_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, Arrays.asList(eq(ModelConstants.RULE_TENANT_ID_PROPERTY, tenantId.getId())), pageLink); @@ -68,11 +63,11 @@ public class BaseRuleDao extends AbstractSearchTextDao imple } else { log.debug("Search result: [{}]", entities.size()); } - return entities; + return DaoUtil.convertDataList(entities); } @Override - public List findAllTenantRulesByTenantId(UUID tenantId, TextPageLink pageLink) { + public List findAllTenantRulesByTenantId(UUID tenantId, TextPageLink pageLink) { log.debug("Try to find all tenant rules by tenantId [{}] and pageLink [{}]", tenantId, pageLink); List entities = findPageWithTextSearch(ModelConstants.RULE_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, Arrays.asList(in(ModelConstants.RULE_TENANT_ID_PROPERTY, Arrays.asList(NULL_UUID, tenantId))), @@ -82,23 +77,23 @@ public class BaseRuleDao extends AbstractSearchTextDao imple } else { log.debug("Search result: [{}]", entities.size()); } - return entities; + return DaoUtil.convertDataList(entities); } @Override - public List findRulesByPlugin(String pluginToken) { + public List findRulesByPlugin(String pluginToken) { log.debug("Search rules by api token [{}]", pluginToken); Select select = select().from(ModelConstants.RULE_BY_PLUGIN_TOKEN); Select.Where query = select.where(); query.and(eq(ModelConstants.RULE_PLUGIN_TOKEN_PROPERTY, pluginToken)); - return findListByStatement(query); + return DaoUtil.convertDataList(findListByStatement(query)); } @Override public void deleteById(UUID id) { log.debug("Delete rule meta-data entity by id [{}]", id); - ResultSet resultSet = removeById(id); - log.debug("Delete result: [{}]", resultSet.wasApplied()); + boolean result = removeById(id); + log.debug("Delete result: [{}]", result); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/RuleDao.java b/dao/src/main/java/org/thingsboard/server/dao/rule/RuleDao.java index c2d09c7593..ea12b74767 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/RuleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/RuleDao.java @@ -20,20 +20,19 @@ 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.Dao; -import org.thingsboard.server.dao.model.RuleMetaDataEntity; import java.util.List; import java.util.UUID; -public interface RuleDao extends Dao { +public interface RuleDao extends Dao { - RuleMetaDataEntity save(RuleMetaData rule); + RuleMetaData save(RuleMetaData rule); - RuleMetaDataEntity findById(RuleId ruleId); + RuleMetaData findById(RuleId ruleId); - List findRulesByPlugin(String pluginToken); + List findRulesByPlugin(String pluginToken); - List findByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink); + List findByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink); /** * Find all tenant rules (including system) by tenantId and page link. @@ -42,7 +41,7 @@ public interface RuleDao extends Dao { * @param pageLink the page link * @return the list of rules objects */ - List findAllTenantRulesByTenantId(UUID tenantId, TextPageLink pageLink); + List findAllTenantRulesByTenantId(UUID tenantId, TextPageLink pageLink); void deleteById(UUID id); diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/DataValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/DataValidator.java index 2f3aef7ae0..e460cd0c68 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/service/DataValidator.java +++ b/dao/src/main/java/org/thingsboard/server/dao/service/DataValidator.java @@ -15,18 +15,15 @@ */ package org.thingsboard.server.dao.service; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - +import com.fasterxml.jackson.databind.JsonNode; import lombok.extern.slf4j.Slf4j; import org.apache.commons.validator.routines.EmailValidator; import org.thingsboard.server.common.data.BaseData; import org.thingsboard.server.dao.exception.DataValidationException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.databind.JsonNode; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; @Slf4j public abstract class DataValidator> { diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/PaginatedRemover.java b/dao/src/main/java/org/thingsboard/server/dao/service/PaginatedRemover.java index 554a3c1e31..98c7fd9fc2 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/service/PaginatedRemover.java +++ b/dao/src/main/java/org/thingsboard/server/dao/service/PaginatedRemover.java @@ -1,12 +1,12 @@ /** * 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 - * + *

+ * 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. @@ -15,33 +15,35 @@ */ package org.thingsboard.server.dao.service; +import org.thingsboard.server.common.data.id.IdBased; +import org.thingsboard.server.common.data.page.TextPageLink; + import java.util.List; import java.util.UUID; -import org.thingsboard.server.common.data.page.TextPageLink; -import org.thingsboard.server.dao.model.BaseEntity; +public abstract class PaginatedRemover> { -public abstract class PaginatedRemover> { + private static final int DEFAULT_LIMIT = 100; public void removeEntitites(I id) { - TextPageLink pageLink = new TextPageLink(100); + TextPageLink pageLink = new TextPageLink(DEFAULT_LIMIT); boolean hasNext = true; while (hasNext) { - List entities = findEntities(id, pageLink); - for (E entity : entities) { + List entities = findEntities(id, pageLink); + for (D entity : entities) { removeEntity(entity); } hasNext = entities.size() == pageLink.getLimit(); if (hasNext) { - int index = entities.size()-1; - UUID idOffset = entities.get(index).getId(); + int index = entities.size() - 1; + UUID idOffset = entities.get(index).getUuidId(); pageLink.setIdOffset(idOffset); } - } + } } - - protected abstract List findEntities(I id, TextPageLink pageLink); - - protected abstract void removeEntity(E entity); - + + protected abstract List findEntities(I id, TextPageLink pageLink); + + protected abstract void removeEntity(D entity); + } diff --git a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsDao.java index c5c6768a14..b0ed852881 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsDao.java @@ -17,9 +17,8 @@ package org.thingsboard.server.dao.settings; import org.thingsboard.server.common.data.AdminSettings; import org.thingsboard.server.dao.Dao; -import org.thingsboard.server.dao.model.AdminSettingsEntity; -public interface AdminSettingsDao extends Dao { +public interface AdminSettingsDao extends Dao { /** * Save or update admin settings object @@ -27,7 +26,7 @@ public interface AdminSettingsDao extends Dao { * @param adminSettings the admin settings object * @return saved admin settings object */ - AdminSettingsEntity save(AdminSettings adminSettings); + AdminSettings save(AdminSettings adminSettings); /** * Find admin settings by key. @@ -35,6 +34,6 @@ public interface AdminSettingsDao extends Dao { * @param key the key * @return the admin settings object */ - AdminSettingsEntity findByKey(String key); + AdminSettings findByKey(String key); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java index 4c6e7ce1a9..49576b1ae2 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java @@ -20,10 +20,10 @@ import org.thingsboard.server.common.data.id.AdminSettingsId; public interface AdminSettingsService { - public AdminSettings findAdminSettingsById(AdminSettingsId adminSettingsId); + AdminSettings findAdminSettingsById(AdminSettingsId adminSettingsId); - public AdminSettings findAdminSettingsByKey(String key); + AdminSettings findAdminSettingsByKey(String key); - public AdminSettings saveAdminSettings(AdminSettings adminSettings); + AdminSettings saveAdminSettings(AdminSettings adminSettings); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java index c6d1a6b01e..6bfa293848 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java @@ -15,19 +15,14 @@ */ package org.thingsboard.server.dao.settings; -import static org.thingsboard.server.dao.DaoUtil.getData; - import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.thingsboard.server.common.data.AdminSettings; import org.thingsboard.server.common.data.id.AdminSettingsId; import org.thingsboard.server.dao.exception.DataValidationException; -import org.thingsboard.server.dao.model.AdminSettingsEntity; import org.thingsboard.server.dao.service.DataValidator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import org.thingsboard.server.dao.service.Validator; @Service @@ -41,24 +36,21 @@ public class AdminSettingsServiceImpl implements AdminSettingsService { public AdminSettings findAdminSettingsById(AdminSettingsId adminSettingsId) { log.trace("Executing findAdminSettingsById [{}]", adminSettingsId); Validator.validateId(adminSettingsId, "Incorrect adminSettingsId " + adminSettingsId); - AdminSettingsEntity adminSettingsEntity = adminSettingsDao.findById(adminSettingsId.getId()); - return getData(adminSettingsEntity); + return adminSettingsDao.findById(adminSettingsId.getId()); } @Override public AdminSettings findAdminSettingsByKey(String key) { log.trace("Executing findAdminSettingsByKey [{}]", key); Validator.validateString(key, "Incorrect key " + key); - AdminSettingsEntity adminSettingsEntity = adminSettingsDao.findByKey(key); - return getData(adminSettingsEntity); + return adminSettingsDao.findByKey(key); } @Override public AdminSettings saveAdminSettings(AdminSettings adminSettings) { log.trace("Executing saveAdminSettings [{}]", adminSettings); adminSettingsValidator.validate(adminSettings); - AdminSettingsEntity adminSettingsEntity = adminSettingsDao.save(adminSettings); - return getData(adminSettingsEntity); + return adminSettingsDao.save(adminSettings); } private DataValidator adminSettingsValidator = diff --git a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/settings/CassandraAdminSettingsDao.java similarity index 66% rename from dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsDaoImpl.java rename to dao/src/main/java/org/thingsboard/server/dao/settings/CassandraAdminSettingsDao.java index bb67289f5c..c1783bc76a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsDaoImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/settings/CassandraAdminSettingsDao.java @@ -15,26 +15,21 @@ */ package org.thingsboard.server.dao.settings; -import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; -import static com.datastax.driver.core.querybuilder.QueryBuilder.select; -import static org.thingsboard.server.dao.model.ModelConstants.ADMIN_SETTINGS_BY_KEY_COLUMN_FAMILY_NAME; -import static org.thingsboard.server.dao.model.ModelConstants.ADMIN_SETTINGS_COLUMN_FAMILY_NAME; -import static org.thingsboard.server.dao.model.ModelConstants.ADMIN_SETTINGS_KEY_PROPERTY; - +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.AbstractModelDao; +import org.thingsboard.server.dao.CassandraAbstractModelDao; +import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.AdminSettingsEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Repository; -import com.datastax.driver.core.querybuilder.Select.Where; +import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; +import static com.datastax.driver.core.querybuilder.QueryBuilder.select; +import static org.thingsboard.server.dao.model.ModelConstants.*; @Component @Slf4j -public class AdminSettingsDaoImpl extends AbstractModelDao implements AdminSettingsDao { +public class CassandraAdminSettingsDao extends CassandraAbstractModelDao implements AdminSettingsDao { @Override protected Class getColumnFamilyClass() { @@ -45,21 +40,15 @@ public class AdminSettingsDaoImpl extends AbstractModelDao protected String getColumnFamilyName() { return ADMIN_SETTINGS_COLUMN_FAMILY_NAME; } - - @Override - public AdminSettingsEntity save(AdminSettings adminSettings) { - log.debug("Save admin settings [{}] ", adminSettings); - return save(new AdminSettingsEntity(adminSettings)); - } @Override - public AdminSettingsEntity findByKey(String key) { + public AdminSettings findByKey(String key) { log.debug("Try to find admin settings by key [{}] ", key); Where query = select().from(ADMIN_SETTINGS_BY_KEY_COLUMN_FAMILY_NAME).where(eq(ADMIN_SETTINGS_KEY_PROPERTY, key)); log.trace("Execute query {}", query); AdminSettingsEntity adminSettingsEntity = findOneByStatement(query); log.trace("Found admin settings [{}] by key [{}]", adminSettingsEntity, key); - return adminSettingsEntity; + return DaoUtil.getData(adminSettingsEntity); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/CassandraTenantDao.java similarity index 68% rename from dao/src/main/java/org/thingsboard/server/dao/tenant/TenantDaoImpl.java rename to dao/src/main/java/org/thingsboard/server/dao/tenant/CassandraTenantDao.java index b9ed4e251f..d4d067e00f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantDaoImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/CassandraTenantDao.java @@ -15,26 +15,23 @@ */ package org.thingsboard.server.dao.tenant; -import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; -import static org.thingsboard.server.dao.model.ModelConstants.TENANT_BY_REGION_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME; -import static org.thingsboard.server.dao.model.ModelConstants.TENANT_COLUMN_FAMILY_NAME; -import static org.thingsboard.server.dao.model.ModelConstants.TENANT_REGION_PROPERTY; - -import java.util.Arrays; -import java.util.List; - 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.AbstractSearchTextDao; +import org.thingsboard.server.dao.CassandraAbstractSearchTextDao; +import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.TenantEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import java.util.Arrays; +import java.util.List; + +import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; +import static org.thingsboard.server.dao.model.ModelConstants.*; @Component @Slf4j -public class TenantDaoImpl extends AbstractSearchTextDao implements TenantDao { +public class CassandraTenantDao extends CassandraAbstractSearchTextDao implements TenantDao { @Override protected Class getColumnFamilyClass() { @@ -45,21 +42,15 @@ public class TenantDaoImpl extends AbstractSearchTextDao implement protected String getColumnFamilyName() { return TENANT_COLUMN_FAMILY_NAME; } - - @Override - public TenantEntity save(Tenant tenant) { - log.debug("Save tenant [{}] ", tenant); - return save(new TenantEntity(tenant)); - } @Override - public List findTenantsByRegion(String region, TextPageLink pageLink) { + public List findTenantsByRegion(String region, TextPageLink pageLink) { log.debug("Try to find tenants by region [{}] and pageLink [{}]", region, pageLink); List tenantEntities = findPageWithTextSearch(TENANT_BY_REGION_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, Arrays.asList(eq(TENANT_REGION_PROPERTY, region)), pageLink); log.trace("Found tenants [{}] by region [{}] and pageLink [{}]", tenantEntities, region, pageLink); - return tenantEntities; + return DaoUtil.convertDataList(tenantEntities); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantDao.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantDao.java index c1b71fc934..9c230d97b1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantDao.java @@ -15,14 +15,13 @@ */ package org.thingsboard.server.dao.tenant; -import java.util.List; - import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.dao.Dao; -import org.thingsboard.server.dao.model.TenantEntity; -public interface TenantDao extends Dao { +import java.util.List; + +public interface TenantDao extends Dao { /** * Save or update tenant object @@ -30,7 +29,7 @@ public interface TenantDao extends Dao { * @param tenant the tenant object * @return saved tenant object */ - TenantEntity save(Tenant tenant); + Tenant save(Tenant tenant); /** * Find tenants by region and page link. @@ -39,6 +38,6 @@ public interface TenantDao extends Dao { * @param pageLink the page link * @return the list of tenant objects */ - List findTenantsByRegion(String region, TextPageLink pageLink); + List findTenantsByRegion(String region, TextPageLink pageLink); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantService.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantService.java index 7e56e19c4d..13b5090bc3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantService.java @@ -22,16 +22,14 @@ import org.thingsboard.server.common.data.page.TextPageLink; public interface TenantService { - public Tenant findTenantById(TenantId tenantId); + Tenant findTenantById(TenantId tenantId); - public Tenant saveTenant(Tenant tenant); + Tenant saveTenant(Tenant tenant); - public void deleteTenant(TenantId tenantId); + void deleteTenant(TenantId tenantId); - public TextPageData findTenants(TextPageLink pageLink); + TextPageData findTenants(TextPageLink pageLink); - //public TextPageData findTenantsByTitle(String title, PageLink pageLink); - - public void deleteTenants(); + void deleteTenants(); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java index 9deb828fa5..976cb71748 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java @@ -15,13 +15,10 @@ */ package org.thingsboard.server.dao.tenant; -import static org.thingsboard.server.dao.DaoUtil.convertDataList; -import static org.thingsboard.server.dao.DaoUtil.getData; - -import java.util.List; - import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.TextPageData; @@ -30,19 +27,16 @@ import org.thingsboard.server.dao.customer.CustomerService; import org.thingsboard.server.dao.dashboard.DashboardService; import org.thingsboard.server.dao.device.DeviceService; import org.thingsboard.server.dao.exception.DataValidationException; -import org.thingsboard.server.dao.model.TenantEntity; import org.thingsboard.server.dao.plugin.PluginService; import org.thingsboard.server.dao.rule.RuleService; import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.PaginatedRemover; -import org.thingsboard.server.dao.user.UserService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import org.thingsboard.server.dao.service.Validator; +import org.thingsboard.server.dao.user.UserService; import org.thingsboard.server.dao.widget.WidgetsBundleService; +import java.util.List; + @Service @Slf4j public class TenantServiceImpl implements TenantService { @@ -77,8 +71,7 @@ public class TenantServiceImpl implements TenantService { public Tenant findTenantById(TenantId tenantId) { log.trace("Executing findTenantById [{}]", tenantId); Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); - TenantEntity tenantEntity = tenantDao.findById(tenantId.getId()); - return getData(tenantEntity); + return tenantDao.findById(tenantId.getId()); } @Override @@ -86,8 +79,7 @@ public class TenantServiceImpl implements TenantService { log.trace("Executing saveTenant [{}]", tenant); tenant.setRegion(DEFAULT_TENANT_REGION); tenantValidator.validate(tenant); - TenantEntity tenantEntity = tenantDao.save(tenant); - return getData(tenantEntity); + return tenantDao.save(tenant); } @Override @@ -108,9 +100,8 @@ public class TenantServiceImpl implements TenantService { public TextPageData findTenants(TextPageLink pageLink) { log.trace("Executing findTenants pageLink [{}]", pageLink); Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink); - List tenantEntities = tenantDao.findTenantsByRegion(DEFAULT_TENANT_REGION, pageLink); - List tenants = convertDataList(tenantEntities); - return new TextPageData(tenants, pageLink); + List tenants = tenantDao.findTenantsByRegion(DEFAULT_TENANT_REGION, pageLink); + return new TextPageData<>(tenants, pageLink); } @Override @@ -132,17 +123,17 @@ public class TenantServiceImpl implements TenantService { } }; - private PaginatedRemover tenantsRemover = - new PaginatedRemover() { + private PaginatedRemover tenantsRemover = + new PaginatedRemover() { @Override - protected List findEntities(String region, TextPageLink pageLink) { + protected List findEntities(String region, TextPageLink pageLink) { return tenantDao.findTenantsByRegion(region, pageLink); } @Override - protected void removeEntity(TenantEntity entity) { - deleteTenant(new TenantId(entity.getId())); + protected void removeEntity(Tenant entity) { + deleteTenant(new TenantId(entity.getUuidId())); } }; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java index f27ed6e605..71102b1a8c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java @@ -15,34 +15,25 @@ */ package org.thingsboard.server.dao.timeseries; +// CASSANDRA ??? import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.ResultSetFuture; import com.datastax.driver.core.Row; -import com.google.common.base.Function; import com.google.common.collect.Lists; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.thingsboard.server.common.data.id.UUIDBased; -import org.thingsboard.server.common.data.kv.BaseTsKvQuery; import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.common.data.kv.TsKvQuery; import org.thingsboard.server.dao.exception.IncorrectParameterException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; import org.thingsboard.server.dao.service.Validator; -import javax.annotation.Nullable; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import java.time.Instant; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.util.*; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.stream.Collectors; +import java.util.Collection; +import java.util.List; +import java.util.UUID; import static org.apache.commons.lang3.StringUtils.isBlank; diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java similarity index 98% rename from dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesDao.java rename to dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java index cbf27fa9ac..738c5aa63c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java @@ -28,8 +28,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.kv.*; import org.thingsboard.server.common.data.kv.DataType; -import org.thingsboard.server.dao.AbstractAsyncDao; -import org.thingsboard.server.dao.AbstractDao; +import org.thingsboard.server.dao.CassandraAbstractAsyncDao; import org.thingsboard.server.dao.model.ModelConstants; import javax.annotation.Nullable; @@ -38,20 +37,20 @@ import javax.annotation.PreDestroy; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneOffset; -import java.util.*; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.UUID; import java.util.stream.Collectors; import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; -import static com.datastax.driver.core.querybuilder.QueryBuilder.select; /** * @author Andrew Shvayka */ @Component @Slf4j -public class BaseTimeseriesDao extends AbstractAsyncDao implements TimeseriesDao { +public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implements TimeseriesDao { //@Value("${cassandra.query.min_aggregation_step_ms}") //TODO: diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java index 177003ddf2..afa5c953a1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.timeseries; +// CASSANDRA ??? import com.datastax.driver.core.ResultSetFuture; import com.datastax.driver.core.Row; import com.google.common.util.concurrent.ListenableFuture; @@ -22,8 +23,6 @@ import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.common.data.kv.TsKvQuery; import java.util.List; -import java.util.Optional; -import java.util.Set; import java.util.UUID; /** diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java index cd53e9468f..28ed5ddd89 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java @@ -15,18 +15,17 @@ */ package org.thingsboard.server.dao.timeseries; +// CASSANDRA ??? import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.ResultSetFuture; import com.datastax.driver.core.Row; import com.google.common.util.concurrent.ListenableFuture; -import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.UUIDBased; import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.common.data.kv.TsKvQuery; import java.util.Collection; import java.util.List; -import java.util.Set; /** * @author Andrew Shvayka diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TsKvQueryCursor.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TsKvQueryCursor.java index cad1232d68..ed537339f2 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TsKvQueryCursor.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TsKvQueryCursor.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.dao.timeseries; -import lombok.Data; import lombok.Getter; import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.common.data.kv.TsKvQuery; diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserCredentialsDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserCredentialsDao.java similarity index 78% rename from dao/src/main/java/org/thingsboard/server/dao/user/UserCredentialsDaoImpl.java rename to dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserCredentialsDao.java index a40c1a9269..b44ab6af35 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/user/UserCredentialsDaoImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserCredentialsDao.java @@ -15,26 +15,23 @@ */ package org.thingsboard.server.dao.user; -import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; -import static com.datastax.driver.core.querybuilder.QueryBuilder.select; - -import java.util.UUID; - +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.UserCredentials; -import org.thingsboard.server.dao.AbstractModelDao; +import org.thingsboard.server.dao.CassandraAbstractModelDao; +import org.thingsboard.server.dao.DaoUtil; +import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.UserCredentialsEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Repository; -import com.datastax.driver.core.querybuilder.Select.Where; -import org.thingsboard.server.dao.model.ModelConstants; +import java.util.UUID; + +import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; +import static com.datastax.driver.core.querybuilder.QueryBuilder.select; @Component @Slf4j -public class UserCredentialsDaoImpl extends AbstractModelDao implements UserCredentialsDao { +public class CassandraUserCredentialsDao extends CassandraAbstractModelDao implements UserCredentialsDao { @Override protected Class getColumnFamilyClass() { @@ -47,41 +44,35 @@ public class UserCredentialsDaoImpl extends AbstractModelDao implements UserDao { +public class CassandraUserDao extends CassandraAbstractSearchTextDao implements UserDao { @Override protected Class getColumnFamilyClass() { @@ -50,23 +48,17 @@ public class UserDaoImpl extends AbstractSearchTextDao implements Us } @Override - public UserEntity findByEmail(String email) { + public User findByEmail(String email) { log.debug("Try to find user by email [{}] ", email); Where query = select().from(ModelConstants.USER_BY_EMAIL_COLUMN_FAMILY_NAME).where(eq(ModelConstants.USER_EMAIL_PROPERTY, email)); log.trace("Execute query {}", query); UserEntity userEntity = findOneByStatement(query); log.trace("Found user [{}] by email [{}]", userEntity, email); - return userEntity; - } - - @Override - public UserEntity save(User user) { - log.debug("Save user [{}] ", user); - return save(new UserEntity(user)); + return DaoUtil.getData(userEntity); } @Override - public List findTenantAdmins(UUID tenantId, TextPageLink pageLink) { + public List findTenantAdmins(UUID tenantId, TextPageLink pageLink) { log.debug("Try to find tenant admin users by tenantId [{}] and pageLink [{}]", tenantId, pageLink); List userEntities = findPageWithTextSearch(ModelConstants.USER_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, Arrays.asList(eq(ModelConstants.USER_TENANT_ID_PROPERTY, tenantId), @@ -74,11 +66,11 @@ public class UserDaoImpl extends AbstractSearchTextDao implements Us eq(ModelConstants.USER_AUTHORITY_PROPERTY, Authority.TENANT_ADMIN.name())), pageLink); log.trace("Found tenant admin users [{}] by tenantId [{}] and pageLink [{}]", userEntities, tenantId, pageLink); - return userEntities; + return DaoUtil.convertDataList(userEntities); } @Override - public List findCustomerUsers(UUID tenantId, UUID customerId, TextPageLink pageLink) { + public List findCustomerUsers(UUID tenantId, UUID customerId, TextPageLink pageLink) { log.debug("Try to find customer users by tenantId [{}], customerId [{}] and pageLink [{}]", tenantId, customerId, pageLink); List userEntities = findPageWithTextSearch(ModelConstants.USER_BY_CUSTOMER_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, Arrays.asList(eq(ModelConstants.USER_TENANT_ID_PROPERTY, tenantId), @@ -86,7 +78,7 @@ public class UserDaoImpl extends AbstractSearchTextDao implements Us eq(ModelConstants.USER_AUTHORITY_PROPERTY, Authority.CUSTOMER_USER.name())), pageLink); log.trace("Found customer users [{}] by tenantId [{}], customerId [{}] and pageLink [{}]", userEntities, tenantId, customerId, pageLink); - return userEntities; + return DaoUtil.convertDataList(userEntities); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserCredentialsDao.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserCredentialsDao.java index 52045bc2ed..5861fa1d61 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/user/UserCredentialsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserCredentialsDao.java @@ -15,18 +15,15 @@ */ package org.thingsboard.server.dao.user; -import java.util.UUID; - import org.thingsboard.server.common.data.security.UserCredentials; import org.thingsboard.server.dao.Dao; -import org.thingsboard.server.dao.model.UserCredentialsEntity; + +import java.util.UUID; /** * The Interface UserCredentialsDao. - * - * @param the generic type */ -public interface UserCredentialsDao extends Dao { +public interface UserCredentialsDao extends Dao { /** * Save or update user credentials object @@ -34,7 +31,7 @@ public interface UserCredentialsDao extends Dao { * @param userCredentials the user credentials object * @return saved user credentials object */ - UserCredentialsEntity save(UserCredentials userCredentials); + UserCredentials save(UserCredentials userCredentials); /** * Find user credentials by user id. @@ -42,22 +39,22 @@ public interface UserCredentialsDao extends Dao { * @param userId the user id * @return the user credentials object */ - UserCredentialsEntity findByUserId(UUID userId); - + UserCredentials findByUserId(UUID userId); + /** * Find user credentials by activate token. * * @param activateToken the activate token * @return the user credentials object */ - UserCredentialsEntity findByActivateToken(String activateToken); - + UserCredentials findByActivateToken(String activateToken); + /** * Find user credentials by reset token. * * @param resetToken the reset token * @return the user credentials object */ - UserCredentialsEntity findByResetToken(String resetToken); - + UserCredentials findByResetToken(String resetToken); + } diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserDao.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserDao.java index e84d68b5e7..292099a798 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/user/UserDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserDao.java @@ -15,15 +15,14 @@ */ package org.thingsboard.server.dao.user; -import java.util.List; -import java.util.UUID; - import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.dao.Dao; -import org.thingsboard.server.dao.model.UserEntity; -public interface UserDao extends Dao { +import java.util.List; +import java.util.UUID; + +public interface UserDao extends Dao { /** * Save or update user object @@ -31,7 +30,7 @@ public interface UserDao extends Dao { * @param user the user object * @return saved user entity */ - UserEntity save(User user); + User save(User user); /** * Find user by email. @@ -39,7 +38,7 @@ public interface UserDao extends Dao { * @param email the email * @return the user entity */ - UserEntity findByEmail(String email); + User findByEmail(String email); /** * Find tenant admin users by tenantId and page link. @@ -48,7 +47,7 @@ public interface UserDao extends Dao { * @param pageLink the page link * @return the list of user entities */ - List findTenantAdmins(UUID tenantId, TextPageLink pageLink); + List findTenantAdmins(UUID tenantId, TextPageLink pageLink); /** * Find customer users by tenantId, customerId and page link. @@ -58,6 +57,6 @@ public interface UserDao extends Dao { * @param pageLink the page link * @return the list of user entities */ - List findCustomerUsers(UUID tenantId, UUID customerId, TextPageLink pageLink); + List findCustomerUsers(UUID tenantId, UUID customerId, TextPageLink pageLink); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserService.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserService.java index f4043a0d6e..92380c6f89 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/user/UserService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserService.java @@ -25,32 +25,32 @@ import org.thingsboard.server.common.data.security.UserCredentials; public interface UserService { - public User findUserById(UserId userId); + User findUserById(UserId userId); - public User findUserByEmail(String email); + User findUserByEmail(String email); - public User saveUser(User user); + User saveUser(User user); - public UserCredentials findUserCredentialsByUserId(UserId userId); + UserCredentials findUserCredentialsByUserId(UserId userId); - public UserCredentials findUserCredentialsByActivateToken(String activateToken); + UserCredentials findUserCredentialsByActivateToken(String activateToken); - public UserCredentials findUserCredentialsByResetToken(String resetToken); + UserCredentials findUserCredentialsByResetToken(String resetToken); - public UserCredentials saveUserCredentials(UserCredentials userCredentials); + UserCredentials saveUserCredentials(UserCredentials userCredentials); - public UserCredentials activateUserCredentials(String activateToken, String password); + UserCredentials activateUserCredentials(String activateToken, String password); - public UserCredentials requestPasswordReset(String email); + UserCredentials requestPasswordReset(String email); - public void deleteUser(UserId userId); + void deleteUser(UserId userId); - public TextPageData findTenantAdmins(TenantId tenantId, TextPageLink pageLink); + TextPageData findTenantAdmins(TenantId tenantId, TextPageLink pageLink); - public void deleteTenantAdmins(TenantId tenantId); + void deleteTenantAdmins(TenantId tenantId); - public TextPageData findCustomerUsers(TenantId tenantId, CustomerId customerId, TextPageLink pageLink); + TextPageData findCustomerUsers(TenantId tenantId, CustomerId customerId, TextPageLink pageLink); - public void deleteCustomerUsers(TenantId tenantId, CustomerId customerId); + void deleteCustomerUsers(TenantId tenantId, CustomerId customerId); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java index 9ad91021f1..7f4d6c07fb 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java @@ -15,17 +15,13 @@ */ package org.thingsboard.server.dao.user; -import static org.thingsboard.server.dao.DaoUtil.convertDataList; -import static org.thingsboard.server.dao.DaoUtil.getData; -import static org.thingsboard.server.dao.service.Validator.validateId; -import static org.thingsboard.server.dao.service.Validator.validatePageLink; -import static org.thingsboard.server.dao.service.Validator.validateString; - -import java.util.List; - import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.thingsboard.server.common.data.Customer; +import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.TenantId; @@ -37,19 +33,21 @@ import org.thingsboard.server.common.data.security.UserCredentials; import org.thingsboard.server.dao.customer.CustomerDao; import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.exception.IncorrectParameterException; -import org.thingsboard.server.dao.model.*; +import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.PaginatedRemover; import org.thingsboard.server.dao.tenant.TenantDao; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; + +import java.util.List; + +import static org.thingsboard.server.dao.service.Validator.*; @Service @Slf4j public class UserServiceImpl implements UserService { + private static final int DEFAULT_TOKEN_LENGTH = 30; + @Autowired private UserDao userDao; @@ -66,63 +64,57 @@ public class UserServiceImpl implements UserService { public User findUserByEmail(String email) { log.trace("Executing findUserByEmail [{}]", email); validateString(email, "Incorrect email " + email); - UserEntity userEntity = userDao.findByEmail(email); - return getData(userEntity); + return userDao.findByEmail(email); } @Override public User findUserById(UserId userId) { log.trace("Executing findUserById [{}]", userId); validateId(userId, "Incorrect userId " + userId); - UserEntity userEntity = userDao.findById(userId.getId()); - return getData(userEntity); + return userDao.findById(userId.getId()); } @Override public User saveUser(User user) { log.trace("Executing saveUser [{}]", user); userValidator.validate(user); - UserEntity userEntity = userDao.save(user); + User savedUser = userDao.save(user); if (user.getId() == null) { UserCredentials userCredentials = new UserCredentials(); userCredentials.setEnabled(false); - userCredentials.setActivateToken(RandomStringUtils.randomAlphanumeric(30)); - userCredentials.setUserId(new UserId(userEntity.getId())); + userCredentials.setActivateToken(RandomStringUtils.randomAlphanumeric(DEFAULT_TOKEN_LENGTH)); + userCredentials.setUserId(new UserId(savedUser.getUuidId())); userCredentialsDao.save(userCredentials); } - return getData(userEntity); + return savedUser; } @Override public UserCredentials findUserCredentialsByUserId(UserId userId) { log.trace("Executing findUserCredentialsByUserId [{}]", userId); validateId(userId, "Incorrect userId " + userId); - UserCredentialsEntity userCredentialsEntity = userCredentialsDao.findByUserId(userId.getId()); - return getData(userCredentialsEntity); + return userCredentialsDao.findByUserId(userId.getId()); } @Override public UserCredentials findUserCredentialsByActivateToken(String activateToken) { log.trace("Executing findUserCredentialsByActivateToken [{}]", activateToken); validateString(activateToken, "Incorrect activateToken " + activateToken); - UserCredentialsEntity userCredentialsEntity = userCredentialsDao.findByActivateToken(activateToken); - return getData(userCredentialsEntity); + return userCredentialsDao.findByActivateToken(activateToken); } @Override public UserCredentials findUserCredentialsByResetToken(String resetToken) { log.trace("Executing findUserCredentialsByResetToken [{}]", resetToken); validateString(resetToken, "Incorrect resetToken " + resetToken); - UserCredentialsEntity userCredentialsEntity = userCredentialsDao.findByResetToken(resetToken); - return getData(userCredentialsEntity); + return userCredentialsDao.findByResetToken(resetToken); } @Override public UserCredentials saveUserCredentials(UserCredentials userCredentials) { log.trace("Executing saveUserCredentials [{}]", userCredentials); userCredentialsValidator.validate(userCredentials); - UserCredentialsEntity userCredentialsEntity = userCredentialsDao.save(userCredentials); - return getData(userCredentialsEntity); + return userCredentialsDao.save(userCredentials); } @Override @@ -130,11 +122,10 @@ public class UserServiceImpl implements UserService { log.trace("Executing activateUserCredentials activateToken [{}], password [{}]", activateToken, password); validateString(activateToken, "Incorrect activateToken " + activateToken); validateString(password, "Incorrect password " + password); - UserCredentialsEntity userCredentialsEntity = userCredentialsDao.findByActivateToken(activateToken); - if (userCredentialsEntity == null) { + UserCredentials userCredentials = userCredentialsDao.findByActivateToken(activateToken); + if (userCredentials == null) { throw new IncorrectParameterException(String.format("Unable to find user credentials by activateToken [%s]", activateToken)); } - UserCredentials userCredentials = getData(userCredentialsEntity); if (userCredentials.isEnabled()) { throw new IncorrectParameterException("User credentials already activated"); } @@ -149,16 +140,15 @@ public class UserServiceImpl implements UserService { public UserCredentials requestPasswordReset(String email) { log.trace("Executing requestPasswordReset email [{}]", email); validateString(email, "Incorrect email " + email); - UserEntity userEntity = userDao.findByEmail(email); - if (userEntity == null) { + User user = userDao.findByEmail(email); + if (user == null) { throw new IncorrectParameterException(String.format("Unable to find user by email [%s]", email)); } - UserCredentialsEntity userCredentialsEntity = userCredentialsDao.findByUserId(userEntity.getId()); - UserCredentials userCredentials = getData(userCredentialsEntity); + UserCredentials userCredentials = userCredentialsDao.findByUserId(user.getUuidId()); if (!userCredentials.isEnabled()) { throw new IncorrectParameterException("Unable to reset password for inactive user"); } - userCredentials.setResetToken(RandomStringUtils.randomAlphanumeric(30)); + userCredentials.setResetToken(RandomStringUtils.randomAlphanumeric(DEFAULT_TOKEN_LENGTH)); return saveUserCredentials(userCredentials); } @@ -167,8 +157,8 @@ public class UserServiceImpl implements UserService { public void deleteUser(UserId userId) { log.trace("Executing deleteUser [{}]", userId); validateId(userId, "Incorrect userId " + userId); - UserCredentialsEntity userCredentialsEntity = userCredentialsDao.findByUserId(userId.getId()); - userCredentialsDao.removeById(userCredentialsEntity.getId()); + UserCredentials userCredentials = userCredentialsDao.findByUserId(userId.getId()); + userCredentialsDao.removeById(userCredentials.getUuidId()); userDao.removeById(userId.getId()); } @@ -177,9 +167,8 @@ public class UserServiceImpl implements UserService { log.trace("Executing findTenantAdmins, tenantId [{}], pageLink [{}]", tenantId, pageLink); validateId(tenantId, "Incorrect tenantId " + tenantId); validatePageLink(pageLink, "Incorrect page link " + pageLink); - List userEntities = userDao.findTenantAdmins(tenantId.getId(), pageLink); - List users = convertDataList(userEntities); - return new TextPageData(users, pageLink); + List users = userDao.findTenantAdmins(tenantId.getId(), pageLink); + return new TextPageData<>(users, pageLink); } @Override @@ -195,9 +184,8 @@ public class UserServiceImpl implements UserService { validateId(tenantId, "Incorrect tenantId " + tenantId); validateId(customerId, "Incorrect customerId " + customerId); validatePageLink(pageLink, "Incorrect page link " + pageLink); - List userEntities = userDao.findCustomerUsers(tenantId.getId(), customerId.getId(), pageLink); - List users = convertDataList(userEntities); - return new TextPageData(users, pageLink); + List users = userDao.findCustomerUsers(tenantId.getId(), customerId.getId(), pageLink); + return new TextPageData<>(users, pageLink); } @Override @@ -266,16 +254,16 @@ public class UserServiceImpl implements UserService { + " already present in database!"); } if (!tenantId.getId().equals(ModelConstants.NULL_UUID)) { - TenantEntity tenant = tenantDao.findById(user.getTenantId().getId()); + Tenant tenant = tenantDao.findById(user.getTenantId().getId()); if (tenant == null) { throw new DataValidationException("User is referencing to non-existent tenant!"); } } if (!customerId.getId().equals(ModelConstants.NULL_UUID)) { - CustomerEntity customer = customerDao.findById(user.getCustomerId().getId()); + Customer customer = customerDao.findById(user.getCustomerId().getId()); if (customer == null) { throw new DataValidationException("User is referencing to non-existent customer!"); - } else if (!customer.getTenantId().equals(tenantId.getId())) { + } else if (!customer.getTenantId().getId().equals(tenantId.getId())) { throw new DataValidationException("User can't be assigned to customer from different tenant!"); } } @@ -303,7 +291,7 @@ public class UserServiceImpl implements UserService { throw new DataValidationException("Enabled user credentials can't have activate token!"); } } - UserCredentialsEntity existingUserCredentialsEntity = userCredentialsDao.findById(userCredentials.getId().getId()); + UserCredentials existingUserCredentialsEntity = userCredentialsDao.findById(userCredentials.getId().getId()); if (existingUserCredentialsEntity == null) { throw new DataValidationException("Unable to update non-existent user credentials!"); } @@ -314,21 +302,21 @@ public class UserServiceImpl implements UserService { } }; - private PaginatedRemover tenantAdminsRemover = - new PaginatedRemover() { + private PaginatedRemover tenantAdminsRemover = + new PaginatedRemover() { @Override - protected List findEntities(TenantId id, TextPageLink pageLink) { + protected List findEntities(TenantId id, TextPageLink pageLink) { return userDao.findTenantAdmins(id.getId(), pageLink); } @Override - protected void removeEntity(UserEntity entity) { - deleteUser(new UserId(entity.getId())); + protected void removeEntity(User entity) { + deleteUser(new UserId(entity.getUuidId())); } }; - class CustomerUsersRemover extends PaginatedRemover { + private class CustomerUsersRemover extends PaginatedRemover { private TenantId tenantId; @@ -337,14 +325,14 @@ public class UserServiceImpl implements UserService { } @Override - protected List findEntities(CustomerId id, TextPageLink pageLink) { + protected List findEntities(CustomerId id, TextPageLink pageLink) { return userDao.findCustomerUsers(tenantId.getId(), id.getId(), pageLink); } @Override - protected void removeEntity(UserEntity entity) { - deleteUser(new UserId(entity.getId())); + protected void removeEntity(User entity) { + deleteUser(new UserId(entity.getUuidId())); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetTypeDao.java similarity index 78% rename from dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeDaoImpl.java rename to dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetTypeDao.java index 8b50713267..56e6db97d9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeDaoImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetTypeDao.java @@ -17,12 +17,10 @@ package org.thingsboard.server.dao.widget; import com.datastax.driver.core.querybuilder.Select.Where; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import org.springframework.stereotype.Repository; import org.thingsboard.server.common.data.widget.WidgetType; -import org.thingsboard.server.dao.AbstractModelDao; +import org.thingsboard.server.dao.CassandraAbstractModelDao; +import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.WidgetTypeEntity; import java.util.List; @@ -34,7 +32,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Component @Slf4j -public class WidgetTypeDaoImpl extends AbstractModelDao implements WidgetTypeDao { +public class CassandraWidgetTypeDao extends CassandraAbstractModelDao implements WidgetTypeDao { @Override protected Class getColumnFamilyClass() { @@ -47,13 +45,7 @@ public class WidgetTypeDaoImpl extends AbstractModelDao implem } @Override - public WidgetTypeEntity save(WidgetType widgetType) { - log.debug("Save widget type [{}] ", widgetType); - return save(new WidgetTypeEntity(widgetType)); - } - - @Override - public List findWidgetTypesByTenantIdAndBundleAlias(UUID tenantId, String bundleAlias) { + public List findWidgetTypesByTenantIdAndBundleAlias(UUID tenantId, String bundleAlias) { log.debug("Try to find widget types by tenantId [{}] and bundleAlias [{}]", tenantId, bundleAlias); Where query = select().from(WIDGET_TYPE_BY_TENANT_AND_ALIASES_COLUMN_FAMILY_NAME) .where() @@ -61,11 +53,11 @@ public class WidgetTypeDaoImpl extends AbstractModelDao implem .and(eq(WIDGET_TYPE_BUNDLE_ALIAS_PROPERTY, bundleAlias)); List widgetTypesEntities = findListByStatement(query); log.trace("Found widget types [{}] by tenantId [{}] and bundleAlias [{}]", widgetTypesEntities, tenantId, bundleAlias); - return widgetTypesEntities; + return DaoUtil.convertDataList(widgetTypesEntities); } @Override - public WidgetTypeEntity findByTenantIdBundleAliasAndAlias(UUID tenantId, String bundleAlias, String alias) { + public WidgetType findByTenantIdBundleAliasAndAlias(UUID tenantId, String bundleAlias, String alias) { log.debug("Try to find widget type by tenantId [{}], bundleAlias [{}] and alias [{}]", tenantId, bundleAlias, alias); Where query = select().from(WIDGET_TYPE_BY_TENANT_AND_ALIASES_COLUMN_FAMILY_NAME) .where() @@ -76,7 +68,7 @@ public class WidgetTypeDaoImpl extends AbstractModelDao implem WidgetTypeEntity widgetTypeEntity = findOneByStatement(query); log.trace("Found widget type [{}] by tenantId [{}], bundleAlias [{}] and alias [{}]", widgetTypeEntity, tenantId, bundleAlias, alias); - return widgetTypeEntity; + return DaoUtil.getData(widgetTypeEntity); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetsBundleDao.java similarity index 75% rename from dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleDaoImpl.java rename to dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetsBundleDao.java index b9a8055248..036d754919 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleDaoImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetsBundleDao.java @@ -17,26 +17,23 @@ package org.thingsboard.server.dao.widget; import com.datastax.driver.core.querybuilder.Select; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; 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.AbstractSearchTextDao; +import org.thingsboard.server.dao.CassandraAbstractSearchTextDao; +import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.WidgetsBundleEntity; import java.util.Arrays; import java.util.List; import java.util.UUID; -import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; -import static com.datastax.driver.core.querybuilder.QueryBuilder.in; -import static com.datastax.driver.core.querybuilder.QueryBuilder.select; +import static com.datastax.driver.core.querybuilder.QueryBuilder.*; import static org.thingsboard.server.dao.model.ModelConstants.*; @Component @Slf4j -public class WidgetsBundleDaoImpl extends AbstractSearchTextDao implements WidgetsBundleDao { +public class CassandraWidgetsBundleDao extends CassandraAbstractSearchTextDao implements WidgetsBundleDao { @Override protected Class getColumnFamilyClass() { @@ -49,13 +46,7 @@ public class WidgetsBundleDaoImpl extends AbstractSearchTextDao findSystemWidgetsBundles(TextPageLink pageLink) { + public List findSystemWidgetsBundles(TextPageLink pageLink) { log.debug("Try to find system widgets bundles by pageLink [{}]", pageLink); List widgetsBundlesEntities = findPageWithTextSearch(WIDGETS_BUNDLE_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, Arrays.asList(eq(WIDGETS_BUNDLE_TENANT_ID_PROPERTY, NULL_UUID)), pageLink); log.trace("Found system widgets bundles [{}] by pageLink [{}]", widgetsBundlesEntities, pageLink); - return widgetsBundlesEntities; + return DaoUtil.convertDataList(widgetsBundlesEntities); } @Override - public List findTenantWidgetsBundlesByTenantId(UUID tenantId, TextPageLink pageLink) { + public List findTenantWidgetsBundlesByTenantId(UUID tenantId, TextPageLink pageLink) { log.debug("Try to find tenant widgets bundles by tenantId [{}] and pageLink [{}]", tenantId, pageLink); List widgetsBundlesEntities = findPageWithTextSearch(WIDGETS_BUNDLE_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, Arrays.asList(eq(WIDGETS_BUNDLE_TENANT_ID_PROPERTY, tenantId)), pageLink); log.trace("Found tenant widgets bundles [{}] by tenantId [{}] and pageLink [{}]", widgetsBundlesEntities, tenantId, pageLink); - return widgetsBundlesEntities; + return DaoUtil.convertDataList(widgetsBundlesEntities); } @Override - public List findAllTenantWidgetsBundlesByTenantId(UUID tenantId, TextPageLink pageLink) { + public List findAllTenantWidgetsBundlesByTenantId(UUID tenantId, TextPageLink pageLink) { log.debug("Try to find all tenant widgets bundles by tenantId [{}] and pageLink [{}]", tenantId, pageLink); List widgetsBundlesEntities = findPageWithTextSearch(WIDGETS_BUNDLE_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, Arrays.asList(in(WIDGETS_BUNDLE_TENANT_ID_PROPERTY, Arrays.asList(NULL_UUID, tenantId))), pageLink); log.trace("Found all tenant widgets bundles [{}] by tenantId [{}] and pageLink [{}]", widgetsBundlesEntities, tenantId, pageLink); - return widgetsBundlesEntities; + return DaoUtil.convertDataList(widgetsBundlesEntities); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeDao.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeDao.java index dd85c10528..dce706499d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeDao.java @@ -17,17 +17,14 @@ package org.thingsboard.server.dao.widget; import org.thingsboard.server.common.data.widget.WidgetType; import org.thingsboard.server.dao.Dao; -import org.thingsboard.server.dao.model.WidgetTypeEntity; import java.util.List; import java.util.UUID; /** * The Interface WidgetTypeDao. - * - * @param the generic type */ -public interface WidgetTypeDao extends Dao { +public interface WidgetTypeDao extends Dao { /** * Save or update widget type object @@ -35,7 +32,7 @@ public interface WidgetTypeDao extends Dao { * @param widgetType the widget type object * @return saved widget type object */ - WidgetTypeEntity save(WidgetType widgetType); + WidgetType save(WidgetType widgetType); /** * Find widget types by tenantId and bundleAlias. @@ -44,7 +41,7 @@ public interface WidgetTypeDao extends Dao { * @param bundleAlias the bundle alias * @return the list of widget types objects */ - List findWidgetTypesByTenantIdAndBundleAlias(UUID tenantId, String bundleAlias); + List findWidgetTypesByTenantIdAndBundleAlias(UUID tenantId, String bundleAlias); /** * Find widget type by tenantId, bundleAlias and alias. @@ -54,6 +51,6 @@ public interface WidgetTypeDao extends Dao { * @param alias the alias * @return the widget type object */ - WidgetTypeEntity findByTenantIdBundleAliasAndAlias(UUID tenantId, String bundleAlias, String alias); + WidgetType findByTenantIdBundleAliasAndAlias(UUID tenantId, String bundleAlias, String alias); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeService.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeService.java index 5ff931c5f4..dcc70f78a3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeService.java @@ -23,16 +23,16 @@ import java.util.List; public interface WidgetTypeService { - public WidgetType findWidgetTypeById(WidgetTypeId widgetTypeId); + WidgetType findWidgetTypeById(WidgetTypeId widgetTypeId); - public WidgetType saveWidgetType(WidgetType widgetType); + WidgetType saveWidgetType(WidgetType widgetType); - public void deleteWidgetType(WidgetTypeId widgetTypeId); + void deleteWidgetType(WidgetTypeId widgetTypeId); - public List findWidgetTypesByTenantIdAndBundleAlias(TenantId tenantId, String bundleAlias); + List findWidgetTypesByTenantIdAndBundleAlias(TenantId tenantId, String bundleAlias); - public WidgetType findWidgetTypeByTenantIdBundleAliasAndAlias(TenantId tenantId, String bundleAlias, String alias); + WidgetType findWidgetTypeByTenantIdBundleAliasAndAlias(TenantId tenantId, String bundleAlias, String alias); - public void deleteWidgetTypesByTenantIdAndBundleAlias(TenantId tenantId, String bundleAlias); + void deleteWidgetTypesByTenantIdAndBundleAlias(TenantId tenantId, String bundleAlias); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java index 45a0c711ee..f533f715bd 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java @@ -17,8 +17,6 @@ package org.thingsboard.server.dao.widget; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.thingsboard.server.common.data.Tenant; @@ -28,19 +26,12 @@ import org.thingsboard.server.common.data.widget.WidgetType; import org.thingsboard.server.common.data.widget.WidgetsBundle; import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.model.ModelConstants; -import org.thingsboard.server.dao.model.TenantEntity; -import org.thingsboard.server.dao.model.WidgetTypeEntity; -import org.thingsboard.server.dao.model.WidgetsBundleEntity; import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.Validator; import org.thingsboard.server.dao.tenant.TenantDao; -import org.thingsboard.server.dao.tenant.TenantService; import java.util.List; -import static org.thingsboard.server.dao.DaoUtil.convertDataList; -import static org.thingsboard.server.dao.DaoUtil.getData; - @Service @Slf4j public class WidgetTypeServiceImpl implements WidgetTypeService { @@ -58,16 +49,14 @@ public class WidgetTypeServiceImpl implements WidgetTypeService { public WidgetType findWidgetTypeById(WidgetTypeId widgetTypeId) { log.trace("Executing findWidgetTypeById [{}]", widgetTypeId); Validator.validateId(widgetTypeId, "Incorrect widgetTypeId " + widgetTypeId); - WidgetTypeEntity widgetTypeEntity = widgetTypeDao.findById(widgetTypeId.getId()); - return getData(widgetTypeEntity); + return widgetTypeDao.findById(widgetTypeId.getId()); } @Override public WidgetType saveWidgetType(WidgetType widgetType) { log.trace("Executing saveWidgetType [{}]", widgetType); widgetTypeValidator.validate(widgetType); - WidgetTypeEntity widgetTypeEntity = widgetTypeDao.save(widgetType); - return getData(widgetTypeEntity); + return widgetTypeDao.save(widgetType); } @Override @@ -82,8 +71,7 @@ public class WidgetTypeServiceImpl implements WidgetTypeService { log.trace("Executing findWidgetTypesByTenantIdAndBundleAlias, tenantId [{}], bundleAlias [{}]", tenantId, bundleAlias); Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); Validator.validateString(bundleAlias, "Incorrect bundleAlias " + bundleAlias); - List widgetTypesEntities = widgetTypeDao.findWidgetTypesByTenantIdAndBundleAlias(tenantId.getId(), bundleAlias); - return convertDataList(widgetTypesEntities); + return widgetTypeDao.findWidgetTypesByTenantIdAndBundleAlias(tenantId.getId(), bundleAlias); } @Override @@ -92,8 +80,7 @@ public class WidgetTypeServiceImpl implements WidgetTypeService { Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); Validator.validateString(bundleAlias, "Incorrect bundleAlias " + bundleAlias); Validator.validateString(alias, "Incorrect alias " + alias); - WidgetTypeEntity widgetTypeEntity = widgetTypeDao.findByTenantIdBundleAliasAndAlias(tenantId.getId(), bundleAlias, alias); - return getData(widgetTypeEntity); + return widgetTypeDao.findByTenantIdBundleAliasAndAlias(tenantId.getId(), bundleAlias, alias); } @Override @@ -101,9 +88,9 @@ public class WidgetTypeServiceImpl implements WidgetTypeService { log.trace("Executing deleteWidgetTypesByTenantIdAndBundleAlias, tenantId [{}], bundleAlias [{}]", tenantId, bundleAlias); Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); Validator.validateString(bundleAlias, "Incorrect bundleAlias " + bundleAlias); - List widgetTypesEntities = widgetTypeDao.findWidgetTypesByTenantIdAndBundleAlias(tenantId.getId(), bundleAlias); - for (WidgetTypeEntity widgetTypeEntity : widgetTypesEntities) { - deleteWidgetType(new WidgetTypeId(widgetTypeEntity.getId())); + List widgetTypes = widgetTypeDao.findWidgetTypesByTenantIdAndBundleAlias(tenantId.getId(), bundleAlias); + for (WidgetType widgetType : widgetTypes) { + deleteWidgetType(new WidgetTypeId(widgetType.getUuidId())); } } @@ -124,7 +111,7 @@ public class WidgetTypeServiceImpl implements WidgetTypeService { widgetType.setTenantId(new TenantId(ModelConstants.NULL_UUID)); } if (!widgetType.getTenantId().getId().equals(ModelConstants.NULL_UUID)) { - TenantEntity tenant = tenantDao.findById(widgetType.getTenantId().getId()); + Tenant tenant = tenantDao.findById(widgetType.getTenantId().getId()); if (tenant == null) { throw new DataValidationException("Widget type is referencing to non-existent tenant!"); } @@ -133,8 +120,7 @@ public class WidgetTypeServiceImpl implements WidgetTypeService { @Override protected void validateCreate(WidgetType widgetType) { - - WidgetsBundleEntity widgetsBundle = widgetsBundleService.findWidgetsBundleByTenantIdAndAlias(widgetType.getTenantId().getId(), widgetType.getBundleAlias()); + WidgetsBundle widgetsBundle = widgetsBundleService.findWidgetsBundleByTenantIdAndAlias(widgetType.getTenantId().getId(), widgetType.getBundleAlias()); if (widgetsBundle == null) { throw new DataValidationException("Widget type is referencing to non-existent widgets bundle!"); } @@ -142,7 +128,7 @@ public class WidgetTypeServiceImpl implements WidgetTypeService { String alias = widgetType.getName().toLowerCase().replaceAll("\\W+", "_"); String originalAlias = alias; int c = 1; - WidgetTypeEntity withSameAlias; + WidgetType withSameAlias; do { withSameAlias = widgetTypeDao.findByTenantIdBundleAliasAndAlias(widgetType.getTenantId().getId(), widgetType.getBundleAlias(), alias); if (withSameAlias != null) { @@ -154,8 +140,8 @@ public class WidgetTypeServiceImpl implements WidgetTypeService { @Override protected void validateUpdate(WidgetType widgetType) { - WidgetTypeEntity storedWidgetType = widgetTypeDao.findById(widgetType.getId().getId()); - if (!storedWidgetType.getTenantId().equals(widgetType.getTenantId().getId())) { + WidgetType storedWidgetType = widgetTypeDao.findById(widgetType.getId().getId()); + if (!storedWidgetType.getTenantId().getId().equals(widgetType.getTenantId().getId())) { throw new DataValidationException("Can't move existing widget type to different tenant!"); } if (!storedWidgetType.getBundleAlias().equals(widgetType.getBundleAlias())) { diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleDao.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleDao.java index 0e04f91acd..d8c604449b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleDao.java @@ -18,17 +18,14 @@ package org.thingsboard.server.dao.widget; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.widget.WidgetsBundle; import org.thingsboard.server.dao.Dao; -import org.thingsboard.server.dao.model.WidgetsBundleEntity; import java.util.List; import java.util.UUID; /** * The Interface WidgetsBundleDao. - * - * @param the generic type */ -public interface WidgetsBundleDao extends Dao { +public interface WidgetsBundleDao extends Dao { /** * Save or update widgets bundle object @@ -36,7 +33,7 @@ public interface WidgetsBundleDao extends Dao { * @param widgetsBundle the widgets bundle object * @return saved widgets bundle object */ - WidgetsBundleEntity save(WidgetsBundle widgetsBundle); + WidgetsBundle save(WidgetsBundle widgetsBundle); /** * Find widgets bundle by tenantId and alias. @@ -45,7 +42,7 @@ public interface WidgetsBundleDao extends Dao { * @param alias the alias * @return the widgets bundle object */ - WidgetsBundleEntity findWidgetsBundleByTenantIdAndAlias(UUID tenantId, String alias); + WidgetsBundle findWidgetsBundleByTenantIdAndAlias(UUID tenantId, String alias); /** * Find system widgets bundles by page link. @@ -53,7 +50,7 @@ public interface WidgetsBundleDao extends Dao { * @param pageLink the page link * @return the list of widgets bundles objects */ - List findSystemWidgetsBundles(TextPageLink pageLink); + List findSystemWidgetsBundles(TextPageLink pageLink); /** * Find tenant widgets bundles by tenantId and page link. @@ -62,7 +59,7 @@ public interface WidgetsBundleDao extends Dao { * @param pageLink the page link * @return the list of widgets bundles objects */ - List findTenantWidgetsBundlesByTenantId(UUID tenantId, TextPageLink pageLink); + List findTenantWidgetsBundlesByTenantId(UUID tenantId, TextPageLink pageLink); /** * Find all tenant widgets bundles (including system) by tenantId and page link. @@ -71,7 +68,7 @@ public interface WidgetsBundleDao extends Dao { * @param pageLink the page link * @return the list of widgets bundles objects */ - List findAllTenantWidgetsBundlesByTenantId(UUID tenantId, TextPageLink pageLink); + List findAllTenantWidgetsBundlesByTenantId(UUID tenantId, TextPageLink pageLink); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleService.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleService.java index 4b91c26cc8..27f9211a6a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleService.java @@ -25,24 +25,24 @@ import java.util.List; public interface WidgetsBundleService { - public WidgetsBundle findWidgetsBundleById(WidgetsBundleId widgetsBundleId); + WidgetsBundle findWidgetsBundleById(WidgetsBundleId widgetsBundleId); - public WidgetsBundle saveWidgetsBundle(WidgetsBundle widgetsBundle); + WidgetsBundle saveWidgetsBundle(WidgetsBundle widgetsBundle); - public void deleteWidgetsBundle(WidgetsBundleId widgetsBundleId); + void deleteWidgetsBundle(WidgetsBundleId widgetsBundleId); - public WidgetsBundle findWidgetsBundleByTenantIdAndAlias(TenantId tenantId, String alias); + WidgetsBundle findWidgetsBundleByTenantIdAndAlias(TenantId tenantId, String alias); - public TextPageData findSystemWidgetsBundlesByPageLink(TextPageLink pageLink); + TextPageData findSystemWidgetsBundlesByPageLink(TextPageLink pageLink); - public List findSystemWidgetsBundles(); + List findSystemWidgetsBundles(); - public TextPageData findTenantWidgetsBundlesByTenantId(TenantId tenantId, TextPageLink pageLink); + TextPageData findTenantWidgetsBundlesByTenantId(TenantId tenantId, TextPageLink pageLink); - public TextPageData findAllTenantWidgetsBundlesByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink); + TextPageData findAllTenantWidgetsBundlesByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink); - public List findAllTenantWidgetsBundlesByTenantId(TenantId tenantId); + List findAllTenantWidgetsBundlesByTenantId(TenantId tenantId); - public void deleteWidgetsBundlesByTenantId(TenantId tenantId); + void deleteWidgetsBundlesByTenantId(TenantId tenantId); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java index 2262e14e8a..9e90acaf3e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java @@ -17,10 +17,9 @@ package org.thingsboard.server.dao.widget; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.WidgetsBundleId; import org.thingsboard.server.common.data.page.TextPageData; @@ -29,8 +28,6 @@ import org.thingsboard.server.common.data.widget.WidgetsBundle; import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.exception.IncorrectParameterException; import org.thingsboard.server.dao.model.ModelConstants; -import org.thingsboard.server.dao.model.TenantEntity; -import org.thingsboard.server.dao.model.WidgetsBundleEntity; import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.PaginatedRemover; import org.thingsboard.server.dao.service.Validator; @@ -39,13 +36,12 @@ import org.thingsboard.server.dao.tenant.TenantDao; import java.util.ArrayList; import java.util.List; -import static org.thingsboard.server.dao.DaoUtil.convertDataList; -import static org.thingsboard.server.dao.DaoUtil.getData; - @Service @Slf4j public class WidgetsBundleServiceImpl implements WidgetsBundleService { + private static final int DEFAULT_WIDGETS_BUNDLE_LIMIT = 300; + @Autowired private WidgetsBundleDao widgetsBundleDao; @@ -59,16 +55,14 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService { public WidgetsBundle findWidgetsBundleById(WidgetsBundleId widgetsBundleId) { log.trace("Executing findWidgetsBundleById [{}]", widgetsBundleId); Validator.validateId(widgetsBundleId, "Incorrect widgetsBundleId " + widgetsBundleId); - WidgetsBundleEntity widgetsBundleEntity = widgetsBundleDao.findById(widgetsBundleId.getId()); - return getData(widgetsBundleEntity); + return widgetsBundleDao.findById(widgetsBundleId.getId()); } @Override public WidgetsBundle saveWidgetsBundle(WidgetsBundle widgetsBundle) { log.trace("Executing saveWidgetsBundle [{}]", widgetsBundle); widgetsBundleValidator.validate(widgetsBundle); - WidgetsBundleEntity widgetsBundleEntity = widgetsBundleDao.save(widgetsBundle); - return getData(widgetsBundleEntity); + return widgetsBundleDao.save(widgetsBundle); } @Override @@ -88,25 +82,22 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService { log.trace("Executing findWidgetsBundleByTenantIdAndAlias, tenantId [{}], alias [{}]", tenantId, alias); Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); Validator.validateString(alias, "Incorrect alias " + alias); - WidgetsBundleEntity widgetsBundleEntity = widgetsBundleDao.findWidgetsBundleByTenantIdAndAlias(tenantId.getId(), alias); - return getData(widgetsBundleEntity); + return widgetsBundleDao.findWidgetsBundleByTenantIdAndAlias(tenantId.getId(), alias); } @Override public TextPageData findSystemWidgetsBundlesByPageLink(TextPageLink pageLink) { log.trace("Executing findSystemWidgetsBundles, pageLink [{}]", pageLink); Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink); - List widgetsBundlesEntities = widgetsBundleDao.findSystemWidgetsBundles(pageLink); - List widgetsBundles = convertDataList(widgetsBundlesEntities); - return new TextPageData<>(widgetsBundles, pageLink); + return new TextPageData<>(widgetsBundleDao.findSystemWidgetsBundles(pageLink), pageLink); } @Override public List findSystemWidgetsBundles() { log.trace("Executing findSystemWidgetsBundles"); List widgetsBundles = new ArrayList<>(); - TextPageLink pageLink = new TextPageLink(300); - TextPageData pageData = null; + TextPageLink pageLink = new TextPageLink(DEFAULT_WIDGETS_BUNDLE_LIMIT); + TextPageData pageData; do { pageData = findSystemWidgetsBundlesByPageLink(pageLink); widgetsBundles.addAll(pageData.getData()); @@ -122,9 +113,7 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService { log.trace("Executing findTenantWidgetsBundlesByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink); Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink); - List widgetsBundlesEntities = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId.getId(), pageLink); - List widgetsBundles = convertDataList(widgetsBundlesEntities); - return new TextPageData<>(widgetsBundles, pageLink); + return new TextPageData<>(widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId.getId(), pageLink), pageLink); } @Override @@ -132,9 +121,7 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService { log.trace("Executing findAllTenantWidgetsBundlesByTenantIdAndPageLink, tenantId [{}], pageLink [{}]", tenantId, pageLink); Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink); - List widgetsBundlesEntities = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId.getId(), pageLink); - List widgetsBundles = convertDataList(widgetsBundlesEntities); - return new TextPageData<>(widgetsBundles, pageLink); + return new TextPageData<>(widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId.getId(), pageLink), pageLink); } @Override @@ -142,8 +129,8 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService { log.trace("Executing findAllTenantWidgetsBundlesByTenantId, tenantId [{}]", tenantId); Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); List widgetsBundles = new ArrayList<>(); - TextPageLink pageLink = new TextPageLink(300); - TextPageData pageData = null; + TextPageLink pageLink = new TextPageLink(DEFAULT_WIDGETS_BUNDLE_LIMIT); + TextPageData pageData; do { pageData = findAllTenantWidgetsBundlesByTenantIdAndPageLink(tenantId, pageLink); widgetsBundles.addAll(pageData.getData()); @@ -173,7 +160,7 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService { widgetsBundle.setTenantId(new TenantId(ModelConstants.NULL_UUID)); } if (!widgetsBundle.getTenantId().getId().equals(ModelConstants.NULL_UUID)) { - TenantEntity tenant = tenantDao.findById(widgetsBundle.getTenantId().getId()); + Tenant tenant = tenantDao.findById(widgetsBundle.getTenantId().getId()); if (tenant == null) { throw new DataValidationException("Widgets bundle is referencing to non-existent tenant!"); } @@ -185,7 +172,7 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService { String alias = widgetsBundle.getTitle().toLowerCase().replaceAll("\\W+", "_"); String originalAlias = alias; int c = 1; - WidgetsBundleEntity withSameAlias; + WidgetsBundle withSameAlias; do { withSameAlias = widgetsBundleDao.findWidgetsBundleByTenantIdAndAlias(widgetsBundle.getTenantId().getId(), alias); if (withSameAlias != null) { @@ -197,8 +184,8 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService { @Override protected void validateUpdate(WidgetsBundle widgetsBundle) { - WidgetsBundleEntity storedWidgetsBundle = widgetsBundleDao.findById(widgetsBundle.getId().getId()); - if (!storedWidgetsBundle.getTenantId().equals(widgetsBundle.getTenantId().getId())) { + WidgetsBundle storedWidgetsBundle = widgetsBundleDao.findById(widgetsBundle.getId().getId()); + if (!storedWidgetsBundle.getTenantId().getId().equals(widgetsBundle.getTenantId().getId())) { throw new DataValidationException("Can't move existing widgets bundle to different tenant!"); } if (!storedWidgetsBundle.getAlias().equals(widgetsBundle.getAlias())) { @@ -208,17 +195,17 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService { }; - private PaginatedRemover tenantWidgetsBundleRemover = - new PaginatedRemover() { + private PaginatedRemover tenantWidgetsBundleRemover = + new PaginatedRemover() { @Override - protected List findEntities(TenantId id, TextPageLink pageLink) { + protected List findEntities(TenantId id, TextPageLink pageLink) { return widgetsBundleDao.findTenantWidgetsBundlesByTenantId(id.getId(), pageLink); } @Override - protected void removeEntity(WidgetsBundleEntity entity) { - deleteWidgetsBundle(new WidgetsBundleId(entity.getId())); + protected void removeEntity(WidgetsBundle entity) { + deleteWidgetsBundle(new WidgetsBundleId(entity.getUuidId())); } }; From 9fbd7e5bc8d73e031b5f0f130181605bc415f17b Mon Sep 17 00:00:00 2001 From: volodymyr-babak Date: Sun, 9 Apr 2017 23:19:12 +0300 Subject: [PATCH 02/69] Refactoring DAO continue --- .../server/common/data/rule/RuleMetaData.java | 5 +- .../server/dao/CassandraAbstractModelDao.java | 9 +++ .../dao/CassandraAbstractSearchTextDao.java | 8 +-- ...va => CassandraAbstractSearchTimeDao.java} | 2 +- ... CassandraBaseComponentDescriptorDao.java} | 2 +- .../server/dao/device/DeviceServiceImpl.java | 57 ++++++++++--------- .../dao/event/CassandraBaseEventDao.java | 4 +- .../dao/exception/DatabaseException.java | 26 ++++----- .../IncorrectParameterException.java | 4 +- .../server/dao/service/PaginatedRemover.java | 8 +-- .../service/DeviceCredentialsCacheTest.java | 11 ++-- 11 files changed, 71 insertions(+), 65 deletions(-) rename dao/src/main/java/org/thingsboard/server/dao/{AbstractSearchTimeDao.java => CassandraAbstractSearchTimeDao.java} (96%) rename dao/src/main/java/org/thingsboard/server/dao/component/{BaseComponentDescriptorDao.java => CassandraBaseComponentDescriptorDao.java} (97%) diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleMetaData.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleMetaData.java index ecbc86cd6e..ececfdd72c 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleMetaData.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleMetaData.java @@ -15,14 +15,11 @@ */ package org.thingsboard.server.common.data.rule; +import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; -import lombok.ToString; import org.thingsboard.server.common.data.SearchTextBased; -import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.RuleId; import org.thingsboard.server.common.data.id.TenantId; - -import com.fasterxml.jackson.databind.JsonNode; import org.thingsboard.server.common.data.plugin.ComponentLifecycleState; @Data diff --git a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractModelDao.java b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractModelDao.java index 5f5f95f037..ee9d5e0e28 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractModelDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractModelDao.java @@ -27,8 +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.common.data.SearchTextBased; 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; @@ -46,6 +48,10 @@ public abstract class CassandraAbstractModelDao, D> exte protected abstract String getColumnFamilyName(); + protected boolean isSearchTextDao() { + return false; + } + protected Mapper getMapper() { return cluster.getMapper(getColumnFamilyClass()); } @@ -144,6 +150,9 @@ public abstract class CassandraAbstractModelDao, D> exte log.error("Can't create entity for domain object {}", domain, e); throw new IllegalArgumentException("Can't create entity for domain object {" + domain + "}", e); } + if (isSearchTextDao()) { + ((SearchTextEntity) entity).setSearchText(((SearchTextEntity) entity).getSearchTextSource().toLowerCase()); + } log.debug("Saving entity {}", entity); entity = saveWithResult(entity).getEntity(); return DaoUtil.getData(entity); diff --git a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTextDao.java b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTextDao.java index 3217043137..735dd3050c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTextDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTextDao.java @@ -33,11 +33,9 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.select; @Slf4j public abstract class CassandraAbstractSearchTextDao, D> extends CassandraAbstractModelDao { - public D save(D domain) { - - entity.setSearchText(entity.getSearchTextSource().toLowerCase()); - - return super.save(entity); + @Override + protected boolean isSearchTextDao() { + return true; } protected List findPageWithTextSearch(String searchView, List clauses, TextPageLink pageLink) { diff --git a/dao/src/main/java/org/thingsboard/server/dao/AbstractSearchTimeDao.java b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTimeDao.java similarity index 96% rename from dao/src/main/java/org/thingsboard/server/dao/AbstractSearchTimeDao.java rename to dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTimeDao.java index 4a10617b25..cb60ea4be7 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/AbstractSearchTimeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTimeDao.java @@ -32,7 +32,7 @@ import java.util.UUID; import static com.datastax.driver.core.querybuilder.QueryBuilder.select; -public abstract class AbstractSearchTimeDao, D> extends CassandraAbstractModelDao { +public abstract class CassandraAbstractSearchTimeDao, D> extends CassandraAbstractModelDao { protected List findPageWithTimeSearch(String searchView, List clauses, TimePageLink pageLink) { diff --git a/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorDao.java b/dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java similarity index 97% rename from dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorDao.java rename to dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java index 330790d81b..62eb957d16 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java @@ -45,7 +45,7 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.select; */ @Component @Slf4j -public class BaseComponentDescriptorDao extends CassandraAbstractSearchTextDao implements ComponentDescriptorDao { +public class CassandraBaseComponentDescriptorDao extends CassandraAbstractSearchTextDao implements ComponentDescriptorDao { @Override protected Class getColumnFamilyClass() { 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 4a365949cc..258865049a 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 @@ -23,7 +23,9 @@ import org.apache.commons.lang3.RandomStringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.Device; +import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.TenantId; @@ -33,9 +35,7 @@ import org.thingsboard.server.common.data.security.DeviceCredentials; import org.thingsboard.server.common.data.security.DeviceCredentialsType; import org.thingsboard.server.dao.customer.CustomerDao; import org.thingsboard.server.dao.exception.DataValidationException; -import org.thingsboard.server.dao.model.CustomerEntity; import org.thingsboard.server.dao.model.DeviceEntity; -import org.thingsboard.server.dao.model.TenantEntity; import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.PaginatedRemover; import org.thingsboard.server.dao.tenant.TenantDao; @@ -43,9 +43,13 @@ import org.thingsboard.server.dao.tenant.TenantDao; import java.util.List; import java.util.Optional; -import static org.thingsboard.server.dao.DaoUtil.*; +import static org.thingsboard.server.dao.DaoUtil.convertDataList; +import static org.thingsboard.server.dao.DaoUtil.getData; +import static org.thingsboard.server.dao.DaoUtil.toUUIDs; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; -import static org.thingsboard.server.dao.service.Validator.*; +import static org.thingsboard.server.dao.service.Validator.validateId; +import static org.thingsboard.server.dao.service.Validator.validateIds; +import static org.thingsboard.server.dao.service.Validator.validatePageLink; @Service @Slf4j @@ -74,17 +78,16 @@ public class DeviceServiceImpl implements DeviceService { public ListenableFuture findDeviceByIdAsync(DeviceId deviceId) { log.trace("Executing findDeviceById [{}]", deviceId); validateId(deviceId, "Incorrect deviceId " + deviceId); - ListenableFuture deviceEntity = deviceDao.findByIdAsync(deviceId.getId()); - return Futures.transform(deviceEntity, (Function) input -> getData(input)); + return deviceDao.findByIdAsync(deviceId.getId()); } @Override public Optional findDeviceByTenantIdAndName(TenantId tenantId, String name) { log.trace("Executing findDeviceByTenantIdAndName [{}][{}]", tenantId, name); validateId(tenantId, "Incorrect tenantId " + tenantId); - Optional deviceEntityOpt = deviceDao.findDevicesByTenantIdAndName(tenantId.getId(), name); - if (deviceEntityOpt.isPresent()) { - return Optional.of(deviceEntityOpt.get()); + Optional deviceOpt = deviceDao.findDevicesByTenantIdAndName(tenantId.getId(), name); + if (deviceOpt.isPresent()) { + return Optional.of(deviceOpt.get()); } else { return Optional.empty(); } @@ -136,7 +139,7 @@ public class DeviceServiceImpl implements DeviceService { validateId(tenantId, "Incorrect tenantId " + tenantId); validatePageLink(pageLink, "Incorrect page link " + pageLink); List devices = deviceDao.findDevicesByTenantId(tenantId.getId(), pageLink); - return new TextPageData(devices, pageLink); + return new TextPageData<>(devices, pageLink); } @Override @@ -144,8 +147,7 @@ public class DeviceServiceImpl implements DeviceService { log.trace("Executing findDevicesByTenantIdAndIdsAsync, tenantId [{}], deviceIds [{}]", tenantId, deviceIds); validateId(tenantId, "Incorrect tenantId " + tenantId); validateIds(deviceIds, "Incorrect deviceIds " + deviceIds); - ListenableFuture> devices = deviceDao.findDevicesByTenantIdAndIdsAsync(tenantId.getId(), toUUIDs(deviceIds)); - return Futures.transform(deviceEntities, (Function, List>) input -> convertDataList(input)); + return deviceDao.findDevicesByTenantIdAndIdsAsync(tenantId.getId(), toUUIDs(deviceIds)); } @@ -163,7 +165,7 @@ public class DeviceServiceImpl implements DeviceService { validateId(customerId, "Incorrect customerId " + customerId); validatePageLink(pageLink, "Incorrect page link " + pageLink); List devices = deviceDao.findDevicesByTenantIdAndCustomerId(tenantId.getId(), customerId.getId(), pageLink); - return new TextPageData(devices, pageLink); + return new TextPageData<>(devices, pageLink); } @Override @@ -172,9 +174,8 @@ public class DeviceServiceImpl implements DeviceService { validateId(tenantId, "Incorrect tenantId " + tenantId); validateId(customerId, "Incorrect customerId " + customerId); validateIds(deviceIds, "Incorrect deviceIds " + deviceIds); - ListenableFuture> deviceEntities = deviceDao.findDevicesByTenantIdCustomerIdAndIdsAsync(tenantId.getId(), + return deviceDao.findDevicesByTenantIdCustomerIdAndIdsAsync(tenantId.getId(), customerId.getId(), toUUIDs(deviceIds)); - return Futures.transform(deviceEntities, (Function, List>) input -> convertDataList(input)); } @Override @@ -201,7 +202,7 @@ public class DeviceServiceImpl implements DeviceService { protected void validateUpdate(Device device) { deviceDao.findDevicesByTenantIdAndName(device.getTenantId().getId(), device.getName()).ifPresent( d -> { - if (!d.getId().equals(device.getUuidId())) { + if (!d.getUuidId().equals(device.getUuidId())) { throw new DataValidationException("Device with such name already exists!"); } } @@ -216,7 +217,7 @@ public class DeviceServiceImpl implements DeviceService { if (device.getTenantId() == null) { throw new DataValidationException("Device should be assigned to tenant!"); } else { - TenantEntity tenant = tenantDao.findById(device.getTenantId().getId()); + Tenant tenant = tenantDao.findById(device.getTenantId().getId()); if (tenant == null) { throw new DataValidationException("Device is referencing to non-existent tenant!"); } @@ -224,32 +225,32 @@ public class DeviceServiceImpl implements DeviceService { if (device.getCustomerId() == null) { device.setCustomerId(new CustomerId(NULL_UUID)); } else if (!device.getCustomerId().getId().equals(NULL_UUID)) { - CustomerEntity customer = customerDao.findById(device.getCustomerId().getId()); + Customer customer = customerDao.findById(device.getCustomerId().getId()); if (customer == null) { throw new DataValidationException("Can't assign device to non-existent customer!"); } - if (!customer.getTenantId().equals(device.getTenantId().getId())) { + if (!customer.getTenantId().getId().equals(device.getTenantId().getId())) { throw new DataValidationException("Can't assign device to customer from different tenant!"); } } } }; - private PaginatedRemover tenantDevicesRemover = - new PaginatedRemover() { + private PaginatedRemover tenantDevicesRemover = + new PaginatedRemover() { @Override - protected List findEntities(TenantId id, TextPageLink pageLink) { + protected List findEntities(TenantId id, TextPageLink pageLink) { return deviceDao.findDevicesByTenantId(id.getId(), pageLink); } @Override - protected void removeEntity(DeviceEntity entity) { - deleteDevice(new DeviceId(entity.getId())); + protected void removeEntity(Device entity) { + deleteDevice(new DeviceId(entity.getUuidId())); } }; - class CustomerDevicesUnassigner extends PaginatedRemover { + private class CustomerDevicesUnassigner extends PaginatedRemover { private TenantId tenantId; @@ -258,13 +259,13 @@ public class DeviceServiceImpl implements DeviceService { } @Override - protected List findEntities(CustomerId id, TextPageLink pageLink) { + protected List findEntities(CustomerId id, TextPageLink pageLink) { return deviceDao.findDevicesByTenantIdAndCustomerId(tenantId.getId(), id.getId(), pageLink); } @Override - protected void removeEntity(DeviceEntity entity) { - unassignDeviceFromCustomer(new DeviceId(entity.getId())); + protected void removeEntity(Device entity) { + unassignDeviceFromCustomer(new DeviceId(entity.getUuidId())); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java index adfef10539..1bdf452647 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java @@ -25,7 +25,7 @@ import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.Event; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.page.TimePageLink; -import org.thingsboard.server.dao.AbstractSearchTimeDao; +import org.thingsboard.server.dao.CassandraAbstractSearchTimeDao; import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.EventEntity; import org.thingsboard.server.dao.model.ModelConstants; @@ -41,7 +41,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Component @Slf4j -public class CassandraBaseEventDao extends AbstractSearchTimeDao implements EventDao { +public class CassandraBaseEventDao extends CassandraAbstractSearchTimeDao implements EventDao { @Override protected Class getColumnFamilyClass() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/exception/DatabaseException.java b/dao/src/main/java/org/thingsboard/server/dao/exception/DatabaseException.java index bb5586d63d..aa322f6505 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/exception/DatabaseException.java +++ b/dao/src/main/java/org/thingsboard/server/dao/exception/DatabaseException.java @@ -17,22 +17,22 @@ package org.thingsboard.server.dao.exception; public class DatabaseException extends RuntimeException { - private static final long serialVersionUID = 3463762014441887103L; + private static final long serialVersionUID = 3463762014441887103L; - public DatabaseException() { - super(); - } + public DatabaseException() { + super(); + } - public DatabaseException(String message, Throwable cause) { - super(message, cause); - } + public DatabaseException(String message, Throwable cause) { + super(message, cause); + } - public DatabaseException(String message) { - super(message); - } + public DatabaseException(String message) { + super(message); + } - public DatabaseException(Throwable cause) { - super(cause); - } + public DatabaseException(Throwable cause) { + super(cause); + } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/exception/IncorrectParameterException.java b/dao/src/main/java/org/thingsboard/server/dao/exception/IncorrectParameterException.java index 3d6450ff2b..6600dc8213 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/exception/IncorrectParameterException.java +++ b/dao/src/main/java/org/thingsboard/server/dao/exception/IncorrectParameterException.java @@ -18,9 +18,9 @@ package org.thingsboard.server.dao.exception; public class IncorrectParameterException extends RuntimeException { - private static final long serialVersionUID = 601995650578985289L; + private static final long serialVersionUID = 601995650578985289L; - public IncorrectParameterException(String message) { + public IncorrectParameterException(String message) { super(message); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/PaginatedRemover.java b/dao/src/main/java/org/thingsboard/server/dao/service/PaginatedRemover.java index 98c7fd9fc2..8bdefd967b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/service/PaginatedRemover.java +++ b/dao/src/main/java/org/thingsboard/server/dao/service/PaginatedRemover.java @@ -1,12 +1,12 @@ /** * 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 - *

+ * + * 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. diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java index 6dfa3bbd14..3ccdea31aa 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java @@ -36,11 +36,13 @@ import org.thingsboard.server.common.data.security.DeviceCredentialsType; import org.thingsboard.server.dao.device.DeviceCredentialsDao; import org.thingsboard.server.dao.device.DeviceCredentialsService; import org.thingsboard.server.dao.device.DeviceService; -import org.thingsboard.server.dao.model.DeviceCredentialsEntity; import java.util.UUID; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; @TestPropertySource(properties = {"cache.enabled = true"}) public class DeviceCredentialsCacheTest extends AbstractServiceTest { @@ -140,9 +142,8 @@ public class DeviceCredentialsCacheTest extends AbstractServiceTest { return null; } - private DeviceCredentialsEntity createDummyDeviceCredentialsEntity(String deviceCredentialsId) { - DeviceCredentialsEntity result = new DeviceCredentialsEntity(); - result.setId(UUIDs.timeBased()); + private DeviceCredentials createDummyDeviceCredentialsEntity(String deviceCredentialsId) { + DeviceCredentials result = new DeviceCredentials(new DeviceCredentialsId(UUIDs.timeBased())); result.setCredentialsId(deviceCredentialsId); return result; } From 2965e312610424f2fd033f859f774be59e3cafbd Mon Sep 17 00:00:00 2001 From: volodymyr-babak Date: Tue, 11 Apr 2017 11:02:57 +0300 Subject: [PATCH 03/69] Removed cassandra dependencies from services --- .../plugin/PluginProcessingContext.java | 27 ++++++++---------- .../controller/DashboardControllerTest.java | 1 - .../controller/DeviceControllerTest.java | 1 - .../server/dao/attributes/AttributesDao.java | 3 -- .../dao/attributes/AttributesService.java | 2 -- .../dao/attributes/BaseAttributesService.java | 3 -- .../server/dao/event/BaseEventService.java | 28 ++----------------- .../dao/event/CassandraBaseEventDao.java | 22 +++++++++++++++ .../dao/timeseries/BaseTimeseriesService.java | 4 --- .../server/dao/timeseries/TimeseriesDao.java | 3 -- .../dao/timeseries/TimeseriesService.java | 4 --- .../attributes/BaseAttributesServiceTest.java | 1 - .../dao/event/BaseEventServiceTest.java | 3 -- .../dao/plugin/BasePluginServiceTest.java | 13 +++------ .../server/dao/rule/BaseRuleServiceTest.java | 1 - .../dao/service/AbstractServiceTest.java | 1 - .../dao/service/CustomerServiceImplTest.java | 14 ++++------ .../dao/service/DashboardServiceImplTest.java | 1 - .../service/DeviceCredentialsCacheTest.java | 6 +--- .../DeviceCredentialsServiceImplTest.java | 1 - .../dao/service/DeviceServiceImplTest.java | 3 -- .../service/WidgetTypeServiceImplTest.java | 2 -- .../service/WidgetsBundleServiceImplTest.java | 1 - .../dao/timeseries/TimeseriesServiceTest.java | 11 ++------ 24 files changed, 48 insertions(+), 108 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java index 876b52535b..ed75b10bc7 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java @@ -15,16 +15,7 @@ */ package org.thingsboard.server.actors.plugin; -import java.io.IOException; -import java.util.*; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; -import java.util.stream.Collectors; - -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.ResultSetFuture; -import com.datastax.driver.core.Row; +import akka.actor.ActorRef; import com.google.common.base.Function; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -32,18 +23,20 @@ import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.Device; -import org.thingsboard.server.common.data.id.*; +import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.PluginId; +import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.kv.AttributeKey; import org.thingsboard.server.common.data.kv.AttributeKvEntry; import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.common.data.kv.TsKvQuery; -import org.thingsboard.server.common.data.page.TextPageData; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.msg.cluster.ServerAddress; import org.thingsboard.server.extensions.api.device.DeviceAttributesEventNotificationMsg; import org.thingsboard.server.extensions.api.plugins.PluginApiCallSecurityContext; -import org.thingsboard.server.extensions.api.plugins.PluginContext; import org.thingsboard.server.extensions.api.plugins.PluginCallback; +import org.thingsboard.server.extensions.api.plugins.PluginContext; import org.thingsboard.server.extensions.api.plugins.msg.PluginToRuleMsg; import org.thingsboard.server.extensions.api.plugins.msg.TimeoutMsg; import org.thingsboard.server.extensions.api.plugins.msg.ToDeviceRpcRequest; @@ -52,10 +45,12 @@ import org.thingsboard.server.extensions.api.plugins.rpc.RpcMsg; import org.thingsboard.server.extensions.api.plugins.ws.PluginWebsocketSessionRef; import org.thingsboard.server.extensions.api.plugins.ws.msg.PluginWebsocketMsg; -import akka.actor.ActorRef; -import org.w3c.dom.Attr; - import javax.annotation.Nullable; +import java.io.IOException; +import java.util.*; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.stream.Collectors; @Slf4j public final class PluginProcessingContext implements PluginContext { diff --git a/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java index e6eb243db2..329b42d152 100644 --- a/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java @@ -35,7 +35,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.core.type.TypeReference; public class DashboardControllerTest extends AbstractControllerTest { diff --git a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java index 69bb761c97..0f2fa12135 100644 --- a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java @@ -42,7 +42,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.core.type.TypeReference; public class DeviceControllerTest extends AbstractControllerTest { diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java index 3fb8ee2ffc..6696f39556 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.dao.attributes; -// CASSANDRA ??? -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.ResultSetFuture; import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.kv.AttributeKvEntry; diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java index ccca460917..222ffa3b1a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java @@ -15,8 +15,6 @@ */ package org.thingsboard.server.dao.attributes; -// CASSANDRA ??? -import com.datastax.driver.core.ResultSet; import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.kv.AttributeKvEntry; diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java index 6fd734a191..5ed231bd9f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.dao.attributes; -// CASSANDRA ??? -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.ResultSetFuture; import com.google.common.collect.Lists; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java b/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java index 65fc5679f1..c5c4e478d8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java @@ -15,15 +15,12 @@ */ package org.thingsboard.server.dao.event; -// CASSANDRA ??? -import com.datastax.driver.core.utils.UUIDs; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.thingsboard.server.common.data.Event; 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.TimePageData; import org.thingsboard.server.common.data.page.TimePageLink; @@ -33,30 +30,16 @@ import org.thingsboard.server.dao.service.DataValidator; import java.util.List; import java.util.Optional; -import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; - @Service @Slf4j public class BaseEventService implements EventService { - private final TenantId systemTenantId = new TenantId(NULL_UUID); - @Autowired public EventDao eventDao; @Override public Event save(Event event) { eventValidator.validate(event); - if (event.getTenantId() == null) { - log.trace("Save system event with predefined id {}", systemTenantId); - event.setTenantId(systemTenantId); - } - if (event.getId() == null) { - event.setId(new EventId(UUIDs.timeBased())); - } - if (StringUtils.isEmpty(event.getUid())) { - event.setUid(event.getId().toString()); - } return eventDao.save(event); } @@ -66,13 +49,6 @@ public class BaseEventService implements EventService { if (StringUtils.isEmpty(event.getUid())) { throw new DataValidationException("Event uid should be specified!."); } - if (event.getTenantId() == null) { - log.trace("Save system event with predefined id {}", systemTenantId); - event.setTenantId(systemTenantId); - } - if (event.getId() == null) { - event.setId(new EventId(UUIDs.timeBased())); - } Optional result = eventDao.saveIfNotExists(event); return result.isPresent() ? Optional.of(result.get()) : Optional.empty(); } @@ -98,13 +74,13 @@ public class BaseEventService implements EventService { @Override public TimePageData findEvents(TenantId tenantId, EntityId entityId, TimePageLink pageLink) { List events = eventDao.findEvents(tenantId.getId(), entityId, pageLink); - return new TimePageData(events, pageLink); + return new TimePageData<>(events, pageLink); } @Override public TimePageData findEvents(TenantId tenantId, EntityId entityId, String eventType, TimePageLink pageLink) { List events = eventDao.findEvents(tenantId.getId(), entityId, eventType, pageLink); - return new TimePageData(events, pageLink); + return new TimePageData<>(events, pageLink); } private DataValidator eventValidator = diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java index 1bdf452647..73b9096fd8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java @@ -21,9 +21,12 @@ import com.datastax.driver.core.querybuilder.QueryBuilder; import com.datastax.driver.core.querybuilder.Select; import com.datastax.driver.core.utils.UUIDs; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.Event; 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.DaoUtil; @@ -43,6 +46,8 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Slf4j public class CassandraBaseEventDao extends CassandraAbstractSearchTimeDao implements EventDao { + private final TenantId systemTenantId = new TenantId(NULL_UUID); + @Override protected Class getColumnFamilyClass() { return EventEntity.class; @@ -56,11 +61,28 @@ public class CassandraBaseEventDao extends CassandraAbstractSearchTimeDao saveIfNotExists(Event event) { + if (event.getTenantId() == null) { + log.trace("Save system event with predefined id {}", systemTenantId); + event.setTenantId(systemTenantId); + } + if (event.getId() == null) { + event.setId(new EventId(UUIDs.timeBased())); + } return save(new EventEntity(event), true); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java index 71102b1a8c..d58815f955 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java @@ -15,10 +15,6 @@ */ package org.thingsboard.server.dao.timeseries; -// CASSANDRA ??? -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.ResultSetFuture; -import com.datastax.driver.core.Row; import com.google.common.collect.Lists; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java index afa5c953a1..733200d976 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.dao.timeseries; -// CASSANDRA ??? -import com.datastax.driver.core.ResultSetFuture; -import com.datastax.driver.core.Row; import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.common.data.kv.TsKvQuery; diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java index 28ed5ddd89..b2bf2e02dc 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java @@ -15,10 +15,6 @@ */ package org.thingsboard.server.dao.timeseries; -// CASSANDRA ??? -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.ResultSetFuture; -import com.datastax.driver.core.Row; import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.server.common.data.id.UUIDBased; import org.thingsboard.server.common.data.kv.TsKvEntry; diff --git a/dao/src/test/java/org/thingsboard/server/dao/attributes/BaseAttributesServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/attributes/BaseAttributesServiceTest.java index 559a3130e8..a9835cbe45 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/attributes/BaseAttributesServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/attributes/BaseAttributesServiceTest.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.dao.attributes; -import com.datastax.driver.core.utils.UUIDs; import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.kv.AttributeKvEntry; diff --git a/dao/src/test/java/org/thingsboard/server/dao/event/BaseEventServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/event/BaseEventServiceTest.java index bdabcf48d4..b185d2c3ce 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/event/BaseEventServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/event/BaseEventServiceTest.java @@ -15,8 +15,6 @@ */ package org.thingsboard.server.dao.event; -import com.datastax.driver.core.utils.UUIDs; -import org.apache.cassandra.utils.UUIDGen; import org.junit.Assert; import org.junit.Test; import org.thingsboard.server.common.data.DataConstants; @@ -34,7 +32,6 @@ import java.io.IOException; import java.time.LocalDateTime; import java.time.Month; import java.time.ZoneOffset; -import java.util.List; import java.util.Optional; public class BaseEventServiceTest extends AbstractServiceTest { diff --git a/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java index 4367c87e9f..644e2214c8 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java @@ -15,22 +15,17 @@ */ package org.thingsboard.server.dao.plugin; -import java.util.UUID; - import lombok.extern.slf4j.Slf4j; +import org.junit.Assert; +import org.junit.Test; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.TextPageData; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.plugin.PluginMetaData; -import org.thingsboard.server.common.data.rule.RuleMetaData; +import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.service.AbstractServiceTest; -import org.junit.Assert; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import com.datastax.driver.core.utils.UUIDs; -import org.thingsboard.server.dao.model.ModelConstants; +import java.util.UUID; @Slf4j public class BasePluginServiceTest extends AbstractServiceTest { diff --git a/dao/src/test/java/org/thingsboard/server/dao/rule/BaseRuleServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/rule/BaseRuleServiceTest.java index f62f26c2fb..fe40b84edf 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/rule/BaseRuleServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/rule/BaseRuleServiceTest.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.dao.rule; -import com.datastax.driver.core.utils.UUIDs; import org.junit.Assert; import org.junit.Test; import org.thingsboard.server.common.data.id.TenantId; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java index f66e6eee69..01de94f365 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.dao.service; -import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/CustomerServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/CustomerServiceImplTest.java index fd0b20f1ad..67ff8b0fa3 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/CustomerServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/CustomerServiceImplTest.java @@ -15,23 +15,21 @@ */ package org.thingsboard.server.dao.service; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.apache.commons.lang3.RandomStringUtils; import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.TextPageData; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.dao.exception.DataValidationException; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import com.datastax.driver.core.utils.UUIDs; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; public class CustomerServiceImplTest extends AbstractServiceTest { diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceImplTest.java index 949198c553..95f9430b2d 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceImplTest.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.dao.service; -import com.datastax.driver.core.utils.UUIDs; import org.apache.commons.lang3.RandomStringUtils; import org.junit.After; import org.junit.Assert; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java index 3ccdea31aa..f9068ed0d5 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.dao.service; -import com.datastax.driver.core.utils.UUIDs; import com.hazelcast.core.HazelcastInstance; import org.apache.commons.lang3.RandomStringUtils; import org.junit.After; @@ -39,10 +38,7 @@ import org.thingsboard.server.dao.device.DeviceService; import java.util.UUID; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; @TestPropertySource(properties = {"cache.enabled = true"}) public class DeviceCredentialsCacheTest extends AbstractServiceTest { diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsServiceImplTest.java index efdab8a08a..c31fd2babc 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsServiceImplTest.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.dao.service; -import com.datastax.driver.core.utils.UUIDs; import org.apache.commons.lang3.RandomStringUtils; import org.junit.After; import org.junit.Assert; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceImplTest.java index e9113d447b..8126bfaa83 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceImplTest.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.dao.service; -import com.datastax.driver.core.utils.UUIDs; import org.apache.commons.lang3.RandomStringUtils; import org.junit.After; import org.junit.Assert; @@ -25,8 +24,6 @@ import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.id.CustomerId; -import org.thingsboard.server.common.data.id.DeviceCredentialsId; -import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.TextPageData; import org.thingsboard.server.common.data.page.TextPageLink; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/WidgetTypeServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/WidgetTypeServiceImplTest.java index cf3fd4bc2b..9c5fb64313 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/WidgetTypeServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/WidgetTypeServiceImplTest.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.dao.service; -import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.After; @@ -23,7 +22,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.thingsboard.server.common.data.Tenant; -import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.widget.WidgetType; import org.thingsboard.server.common.data.widget.WidgetsBundle; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/WidgetsBundleServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/WidgetsBundleServiceImplTest.java index 6345567832..f7794626c3 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/WidgetsBundleServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/WidgetsBundleServiceImplTest.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.dao.service; -import com.datastax.driver.core.utils.UUIDs; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/TimeseriesServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/TimeseriesServiceTest.java index 134f4710c7..49b77c2b32 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/TimeseriesServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/TimeseriesServiceTest.java @@ -15,21 +15,14 @@ */ package org.thingsboard.server.dao.timeseries; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.ResultSetFuture; -import com.datastax.driver.core.utils.UUIDs; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; +import org.junit.Test; import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.id.DeviceId; -import org.thingsboard.server.dao.service.AbstractServiceTest; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.thingsboard.server.common.data.kv.*; +import org.thingsboard.server.dao.service.AbstractServiceTest; -import java.time.LocalDateTime; -import java.time.ZoneOffset; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; From bf7c03d49037a11763307df231272c7dd27d9d72 Mon Sep 17 00:00:00 2001 From: Valerii Sosliuk Date: Tue, 11 Apr 2017 22:09:52 -0400 Subject: [PATCH 04/69] Added JPA Entity classes and someJPA Dao-related classes --- .../server/controller/BaseController.java | 2 - .../server/controller/DeviceController.java | 3 - .../server/controller/PluginController.java | 1 - .../src/main/resources/thingsboard.yml | 12 + dao/pom.xml | 4 + .../server/dao/CassandraAbstractModelDao.java | 1 - .../thingsboard/server/dao/JpaDaoConfig.java | 42 +++ .../CassandraBaseComponentDescriptorDao.java | 2 +- .../dao/customer/CassandraCustomerDao.java | 2 +- .../dao/dashboard/CassandraDashboardDao.java | 2 +- .../dashboard/CassandraDashboardInfoDao.java | 2 +- .../device/CassandraDeviceCredentialsDao.java | 2 +- .../server/dao/device/CassandraDeviceDao.java | 2 +- .../server/dao/device/DeviceServiceImpl.java | 5 - .../dao/event/CassandraBaseEventDao.java | 2 +- .../{ => nosql}/AdminSettingsEntity.java | 3 +- .../ComponentDescriptorEntity.java | 4 +- .../dao/model/{ => nosql}/CustomerEntity.java | 47 +-- .../model/{ => nosql}/DashboardEntity.java | 4 +- .../{ => nosql}/DashboardInfoEntity.java | 7 +- .../{ => nosql}/DeviceCredentialsEntity.java | 4 +- .../dao/model/{ => nosql}/DeviceEntity.java | 20 +- .../dao/model/{ => nosql}/EventEntity.java | 22 +- .../{ => nosql}/PluginMetaDataEntity.java | 17 +- .../model/{ => nosql}/RuleMetaDataEntity.java | 31 +- .../dao/model/{ => nosql}/TenantEntity.java | 47 +-- .../{ => nosql}/UserCredentialsEntity.java | 26 +- .../dao/model/{ => nosql}/UserEntity.java | 35 +- .../model/{ => nosql}/WidgetTypeEntity.java | 4 +- .../{ => nosql}/WidgetsBundleEntity.java | 4 +- .../dao/model/sql/AdminSettingsEntity.java | 145 ++++++++ .../model/sql/ComponentDescriptorEntity.java | 164 ++++++++ .../server/dao/model/sql/CustomerEntity.java | 351 ++++++++++++++++++ .../server/dao/model/sql/DashboardEntity.java | 221 +++++++++++ .../dao/model/sql/DashboardInfoEntity.java | 199 ++++++++++ .../model/sql/DeviceCredentialsEntity.java | 187 ++++++++++ .../server/dao/model/sql/DeviceEntity.java | 213 +++++++++++ .../server/dao/model/sql/EventEntity.java | 119 ++++++ .../dao/model/sql/PluginMetaDataEntity.java | 216 +++++++++++ .../dao/model/sql/RuleMetaDataEntity.java | 228 ++++++++++++ .../server/dao/model/sql/TenantEntity.java | 351 ++++++++++++++++++ .../dao/model/sql/UserCredentialsEntity.java | 189 ++++++++++ .../server/dao/model/sql/UserEntity.java | 274 ++++++++++++++ .../dao/model/sql/WidgetTypeEntity.java | 183 +++++++++ .../dao/model/sql/WidgetsBundleEntity.java | 190 ++++++++++ .../dao/plugin/CassandraBasePluginDao.java | 2 +- .../server/dao/rule/CassandraBaseRuleDao.java | 2 +- .../settings/CassandraAdminSettingsDao.java | 2 +- .../server/dao/sql/JpaAbstractDao.java | 90 +++++ .../server/dao/sql/user/JpaRepository.java | 31 ++ .../server/dao/sql/user/JpaUserDao.java | 52 +++ .../server/dao/sql/user/UserRepository.java | 26 ++ .../server/dao/tenant/CassandraTenantDao.java | 2 +- .../dao/user/CassandraUserCredentialsDao.java | 2 +- .../server/dao/user/CassandraUserDao.java | 2 +- .../dao/widget/CassandraWidgetTypeDao.java | 2 +- .../dao/widget/CassandraWidgetsBundleDao.java | 2 +- .../dao/plugin/BasePluginServiceTest.java | 2 + pom.xml | 5 + 59 files changed, 3631 insertions(+), 180 deletions(-) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java rename dao/src/main/java/org/thingsboard/server/dao/model/{ => nosql}/AdminSettingsEntity.java (97%) rename dao/src/main/java/org/thingsboard/server/dao/model/{ => nosql}/ComponentDescriptorEntity.java (96%) rename dao/src/main/java/org/thingsboard/server/dao/model/{ => nosql}/CustomerEntity.java (84%) rename dao/src/main/java/org/thingsboard/server/dao/model/{ => nosql}/DashboardEntity.java (97%) rename dao/src/main/java/org/thingsboard/server/dao/model/{ => nosql}/DashboardInfoEntity.java (96%) rename dao/src/main/java/org/thingsboard/server/dao/model/{ => nosql}/DeviceCredentialsEntity.java (97%) rename dao/src/main/java/org/thingsboard/server/dao/model/{ => nosql}/DeviceEntity.java (90%) rename dao/src/main/java/org/thingsboard/server/dao/model/{ => nosql}/EventEntity.java (83%) rename dao/src/main/java/org/thingsboard/server/dao/model/{ => nosql}/PluginMetaDataEntity.java (91%) rename dao/src/main/java/org/thingsboard/server/dao/model/{ => nosql}/RuleMetaDataEntity.java (86%) rename dao/src/main/java/org/thingsboard/server/dao/model/{ => nosql}/TenantEntity.java (84%) rename dao/src/main/java/org/thingsboard/server/dao/model/{ => nosql}/UserCredentialsEntity.java (83%) rename dao/src/main/java/org/thingsboard/server/dao/model/{ => nosql}/UserEntity.java (84%) rename dao/src/main/java/org/thingsboard/server/dao/model/{ => nosql}/WidgetTypeEntity.java (97%) rename dao/src/main/java/org/thingsboard/server/dao/model/{ => nosql}/WidgetsBundleEntity.java (97%) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaRepository.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java diff --git a/application/src/main/java/org/thingsboard/server/controller/BaseController.java b/application/src/main/java/org/thingsboard/server/controller/BaseController.java index 1b6696fd68..034206f73e 100644 --- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java +++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java @@ -15,8 +15,6 @@ */ package org.thingsboard.server.controller; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/application/src/main/java/org/thingsboard/server/controller/DeviceController.java b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java index b08a9640a7..3df1baef36 100644 --- a/application/src/main/java/org/thingsboard/server/controller/DeviceController.java +++ b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java @@ -23,19 +23,16 @@ import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.common.data.id.UUIDBased; import org.thingsboard.server.common.data.page.TextPageData; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.security.DeviceCredentials; import org.thingsboard.server.dao.exception.IncorrectParameterException; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.exception.ThingsboardException; -import org.thingsboard.server.extensions.api.device.DeviceCredentialsUpdateNotificationMsg; import org.thingsboard.server.service.security.model.SecurityUser; import java.util.ArrayList; import java.util.List; -import java.util.UUID; @RestController @RequestMapping("/api") diff --git a/application/src/main/java/org/thingsboard/server/controller/PluginController.java b/application/src/main/java/org/thingsboard/server/controller/PluginController.java index 513266400e..5dd14ccf15 100644 --- a/application/src/main/java/org/thingsboard/server/controller/PluginController.java +++ b/application/src/main/java/org/thingsboard/server/controller/PluginController.java @@ -25,7 +25,6 @@ import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent; import org.thingsboard.server.common.data.plugin.PluginMetaData; import org.thingsboard.server.common.data.security.Authority; -import org.thingsboard.server.common.data.widget.WidgetsBundle; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.exception.ThingsboardException; diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 778406aadf..8766e5711e 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -188,3 +188,15 @@ cache: updates: # Enable/disable updates checking. enabled: "${UPDATES_ENABLED:true}" + +cassandra: + enabled: "${CASSANDRA_ENABLED:true}" + +# SQL DAO Configuration + +sql: + enabled: "${SQL_ENABLED:false}" + datasource: + url: "${SQL_DATASOURCE_URL:jdbc:postgresql://localhost:5432/thingsboard}" + username: "${SQL_DATASOURCE_USERNAME:postgres}" + password: "${SQL_DATASOURCE_PASSWORD:postgres}" diff --git a/dao/pom.xml b/dao/pom.xml index 146b8c197e..977be95f95 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -150,6 +150,10 @@ org.bouncycastle bcprov-jdk15on + + org.springframework.boot + spring-boot-starter-data-jpa + diff --git a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractModelDao.java b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractModelDao.java index ee9d5e0e28..99c82a0cf6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractModelDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractModelDao.java @@ -27,7 +27,6 @@ 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.common.data.SearchTextBased; import org.thingsboard.server.dao.model.BaseEntity; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.SearchTextEntity; diff --git a/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java b/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java new file mode 100644 index 0000000000..167518a6b7 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java @@ -0,0 +1,42 @@ +/** + * 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.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder; +import org.springframework.context.annotation.Configuration; + +import javax.sql.DataSource; + +/** + * @author Valerii Sosliuk + */ +@Configuration +@ConditionalOnProperty(prefix="sql", value="enabled",havingValue = "true", matchIfMissing = false) +public class JpaDaoConfig { + + @Value("sql.datasource.url") + private String url; + @Value("sql.datasource.username") + private String username; + @Value("sql.datasource.password") + private String password; + + public DataSource dataSource() { + return DataSourceBuilder.create().url(url).username(username).password(password).build(); + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java b/dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java index 62eb957d16..0426a3372a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java @@ -29,7 +29,7 @@ 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.DaoUtil; -import org.thingsboard.server.dao.model.ComponentDescriptorEntity; +import org.thingsboard.server.dao.model.nosql.ComponentDescriptorEntity; import org.thingsboard.server.dao.model.ModelConstants; import java.util.Arrays; diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CassandraCustomerDao.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CassandraCustomerDao.java index 18f35e6dc3..1bb682bdd7 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/customer/CassandraCustomerDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CassandraCustomerDao.java @@ -21,7 +21,7 @@ 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.DaoUtil; -import org.thingsboard.server.dao.model.CustomerEntity; +import org.thingsboard.server.dao.model.nosql.CustomerEntity; import org.thingsboard.server.dao.model.ModelConstants; import java.util.Arrays; diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardDao.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardDao.java index 97a5c7a614..82d5a26576 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardDao.java @@ -18,7 +18,7 @@ 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.model.DashboardEntity; +import org.thingsboard.server.dao.model.nosql.DashboardEntity; import static org.thingsboard.server.dao.model.ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME; diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardInfoDao.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardInfoDao.java index 19527c7407..b0c3e891d3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardInfoDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardInfoDao.java @@ -21,7 +21,7 @@ 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.DaoUtil; -import org.thingsboard.server.dao.model.DashboardInfoEntity; +import org.thingsboard.server.dao.model.nosql.DashboardInfoEntity; import java.util.Arrays; import java.util.Collections; diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceCredentialsDao.java b/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceCredentialsDao.java index c96367e945..14ac5bfd45 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceCredentialsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceCredentialsDao.java @@ -21,7 +21,7 @@ import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.security.DeviceCredentials; import org.thingsboard.server.dao.CassandraAbstractModelDao; import org.thingsboard.server.dao.DaoUtil; -import org.thingsboard.server.dao.model.DeviceCredentialsEntity; +import org.thingsboard.server.dao.model.nosql.DeviceCredentialsEntity; import org.thingsboard.server.dao.model.ModelConstants; import java.util.UUID; diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceDao.java index 814976e92a..b326fcb25e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceDao.java @@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.dao.CassandraAbstractSearchTextDao; import org.thingsboard.server.dao.DaoUtil; -import org.thingsboard.server.dao.model.DeviceEntity; +import org.thingsboard.server.dao.model.nosql.DeviceEntity; import java.util.*; 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 258865049a..a5707ce29d 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 @@ -15,8 +15,6 @@ */ package org.thingsboard.server.dao.device; -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.apache.commons.lang3.RandomStringUtils; @@ -35,7 +33,6 @@ import org.thingsboard.server.common.data.security.DeviceCredentials; import org.thingsboard.server.common.data.security.DeviceCredentialsType; import org.thingsboard.server.dao.customer.CustomerDao; import org.thingsboard.server.dao.exception.DataValidationException; -import org.thingsboard.server.dao.model.DeviceEntity; import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.PaginatedRemover; import org.thingsboard.server.dao.tenant.TenantDao; @@ -43,8 +40,6 @@ import org.thingsboard.server.dao.tenant.TenantDao; import java.util.List; import java.util.Optional; -import static org.thingsboard.server.dao.DaoUtil.convertDataList; -import static org.thingsboard.server.dao.DaoUtil.getData; import static org.thingsboard.server.dao.DaoUtil.toUUIDs; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; import static org.thingsboard.server.dao.service.Validator.validateId; diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java index 73b9096fd8..3598d2a176 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java @@ -30,7 +30,7 @@ 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.DaoUtil; -import org.thingsboard.server.dao.model.EventEntity; +import org.thingsboard.server.dao.model.nosql.EventEntity; import org.thingsboard.server.dao.model.ModelConstants; import java.util.Arrays; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/AdminSettingsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/AdminSettingsEntity.java similarity index 97% rename from dao/src/main/java/org/thingsboard/server/dao/model/AdminSettingsEntity.java rename to dao/src/main/java/org/thingsboard/server/dao/model/nosql/AdminSettingsEntity.java index 0fddbceba1..11ddd4d540 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/AdminSettingsEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/AdminSettingsEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.model; +package org.thingsboard.server.dao.model.nosql; import static org.thingsboard.server.dao.model.ModelConstants.ADMIN_SETTINGS_COLUMN_FAMILY_NAME; import static org.thingsboard.server.dao.model.ModelConstants.ADMIN_SETTINGS_JSON_VALUE_PROPERTY; @@ -24,6 +24,7 @@ import java.util.UUID; 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.model.type.JsonCodec; import com.datastax.driver.core.utils.UUIDs; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/ComponentDescriptorEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/ComponentDescriptorEntity.java similarity index 96% rename from dao/src/main/java/org/thingsboard/server/dao/model/ComponentDescriptorEntity.java rename to dao/src/main/java/org/thingsboard/server/dao/model/nosql/ComponentDescriptorEntity.java index 7a229212c6..d5cf08cf52 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/ComponentDescriptorEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/ComponentDescriptorEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.model; +package org.thingsboard.server.dao.model.nosql; import com.datastax.driver.mapping.annotations.Column; import com.datastax.driver.mapping.annotations.PartitionKey; @@ -23,6 +23,8 @@ import org.thingsboard.server.common.data.id.ComponentDescriptorId; 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.model.ModelConstants; +import org.thingsboard.server.dao.model.SearchTextEntity; import org.thingsboard.server.dao.model.type.JsonCodec; import java.util.UUID; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/CustomerEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/CustomerEntity.java similarity index 84% rename from dao/src/main/java/org/thingsboard/server/dao/model/CustomerEntity.java rename to dao/src/main/java/org/thingsboard/server/dao/model/nosql/CustomerEntity.java index 7728b8356b..ce3dbff0af 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/CustomerEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/CustomerEntity.java @@ -13,28 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.model; - -import static org.thingsboard.server.dao.model.ModelConstants.ADDRESS2_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.ADDRESS_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.CITY_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.COUNTRY_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.CUSTOMER_ADDITIONAL_INFO_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.CUSTOMER_COLUMN_FAMILY_NAME; -import static org.thingsboard.server.dao.model.ModelConstants.CUSTOMER_TENANT_ID_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.CUSTOMER_TITLE_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.EMAIL_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.ID_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.PHONE_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.SEARCH_TEXT_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.STATE_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.ZIP_PROPERTY; +package org.thingsboard.server.dao.model.nosql; import java.util.UUID; import org.thingsboard.server.common.data.Customer; 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.model.type.JsonCodec; import com.datastax.driver.core.utils.UUIDs; @@ -44,51 +31,51 @@ import com.datastax.driver.mapping.annotations.Table; import com.datastax.driver.mapping.annotations.Transient; import com.fasterxml.jackson.databind.JsonNode; -@Table(name = CUSTOMER_COLUMN_FAMILY_NAME) +@Table(name = ModelConstants.CUSTOMER_COLUMN_FAMILY_NAME) public final class CustomerEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = -7732527103760948490L; @PartitionKey(value = 0) - @Column(name = ID_PROPERTY) + @Column(name = ModelConstants.ID_PROPERTY) private UUID id; @PartitionKey(value = 1) - @Column(name = CUSTOMER_TENANT_ID_PROPERTY) + @Column(name = ModelConstants.CUSTOMER_TENANT_ID_PROPERTY) private UUID tenantId; - @Column(name = CUSTOMER_TITLE_PROPERTY) + @Column(name = ModelConstants.CUSTOMER_TITLE_PROPERTY) private String title; - @Column(name = SEARCH_TEXT_PROPERTY) + @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) private String searchText; - @Column(name = COUNTRY_PROPERTY) + @Column(name = ModelConstants.COUNTRY_PROPERTY) private String country; - @Column(name = STATE_PROPERTY) + @Column(name = ModelConstants.STATE_PROPERTY) private String state; - @Column(name = CITY_PROPERTY) + @Column(name = ModelConstants.CITY_PROPERTY) private String city; - @Column(name = ADDRESS_PROPERTY) + @Column(name = ModelConstants.ADDRESS_PROPERTY) private String address; - @Column(name = ADDRESS2_PROPERTY) + @Column(name = ModelConstants.ADDRESS2_PROPERTY) private String address2; - @Column(name = ZIP_PROPERTY) + @Column(name = ModelConstants.ZIP_PROPERTY) private String zip; - @Column(name = PHONE_PROPERTY) + @Column(name = ModelConstants.PHONE_PROPERTY) private String phone; - @Column(name = EMAIL_PROPERTY) + @Column(name = ModelConstants.EMAIL_PROPERTY) private String email; - @Column(name = CUSTOMER_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) + @Column(name = ModelConstants.CUSTOMER_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) private JsonNode additionalInfo; public CustomerEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/DashboardEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DashboardEntity.java similarity index 97% rename from dao/src/main/java/org/thingsboard/server/dao/model/DashboardEntity.java rename to dao/src/main/java/org/thingsboard/server/dao/model/nosql/DashboardEntity.java index 4a3c8ed581..911e9708d0 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/DashboardEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DashboardEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.model; +package org.thingsboard.server.dao.model.nosql; import java.util.UUID; @@ -21,6 +21,8 @@ import org.thingsboard.server.common.data.Dashboard; import org.thingsboard.server.common.data.id.CustomerId; 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.model.type.JsonCodec; import com.datastax.driver.core.utils.UUIDs; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/DashboardInfoEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DashboardInfoEntity.java similarity index 96% rename from dao/src/main/java/org/thingsboard/server/dao/model/DashboardInfoEntity.java rename to dao/src/main/java/org/thingsboard/server/dao/model/nosql/DashboardInfoEntity.java index 660e23b556..2c5fe00580 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/DashboardInfoEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DashboardInfoEntity.java @@ -13,23 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.model; +package org.thingsboard.server.dao.model.nosql; import java.util.UUID; -import org.thingsboard.server.common.data.Dashboard; import org.thingsboard.server.common.data.DashboardInfo; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DashboardId; import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.dao.model.type.JsonCodec; +import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.model.SearchTextEntity; import com.datastax.driver.core.utils.UUIDs; import com.datastax.driver.mapping.annotations.Column; import com.datastax.driver.mapping.annotations.PartitionKey; import com.datastax.driver.mapping.annotations.Table; import com.datastax.driver.mapping.annotations.Transient; -import com.fasterxml.jackson.databind.JsonNode; @Table(name = ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME) public class DashboardInfoEntity implements SearchTextEntity { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/DeviceCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DeviceCredentialsEntity.java similarity index 97% rename from dao/src/main/java/org/thingsboard/server/dao/model/DeviceCredentialsEntity.java rename to dao/src/main/java/org/thingsboard/server/dao/model/nosql/DeviceCredentialsEntity.java index 9156f48035..32864c64a2 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/DeviceCredentialsEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DeviceCredentialsEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.model; +package org.thingsboard.server.dao.model.nosql; import java.util.UUID; @@ -21,6 +21,8 @@ import org.thingsboard.server.common.data.id.DeviceCredentialsId; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.security.DeviceCredentials; import org.thingsboard.server.common.data.security.DeviceCredentialsType; +import org.thingsboard.server.dao.model.BaseEntity; +import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.type.DeviceCredentialsTypeCodec; import com.datastax.driver.core.utils.UUIDs; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/DeviceEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DeviceEntity.java similarity index 90% rename from dao/src/main/java/org/thingsboard/server/dao/model/DeviceEntity.java rename to dao/src/main/java/org/thingsboard/server/dao/model/nosql/DeviceEntity.java index 740bf2ac44..70c9a36efe 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/DeviceEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DeviceEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.model; +package org.thingsboard.server.dao.model.nosql; import com.datastax.driver.core.utils.UUIDs; import com.datastax.driver.mapping.annotations.Column; @@ -25,37 +25,37 @@ import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.id.CustomerId; 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.model.type.JsonCodec; import java.util.UUID; -import static org.thingsboard.server.dao.model.ModelConstants.*; - -@Table(name = DEVICE_COLUMN_FAMILY_NAME) +@Table(name = ModelConstants.DEVICE_COLUMN_FAMILY_NAME) public final class DeviceEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = -1265181166886910152L; @PartitionKey(value = 0) - @Column(name = ID_PROPERTY) + @Column(name = ModelConstants.ID_PROPERTY) private UUID id; @PartitionKey(value = 1) - @Column(name = DEVICE_TENANT_ID_PROPERTY) + @Column(name = ModelConstants.DEVICE_TENANT_ID_PROPERTY) private UUID tenantId; @PartitionKey(value = 2) - @Column(name = DEVICE_CUSTOMER_ID_PROPERTY) + @Column(name = ModelConstants.DEVICE_CUSTOMER_ID_PROPERTY) private UUID customerId; - @Column(name = DEVICE_NAME_PROPERTY) + @Column(name = ModelConstants.DEVICE_NAME_PROPERTY) private String name; - @Column(name = SEARCH_TEXT_PROPERTY) + @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) private String searchText; - @Column(name = DEVICE_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) + @Column(name = ModelConstants.DEVICE_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) private JsonNode additionalInfo; public DeviceEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/EventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/EventEntity.java similarity index 83% rename from dao/src/main/java/org/thingsboard/server/dao/model/EventEntity.java rename to dao/src/main/java/org/thingsboard/server/dao/model/nosql/EventEntity.java index fc22a8dbe7..abfcfeffb0 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/EventEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/EventEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.model; +package org.thingsboard.server.dao.model.nosql; import com.datastax.driver.core.utils.UUIDs; import com.datastax.driver.mapping.annotations.*; @@ -23,48 +23,48 @@ 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.dao.model.BaseEntity; +import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.type.EntityTypeCodec; import org.thingsboard.server.dao.model.type.JsonCodec; import java.util.UUID; -import static org.thingsboard.server.dao.model.ModelConstants.*; - /** * @author Andrew Shvayka */ @Data @NoArgsConstructor -@Table(name = DEVICE_COLUMN_FAMILY_NAME) +@Table(name = ModelConstants.DEVICE_COLUMN_FAMILY_NAME) public class EventEntity implements BaseEntity { @Transient private static final long serialVersionUID = -1265181166886910153L; - @Column(name = ID_PROPERTY) + @Column(name = ModelConstants.ID_PROPERTY) private UUID id; @PartitionKey() - @Column(name = EVENT_TENANT_ID_PROPERTY) + @Column(name = ModelConstants.EVENT_TENANT_ID_PROPERTY) private UUID tenantId; @PartitionKey(value = 1) - @Column(name = EVENT_ENTITY_TYPE_PROPERTY, codec = EntityTypeCodec.class) + @Column(name = ModelConstants.EVENT_ENTITY_TYPE_PROPERTY, codec = EntityTypeCodec.class) private EntityType entityType; @PartitionKey(value = 2) - @Column(name = EVENT_ENTITY_ID_PROPERTY) + @Column(name = ModelConstants.EVENT_ENTITY_ID_PROPERTY) private UUID entityId; @ClusteringColumn() - @Column(name = EVENT_TYPE_PROPERTY) + @Column(name = ModelConstants.EVENT_TYPE_PROPERTY) private String eventType; @ClusteringColumn(value = 1) - @Column(name = EVENT_UID_PROPERTY) + @Column(name = ModelConstants.EVENT_UID_PROPERTY) private String eventUId; - @Column(name = EVENT_BODY_PROPERTY, codec = JsonCodec.class) + @Column(name = ModelConstants.EVENT_BODY_PROPERTY, codec = JsonCodec.class) private JsonNode body; public EventEntity(Event event) { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/PluginMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/PluginMetaDataEntity.java similarity index 91% rename from dao/src/main/java/org/thingsboard/server/dao/model/PluginMetaDataEntity.java rename to dao/src/main/java/org/thingsboard/server/dao/model/nosql/PluginMetaDataEntity.java index 179edc4078..caddacb340 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/PluginMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/PluginMetaDataEntity.java @@ -13,31 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.model; +package org.thingsboard.server.dao.model.nosql; import com.datastax.driver.core.utils.UUIDs; -import com.datastax.driver.mapping.annotations.ClusteringColumn; -import com.datastax.driver.mapping.annotations.Column; -import com.datastax.driver.mapping.annotations.PartitionKey; -import com.datastax.driver.mapping.annotations.Table; +import com.datastax.driver.mapping.annotations.*; import com.fasterxml.jackson.databind.JsonNode; import org.thingsboard.server.common.data.id.PluginId; import org.thingsboard.server.common.data.id.TenantId; 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.model.type.ComponentLifecycleStateCodec; import org.thingsboard.server.dao.model.type.JsonCodec; import java.util.Objects; import java.util.UUID; -import static org.thingsboard.server.dao.model.ModelConstants.ADDITIONAL_INFO_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.RULE_ACTION; - @Table(name = ModelConstants.PLUGIN_COLUMN_FAMILY_NAME) public class PluginMetaDataEntity implements SearchTextEntity { - private static final long serialVersionUID = 1L; + @Transient + private static final long serialVersionUID = -5231612734979707866L; @PartitionKey @Column(name = ModelConstants.ID_PROPERTY) @@ -68,7 +65,7 @@ public class PluginMetaDataEntity implements SearchTextEntity { @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) private String searchText; - @Column(name = ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) + @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) private JsonNode additionalInfo; public PluginMetaDataEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/RuleMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleMetaDataEntity.java similarity index 86% rename from dao/src/main/java/org/thingsboard/server/dao/model/RuleMetaDataEntity.java rename to dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleMetaDataEntity.java index 419e7fd6ed..29d32fdb30 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/RuleMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleMetaDataEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.model; +package org.thingsboard.server.dao.model.nosql; import com.datastax.driver.core.utils.UUIDs; import com.datastax.driver.mapping.annotations.ClusteringColumn; @@ -26,40 +26,43 @@ import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.plugin.ComponentLifecycleState; 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.model.type.ComponentLifecycleStateCodec; import org.thingsboard.server.dao.model.type.JsonCodec; +import javax.persistence.Transient; import java.util.Objects; import java.util.UUID; -import static org.thingsboard.server.dao.model.ModelConstants.*; - -@Table(name = RULE_COLUMN_FAMILY_NAME) +@Table(name = ModelConstants.RULE_COLUMN_FAMILY_NAME) public class RuleMetaDataEntity implements SearchTextEntity { + @Transient + private static final long serialVersionUID = 4011728715100800304L; @PartitionKey - @Column(name = ID_PROPERTY) + @Column(name = ModelConstants.ID_PROPERTY) private UUID id; @ClusteringColumn - @Column(name = RULE_TENANT_ID_PROPERTY) + @Column(name = ModelConstants.RULE_TENANT_ID_PROPERTY) private UUID tenantId; - @Column(name = RULE_NAME_PROPERTY) + @Column(name = ModelConstants.RULE_NAME_PROPERTY) private String name; @Column(name = ModelConstants.RULE_STATE_PROPERTY, codec = ComponentLifecycleStateCodec.class) private ComponentLifecycleState state; - @Column(name = RULE_WEIGHT_PROPERTY) + @Column(name = ModelConstants.RULE_WEIGHT_PROPERTY) private int weight; - @Column(name = SEARCH_TEXT_PROPERTY) + @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) private String searchText; - @Column(name = RULE_PLUGIN_TOKEN_PROPERTY) + @Column(name = ModelConstants.RULE_PLUGIN_TOKEN_PROPERTY) private String pluginToken; - @Column(name = RULE_FILTERS, codec = JsonCodec.class) + @Column(name = ModelConstants.RULE_FILTERS, codec = JsonCodec.class) private JsonNode filters; - @Column(name = RULE_PROCESSOR, codec = JsonCodec.class) + @Column(name = ModelConstants.RULE_PROCESSOR, codec = JsonCodec.class) private JsonNode processor; - @Column(name = RULE_ACTION, codec = JsonCodec.class) + @Column(name = ModelConstants.RULE_ACTION, codec = JsonCodec.class) private JsonNode action; - @Column(name = ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) + @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) private JsonNode additionalInfo; public RuleMetaDataEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/TenantEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/TenantEntity.java similarity index 84% rename from dao/src/main/java/org/thingsboard/server/dao/model/TenantEntity.java rename to dao/src/main/java/org/thingsboard/server/dao/model/nosql/TenantEntity.java index d9d57c8732..a6e3ae6efb 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/TenantEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/TenantEntity.java @@ -13,27 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.model; - -import static org.thingsboard.server.dao.model.ModelConstants.ADDRESS2_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.ADDRESS_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.CITY_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.COUNTRY_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.EMAIL_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.ID_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.PHONE_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.STATE_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.TENANT_ADDITIONAL_INFO_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.TENANT_COLUMN_FAMILY_NAME; -import static org.thingsboard.server.dao.model.ModelConstants.TENANT_REGION_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.TENANT_TITLE_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.ZIP_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.SEARCH_TEXT_PROPERTY; +package org.thingsboard.server.dao.model.nosql; import java.util.UUID; 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.model.type.JsonCodec; import com.datastax.driver.core.utils.UUIDs; @@ -43,50 +30,50 @@ import com.datastax.driver.mapping.annotations.Table; import com.datastax.driver.mapping.annotations.Transient; import com.fasterxml.jackson.databind.JsonNode; -@Table(name = TENANT_COLUMN_FAMILY_NAME) +@Table(name = ModelConstants.TENANT_COLUMN_FAMILY_NAME) public final class TenantEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = -6198635547142409206L; @PartitionKey(value = 0) - @Column(name = ID_PROPERTY) + @Column(name = ModelConstants.ID_PROPERTY) private UUID id; - @Column(name = TENANT_TITLE_PROPERTY) + @Column(name = ModelConstants.TENANT_TITLE_PROPERTY) private String title; - @Column(name = SEARCH_TEXT_PROPERTY) + @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) private String searchText; - @Column(name = TENANT_REGION_PROPERTY) + @Column(name = ModelConstants.TENANT_REGION_PROPERTY) private String region; - @Column(name = COUNTRY_PROPERTY) + @Column(name = ModelConstants.COUNTRY_PROPERTY) private String country; - @Column(name = STATE_PROPERTY) + @Column(name = ModelConstants.STATE_PROPERTY) private String state; - @Column(name = CITY_PROPERTY) + @Column(name = ModelConstants.CITY_PROPERTY) private String city; - @Column(name = ADDRESS_PROPERTY) + @Column(name = ModelConstants.ADDRESS_PROPERTY) private String address; - @Column(name = ADDRESS2_PROPERTY) + @Column(name = ModelConstants.ADDRESS2_PROPERTY) private String address2; - @Column(name = ZIP_PROPERTY) + @Column(name = ModelConstants.ZIP_PROPERTY) private String zip; - @Column(name = PHONE_PROPERTY) + @Column(name = ModelConstants.PHONE_PROPERTY) private String phone; - @Column(name = EMAIL_PROPERTY) + @Column(name = ModelConstants.EMAIL_PROPERTY) private String email; - @Column(name = TENANT_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) + @Column(name = ModelConstants.TENANT_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) private JsonNode additionalInfo; public TenantEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/UserCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/UserCredentialsEntity.java similarity index 83% rename from dao/src/main/java/org/thingsboard/server/dao/model/UserCredentialsEntity.java rename to dao/src/main/java/org/thingsboard/server/dao/model/nosql/UserCredentialsEntity.java index c512441d58..d571d0fd22 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/UserCredentialsEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/UserCredentialsEntity.java @@ -13,15 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.model; - -import static org.thingsboard.server.dao.model.ModelConstants.ID_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.USER_CREDENTIALS_ACTIVATE_TOKEN_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.USER_CREDENTIALS_COLUMN_FAMILY_NAME; -import static org.thingsboard.server.dao.model.ModelConstants.USER_CREDENTIALS_PASSWORD_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.USER_CREDENTIALS_USER_ID_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.USER_CREDENTIALS_ENABLED_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.USER_CREDENTIALS_RESET_TOKEN_PROPERTY; +package org.thingsboard.server.dao.model.nosql; import java.util.UUID; @@ -34,30 +26,32 @@ import com.datastax.driver.mapping.annotations.Column; import com.datastax.driver.mapping.annotations.PartitionKey; import com.datastax.driver.mapping.annotations.Table; import com.datastax.driver.mapping.annotations.Transient; +import org.thingsboard.server.dao.model.BaseEntity; +import org.thingsboard.server.dao.model.ModelConstants; -@Table(name = USER_CREDENTIALS_COLUMN_FAMILY_NAME) +@Table(name = ModelConstants.USER_CREDENTIALS_COLUMN_FAMILY_NAME) public final class UserCredentialsEntity implements BaseEntity { @Transient private static final long serialVersionUID = 1348221414123438374L; @PartitionKey(value = 0) - @Column(name = ID_PROPERTY) + @Column(name = ModelConstants.ID_PROPERTY) private UUID id; - @Column(name = USER_CREDENTIALS_USER_ID_PROPERTY) + @Column(name = ModelConstants.USER_CREDENTIALS_USER_ID_PROPERTY) private UUID userId; - @Column(name = USER_CREDENTIALS_ENABLED_PROPERTY) + @Column(name = ModelConstants.USER_CREDENTIALS_ENABLED_PROPERTY) private boolean enabled; - @Column(name = USER_CREDENTIALS_PASSWORD_PROPERTY) + @Column(name = ModelConstants.USER_CREDENTIALS_PASSWORD_PROPERTY) private String password; - @Column(name = USER_CREDENTIALS_ACTIVATE_TOKEN_PROPERTY) + @Column(name = ModelConstants.USER_CREDENTIALS_ACTIVATE_TOKEN_PROPERTY) private String activateToken; - @Column(name = USER_CREDENTIALS_RESET_TOKEN_PROPERTY) + @Column(name = ModelConstants.USER_CREDENTIALS_RESET_TOKEN_PROPERTY) private String resetToken; public UserCredentialsEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/UserEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/UserEntity.java similarity index 84% rename from dao/src/main/java/org/thingsboard/server/dao/model/UserEntity.java rename to dao/src/main/java/org/thingsboard/server/dao/model/nosql/UserEntity.java index 5450c00868..91b9f3cd57 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/UserEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/UserEntity.java @@ -13,18 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.model; - -import static org.thingsboard.server.dao.model.ModelConstants.ID_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.SEARCH_TEXT_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.USER_ADDITIONAL_INFO_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.USER_AUTHORITY_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.USER_COLUMN_FAMILY_NAME; -import static org.thingsboard.server.dao.model.ModelConstants.USER_CUSTOMER_ID_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.USER_EMAIL_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.USER_FIRST_NAME_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.USER_LAST_NAME_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.USER_TENANT_ID_PROPERTY; +package org.thingsboard.server.dao.model.nosql; import java.util.UUID; @@ -33,6 +22,8 @@ import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.TenantId; 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.model.type.AuthorityCodec; import org.thingsboard.server.dao.model.type.JsonCodec; @@ -43,41 +34,41 @@ import com.datastax.driver.mapping.annotations.Table; import com.datastax.driver.mapping.annotations.Transient; import com.fasterxml.jackson.databind.JsonNode; -@Table(name = USER_COLUMN_FAMILY_NAME) +@Table(name = ModelConstants.USER_COLUMN_FAMILY_NAME) public final class UserEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = -7740338274987723489L; @PartitionKey(value = 0) - @Column(name = ID_PROPERTY) + @Column(name = ModelConstants.ID_PROPERTY) private UUID id; @PartitionKey(value = 1) - @Column(name = USER_TENANT_ID_PROPERTY) + @Column(name = ModelConstants.USER_TENANT_ID_PROPERTY) private UUID tenantId; @PartitionKey(value = 2) - @Column(name = USER_CUSTOMER_ID_PROPERTY) + @Column(name = ModelConstants.USER_CUSTOMER_ID_PROPERTY) private UUID customerId; @PartitionKey(value = 3) - @Column(name = USER_AUTHORITY_PROPERTY, codec = AuthorityCodec.class) + @Column(name = ModelConstants.USER_AUTHORITY_PROPERTY, codec = AuthorityCodec.class) private Authority authority; - @Column(name = USER_EMAIL_PROPERTY) + @Column(name = ModelConstants.USER_EMAIL_PROPERTY) private String email; - @Column(name = SEARCH_TEXT_PROPERTY) + @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) private String searchText; - @Column(name = USER_FIRST_NAME_PROPERTY) + @Column(name = ModelConstants.USER_FIRST_NAME_PROPERTY) private String firstName; - @Column(name = USER_LAST_NAME_PROPERTY) + @Column(name = ModelConstants.USER_LAST_NAME_PROPERTY) private String lastName; - @Column(name = USER_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) + @Column(name = ModelConstants.USER_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) private JsonNode additionalInfo; public UserEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/WidgetTypeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/WidgetTypeEntity.java similarity index 97% rename from dao/src/main/java/org/thingsboard/server/dao/model/WidgetTypeEntity.java rename to dao/src/main/java/org/thingsboard/server/dao/model/nosql/WidgetTypeEntity.java index 0054421584..4fd60f3889 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/WidgetTypeEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/WidgetTypeEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.model; +package org.thingsboard.server.dao.model.nosql; import com.datastax.driver.core.utils.UUIDs; import com.datastax.driver.mapping.annotations.Column; @@ -24,6 +24,8 @@ import com.fasterxml.jackson.databind.JsonNode; import org.thingsboard.server.common.data.id.TenantId; 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.model.type.JsonCodec; import java.util.UUID; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/WidgetsBundleEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/WidgetsBundleEntity.java similarity index 97% rename from dao/src/main/java/org/thingsboard/server/dao/model/WidgetsBundleEntity.java rename to dao/src/main/java/org/thingsboard/server/dao/model/nosql/WidgetsBundleEntity.java index 449a1a9ed2..889f1d6c3d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/WidgetsBundleEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/WidgetsBundleEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.model; +package org.thingsboard.server.dao.model.nosql; import com.datastax.driver.core.utils.UUIDs; @@ -24,6 +24,8 @@ import com.datastax.driver.mapping.annotations.Transient; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.WidgetsBundleId; import org.thingsboard.server.common.data.widget.WidgetsBundle; +import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.model.SearchTextEntity; import java.nio.ByteBuffer; import java.util.UUID; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java new file mode 100644 index 0000000000..40580ee1f4 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java @@ -0,0 +1,145 @@ +/** + * 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.model.sql; + +import com.datastax.driver.core.utils.UUIDs; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import com.fasterxml.jackson.databind.JsonNode; +import org.thingsboard.server.common.data.AdminSettings; +import org.thingsboard.server.common.data.id.AdminSettingsId; +import org.thingsboard.server.dao.model.BaseEntity; + +import java.util.UUID; + +import static org.thingsboard.server.dao.model.ModelConstants.*; + +@Entity +@Table(name = ADMIN_SETTINGS_COLUMN_FAMILY_NAME) +public final class AdminSettingsEntity implements BaseEntity { + + @Transient + private static final long serialVersionUID = 842759712850362147L; + + @Id + @Column(name = ID_PROPERTY) + private UUID id; + + @Column(name = ADMIN_SETTINGS_KEY_PROPERTY) + private String key; + + @Column(name = ADMIN_SETTINGS_JSON_VALUE_PROPERTY) + private JsonNode jsonValue; + + public AdminSettingsEntity() { + super(); + } + + public AdminSettingsEntity(AdminSettings adminSettings) { + if (adminSettings.getId() != null) { + this.id = adminSettings.getId().getId(); + } + this.key = adminSettings.getKey(); + this.jsonValue = adminSettings.getJsonValue(); + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public JsonNode getJsonValue() { + return jsonValue; + } + + public void setJsonValue(JsonNode jsonValue) { + this.jsonValue = jsonValue; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + ((jsonValue == null) ? 0 : jsonValue.hashCode()); + result = prime * result + ((key == null) ? 0 : key.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + AdminSettingsEntity other = (AdminSettingsEntity) obj; + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) + return false; + if (jsonValue == null) { + if (other.jsonValue != null) + return false; + } else if (!jsonValue.equals(other.jsonValue)) + return false; + if (key == null) { + if (other.key != null) + return false; + } else if (!key.equals(other.key)) + return false; + return true; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("AdminSettingsEntity [id="); + builder.append(id); + builder.append(", key="); + builder.append(key); + builder.append(", jsonValue="); + builder.append(jsonValue); + builder.append("]"); + return builder.toString(); + } + + @Override + public AdminSettings toData() { + AdminSettings adminSettings = new AdminSettings(new AdminSettingsId(id)); + adminSettings.setCreatedTime(UUIDs.unixTimestamp(id)); + adminSettings.setKey(key); + adminSettings.setJsonValue(jsonValue); + return adminSettings; + } + +} \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java new file mode 100644 index 0000000000..53bac762c2 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java @@ -0,0 +1,164 @@ +/** + * 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.model.sql; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import com.fasterxml.jackson.databind.JsonNode; +import org.thingsboard.server.common.data.id.ComponentDescriptorId; +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.model.ModelConstants; +import org.thingsboard.server.dao.model.SearchTextEntity; + +import java.util.UUID; + +@Entity +@Table(name = ModelConstants.COMPONENT_DESCRIPTOR_COLUMN_FAMILY_NAME) +public class ComponentDescriptorEntity implements SearchTextEntity { + + @Transient + private static final long serialVersionUID = 253590350877992402L; + + @Id + @Column(name = ModelConstants.ID_PROPERTY) + private UUID id; + + @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_TYPE_PROPERTY) + private ComponentType type; + + @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_SCOPE_PROPERTY) + private ComponentScope scope; + + @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_NAME_PROPERTY) + private String name; + + @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_CLASS_PROPERTY) + private String clazz; + + @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_CONFIGURATION_DESCRIPTOR_PROPERTY) + private JsonNode configurationDescriptor; + + @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_ACTIONS_PROPERTY) + private String actions; + + @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + private String searchText; + + public ComponentDescriptorEntity() { + } + + public ComponentDescriptorEntity(ComponentDescriptor component) { + if (component.getId() != null) { + this.id = component.getId().getId(); + } + this.actions = component.getActions(); + this.type = component.getType(); + this.scope = component.getScope(); + this.name = component.getName(); + this.clazz = component.getClazz(); + this.configurationDescriptor = component.getConfigurationDescriptor(); + this.searchText = component.getName(); + } + + @Override + public ComponentDescriptor toData() { + ComponentDescriptor data = new ComponentDescriptor(new ComponentDescriptorId(id)); + data.setType(type); + data.setScope(scope); + data.setName(this.getName()); + data.setClazz(this.getClazz()); + data.setActions(this.getActions()); + data.setConfigurationDescriptor(this.getConfigurationDescriptor()); + return data; + } + + @Override + public UUID getId() { + return id; + } + + @Override + public void setId(UUID id) { + this.id = id; + } + + public String getActions() { + return actions; + } + + public void setActions(String actions) { + this.actions = actions; + } + + public ComponentType getType() { + return type; + } + + public void setType(ComponentType type) { + this.type = type; + } + + public ComponentScope getScope() { + return scope; + } + + public void setScope(ComponentScope scope) { + this.scope = scope; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getClazz() { + return clazz; + } + + public void setClazz(String clazz) { + this.clazz = clazz; + } + + public JsonNode getConfigurationDescriptor() { + return configurationDescriptor; + } + + public void setConfigurationDescriptor(JsonNode configurationDescriptor) { + this.configurationDescriptor = configurationDescriptor; + } + + public String getSearchText() { + return searchText; + } + + @Override + public void setSearchText(String searchText) { + this.searchText = searchText; + } + + @Override + public String getSearchTextSource() { + return searchText; + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java new file mode 100644 index 0000000000..bf7404f50e --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java @@ -0,0 +1,351 @@ +/** + * 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.model.sql; + +import com.datastax.driver.core.utils.UUIDs; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import com.fasterxml.jackson.databind.JsonNode; +import org.thingsboard.server.common.data.Customer; +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 java.util.UUID; + +@Entity +@Table(name = ModelConstants.CUSTOMER_COLUMN_FAMILY_NAME) +public final class CustomerEntity implements SearchTextEntity { + + @Transient + private static final long serialVersionUID = 8951342124082981556L; + + @Id + @Column(name = ModelConstants.ID_PROPERTY) + private UUID id; + + @Column(name = ModelConstants.CUSTOMER_TENANT_ID_PROPERTY) + private UUID tenantId; + + @Column(name = ModelConstants.CUSTOMER_TITLE_PROPERTY) + private String title; + + @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + private String searchText; + + @Column(name = ModelConstants.COUNTRY_PROPERTY) + private String country; + + @Column(name = ModelConstants.STATE_PROPERTY) + private String state; + + @Column(name = ModelConstants.CITY_PROPERTY) + private String city; + + @Column(name = ModelConstants.ADDRESS_PROPERTY) + private String address; + + @Column(name = ModelConstants.ADDRESS2_PROPERTY) + private String address2; + + @Column(name = ModelConstants.ZIP_PROPERTY) + private String zip; + + @Column(name = ModelConstants.PHONE_PROPERTY) + private String phone; + + @Column(name = ModelConstants.EMAIL_PROPERTY) + private String email; + + @Column(name = ModelConstants.CUSTOMER_ADDITIONAL_INFO_PROPERTY) + private JsonNode additionalInfo; + + public CustomerEntity() { + super(); + } + + public CustomerEntity(Customer customer) { + if (customer.getId() != null) { + this.id = customer.getId().getId(); + } + this.tenantId = customer.getTenantId().getId(); + this.title = customer.getTitle(); + this.country = customer.getCountry(); + this.state = customer.getState(); + this.city = customer.getCity(); + this.address = customer.getAddress(); + this.address2 = customer.getAddress2(); + this.zip = customer.getZip(); + this.phone = customer.getPhone(); + this.email = customer.getEmail(); + this.additionalInfo = customer.getAdditionalInfo(); + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public UUID getTenantId() { + return tenantId; + } + + public void setTenantId(UUID tenantId) { + this.tenantId = tenantId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getAddress2() { + return address2; + } + + public void setAddress2(String address2) { + this.address2 = address2; + } + + public String getZip() { + return zip; + } + + public void setZip(String zip) { + this.zip = zip; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public JsonNode getAdditionalInfo() { + return additionalInfo; + } + + public void setAdditionalInfo(JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + @Override + public String getSearchTextSource() { + return title; + } + + @Override + public void setSearchText(String searchText) { + this.searchText = searchText; + } + + public String getSearchText() { + return searchText; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((additionalInfo == null) ? 0 : additionalInfo.hashCode()); + result = prime * result + ((address == null) ? 0 : address.hashCode()); + result = prime * result + ((address2 == null) ? 0 : address2.hashCode()); + result = prime * result + ((city == null) ? 0 : city.hashCode()); + result = prime * result + ((country == null) ? 0 : country.hashCode()); + result = prime * result + ((email == null) ? 0 : email.hashCode()); + result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + ((phone == null) ? 0 : phone.hashCode()); + result = prime * result + ((state == null) ? 0 : state.hashCode()); + result = prime * result + ((tenantId == null) ? 0 : tenantId.hashCode()); + result = prime * result + ((title == null) ? 0 : title.hashCode()); + result = prime * result + ((zip == null) ? 0 : zip.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + CustomerEntity other = (CustomerEntity) obj; + if (additionalInfo == null) { + if (other.additionalInfo != null) + return false; + } else if (!additionalInfo.equals(other.additionalInfo)) + return false; + if (address == null) { + if (other.address != null) + return false; + } else if (!address.equals(other.address)) + return false; + if (address2 == null) { + if (other.address2 != null) + return false; + } else if (!address2.equals(other.address2)) + return false; + if (city == null) { + if (other.city != null) + return false; + } else if (!city.equals(other.city)) + return false; + if (country == null) { + if (other.country != null) + return false; + } else if (!country.equals(other.country)) + return false; + if (email == null) { + if (other.email != null) + return false; + } else if (!email.equals(other.email)) + return false; + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) + return false; + if (phone == null) { + if (other.phone != null) + return false; + } else if (!phone.equals(other.phone)) + return false; + if (state == null) { + if (other.state != null) + return false; + } else if (!state.equals(other.state)) + return false; + if (tenantId == null) { + if (other.tenantId != null) + return false; + } else if (!tenantId.equals(other.tenantId)) + return false; + if (title == null) { + if (other.title != null) + return false; + } else if (!title.equals(other.title)) + return false; + if (zip == null) { + if (other.zip != null) + return false; + } else if (!zip.equals(other.zip)) + return false; + return true; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("CustomerEntity [id="); + builder.append(id); + builder.append(", tenantId="); + builder.append(tenantId); + builder.append(", title="); + builder.append(title); + builder.append(", country="); + builder.append(country); + builder.append(", state="); + builder.append(state); + builder.append(", city="); + builder.append(city); + builder.append(", address="); + builder.append(address); + builder.append(", address2="); + builder.append(address2); + builder.append(", zip="); + builder.append(zip); + builder.append(", phone="); + builder.append(phone); + builder.append(", email="); + builder.append(email); + builder.append(", additionalInfo="); + builder.append(additionalInfo); + builder.append("]"); + return builder.toString(); + } + + @Override + public Customer toData() { + Customer customer = new Customer(new CustomerId(id)); + customer.setCreatedTime(UUIDs.unixTimestamp(id)); + customer.setTenantId(new TenantId(tenantId)); + customer.setTitle(title); + customer.setCountry(country); + customer.setState(state); + customer.setCity(city); + customer.setAddress(address); + customer.setAddress2(address2); + customer.setZip(zip); + customer.setPhone(phone); + customer.setEmail(email); + customer.setAdditionalInfo(additionalInfo); + return customer; + } + +} \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java new file mode 100644 index 0000000000..12a12c1403 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java @@ -0,0 +1,221 @@ +/** + * 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.model.sql; + +import com.datastax.driver.core.utils.UUIDs; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import com.fasterxml.jackson.databind.JsonNode; +import org.thingsboard.server.common.data.Dashboard; +import org.thingsboard.server.common.data.id.CustomerId; +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 java.util.UUID; + +@Entity +@Table(name = ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME) +public final class DashboardEntity implements SearchTextEntity { + + @Transient + private static final long serialVersionUID = -4838084363113078898L; + + @Id + @Column(name = ModelConstants.ID_PROPERTY) + private UUID id; + + @Column(name = ModelConstants.DASHBOARD_TENANT_ID_PROPERTY) + private UUID tenantId; + + @Column(name = ModelConstants.DASHBOARD_CUSTOMER_ID_PROPERTY) + private UUID customerId; + + @Column(name = ModelConstants.DASHBOARD_TITLE_PROPERTY) + private String title; + + @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + private String searchText; + + @Column(name = ModelConstants.DASHBOARD_CONFIGURATION_PROPERTY) + private JsonNode configuration; + + public DashboardEntity() { + super(); + } + + public DashboardEntity(Dashboard dashboard) { + if (dashboard.getId() != null) { + this.id = dashboard.getId().getId(); + } + if (dashboard.getTenantId() != null) { + this.tenantId = dashboard.getTenantId().getId(); + } + if (dashboard.getCustomerId() != null) { + this.customerId = dashboard.getCustomerId().getId(); + } + this.title = dashboard.getTitle(); + this.configuration = dashboard.getConfiguration(); + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public UUID getTenantId() { + return tenantId; + } + + public void setTenantId(UUID tenantId) { + this.tenantId = tenantId; + } + + public UUID getCustomerId() { + return customerId; + } + + public void setCustomerId(UUID customerId) { + this.customerId = customerId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public JsonNode getConfiguration() { + return configuration; + } + + public void setConfiguration(JsonNode configuration) { + this.configuration = configuration; + } + + @Override + public String getSearchTextSource() { + return title; + } + + @Override + public void setSearchText(String searchText) { + this.searchText = searchText; + } + + public String getSearchText() { + return searchText; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((configuration == null) ? 0 : configuration.hashCode()); + result = prime * result + ((customerId == null) ? 0 : customerId.hashCode()); + result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + ((searchText == null) ? 0 : searchText.hashCode()); + result = prime * result + ((tenantId == null) ? 0 : tenantId.hashCode()); + result = prime * result + ((title == null) ? 0 : title.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + DashboardEntity other = (DashboardEntity) obj; + if (configuration == null) { + if (other.configuration != null) + return false; + } else if (!configuration.equals(other.configuration)) + return false; + if (customerId == null) { + if (other.customerId != null) + return false; + } else if (!customerId.equals(other.customerId)) + return false; + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) + return false; + if (searchText == null) { + if (other.searchText != null) + return false; + } else if (!searchText.equals(other.searchText)) + return false; + if (tenantId == null) { + if (other.tenantId != null) + return false; + } else if (!tenantId.equals(other.tenantId)) + return false; + if (title == null) { + if (other.title != null) + return false; + } else if (!title.equals(other.title)) + return false; + return true; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("DashboardEntity [id="); + builder.append(id); + builder.append(", tenantId="); + builder.append(tenantId); + builder.append(", customerId="); + builder.append(customerId); + builder.append(", title="); + builder.append(title); + builder.append(", searchText="); + builder.append(searchText); + builder.append(", configuration="); + builder.append(configuration); + builder.append("]"); + return builder.toString(); + } + + @Override + public Dashboard toData() { + Dashboard dashboard = new Dashboard(new DashboardId(id)); + dashboard.setCreatedTime(UUIDs.unixTimestamp(id)); + if (tenantId != null) { + dashboard.setTenantId(new TenantId(tenantId)); + } + if (customerId != null) { + dashboard.setCustomerId(new CustomerId(customerId)); + } + dashboard.setTitle(title); + dashboard.setConfiguration(configuration); + return dashboard; + } + +} \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java new file mode 100644 index 0000000000..5fb052b55b --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java @@ -0,0 +1,199 @@ +/** + * 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.model.sql; + +import com.datastax.driver.core.utils.UUIDs; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import org.thingsboard.server.common.data.DashboardInfo; +import org.thingsboard.server.common.data.id.CustomerId; +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 java.util.UUID; + +@Entity +@Table(name = ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME) +public class DashboardInfoEntity implements SearchTextEntity { + + @Transient + private static final long serialVersionUID = -5525675905528050250L; + + @Id + @Column(name = ModelConstants.ID_PROPERTY) + private UUID id; + + @Column(name = ModelConstants.DASHBOARD_TENANT_ID_PROPERTY) + private UUID tenantId; + + @Column(name = ModelConstants.DASHBOARD_CUSTOMER_ID_PROPERTY) + private UUID customerId; + + @Column(name = ModelConstants.DASHBOARD_TITLE_PROPERTY) + private String title; + + @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + private String searchText; + + public DashboardInfoEntity() { + super(); + } + + public DashboardInfoEntity(DashboardInfo dashboardInfo) { + if (dashboardInfo.getId() != null) { + this.id = dashboardInfo.getId().getId(); + } + if (dashboardInfo.getTenantId() != null) { + this.tenantId = dashboardInfo.getTenantId().getId(); + } + if (dashboardInfo.getCustomerId() != null) { + this.customerId = dashboardInfo.getCustomerId().getId(); + } + this.title = dashboardInfo.getTitle(); + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public UUID getTenantId() { + return tenantId; + } + + public void setTenantId(UUID tenantId) { + this.tenantId = tenantId; + } + + public UUID getCustomerId() { + return customerId; + } + + public void setCustomerId(UUID customerId) { + this.customerId = customerId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + @Override + public String getSearchTextSource() { + return title; + } + + @Override + public void setSearchText(String searchText) { + this.searchText = searchText; + } + + public String getSearchText() { + return searchText; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((customerId == null) ? 0 : customerId.hashCode()); + result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + ((searchText == null) ? 0 : searchText.hashCode()); + result = prime * result + ((tenantId == null) ? 0 : tenantId.hashCode()); + result = prime * result + ((title == null) ? 0 : title.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + DashboardInfoEntity other = (DashboardInfoEntity) obj; + if (customerId == null) { + if (other.customerId != null) + return false; + } else if (!customerId.equals(other.customerId)) + return false; + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) + return false; + if (searchText == null) { + if (other.searchText != null) + return false; + } else if (!searchText.equals(other.searchText)) + return false; + if (tenantId == null) { + if (other.tenantId != null) + return false; + } else if (!tenantId.equals(other.tenantId)) + return false; + if (title == null) { + if (other.title != null) + return false; + } else if (!title.equals(other.title)) + return false; + return true; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("DashboardInfoEntity [id="); + builder.append(id); + builder.append(", tenantId="); + builder.append(tenantId); + builder.append(", customerId="); + builder.append(customerId); + builder.append(", title="); + builder.append(title); + builder.append(", searchText="); + builder.append(searchText); + builder.append("]"); + return builder.toString(); + } + + @Override + public DashboardInfo toData() { + DashboardInfo dashboardInfo = new DashboardInfo(new DashboardId(id)); + dashboardInfo.setCreatedTime(UUIDs.unixTimestamp(id)); + if (tenantId != null) { + dashboardInfo.setTenantId(new TenantId(tenantId)); + } + if (customerId != null) { + dashboardInfo.setCustomerId(new CustomerId(customerId)); + } + dashboardInfo.setTitle(title); + return dashboardInfo; + } + +} \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java new file mode 100644 index 0000000000..de4399463d --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java @@ -0,0 +1,187 @@ +/** + * 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.model.sql; + +import com.datastax.driver.core.utils.UUIDs; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import org.thingsboard.server.common.data.id.DeviceCredentialsId; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.security.DeviceCredentials; +import org.thingsboard.server.common.data.security.DeviceCredentialsType; +import org.thingsboard.server.dao.model.BaseEntity; +import org.thingsboard.server.dao.model.ModelConstants; + +import java.util.UUID; + +@Entity +@Table(name = ModelConstants.DEVICE_CREDENTIALS_COLUMN_FAMILY_NAME) +public final class DeviceCredentialsEntity implements BaseEntity { + + @Transient + private static final long serialVersionUID = -2512362753385470464L; + @Id + @Column(name = ModelConstants.ID_PROPERTY) + private UUID id; + + @Column(name = ModelConstants.DEVICE_CREDENTIALS_DEVICE_ID_PROPERTY) + private UUID deviceId; + + @Column(name = ModelConstants.DEVICE_CREDENTIALS_CREDENTIALS_TYPE_PROPERTY) + private DeviceCredentialsType credentialsType; + + @Column(name = ModelConstants.DEVICE_CREDENTIALS_CREDENTIALS_ID_PROPERTY) + private String credentialsId; + + @Column(name = ModelConstants.DEVICE_CREDENTIALS_CREDENTIALS_VALUE_PROPERTY) + private String credentialsValue; + + public DeviceCredentialsEntity() { + super(); + } + + public DeviceCredentialsEntity(DeviceCredentials deviceCredentials) { + if (deviceCredentials.getId() != null) { + this.id = deviceCredentials.getId().getId(); + } + if (deviceCredentials.getDeviceId() != null) { + this.deviceId = deviceCredentials.getDeviceId().getId(); + } + this.credentialsType = deviceCredentials.getCredentialsType(); + this.credentialsId = deviceCredentials.getCredentialsId(); + this.credentialsValue = deviceCredentials.getCredentialsValue(); + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public UUID getDeviceId() { + return deviceId; + } + + public void setDeviceId(UUID deviceId) { + this.deviceId = deviceId; + } + + public DeviceCredentialsType getCredentialsType() { + return credentialsType; + } + + public void setCredentialsType(DeviceCredentialsType credentialsType) { + this.credentialsType = credentialsType; + } + + public String getCredentialsId() { + return credentialsId; + } + + public void setCredentialsId(String credentialsId) { + this.credentialsId = credentialsId; + } + + public String getCredentialsValue() { + return credentialsValue; + } + + public void setCredentialsValue(String credentialsValue) { + this.credentialsValue = credentialsValue; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((credentialsId == null) ? 0 : credentialsId.hashCode()); + result = prime * result + ((credentialsType == null) ? 0 : credentialsType.hashCode()); + result = prime * result + ((credentialsValue == null) ? 0 : credentialsValue.hashCode()); + result = prime * result + ((deviceId == null) ? 0 : deviceId.hashCode()); + result = prime * result + ((id == null) ? 0 : id.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + DeviceCredentialsEntity other = (DeviceCredentialsEntity) obj; + if (credentialsId == null) { + if (other.credentialsId != null) + return false; + } else if (!credentialsId.equals(other.credentialsId)) + return false; + if (credentialsType != other.credentialsType) + return false; + if (credentialsValue == null) { + if (other.credentialsValue != null) + return false; + } else if (!credentialsValue.equals(other.credentialsValue)) + return false; + if (deviceId == null) { + if (other.deviceId != null) + return false; + } else if (!deviceId.equals(other.deviceId)) + return false; + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) + return false; + return true; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("DeviceCredentialsEntity [id="); + builder.append(id); + builder.append(", deviceId="); + builder.append(deviceId); + builder.append(", credentialsType="); + builder.append(credentialsType); + builder.append(", credentialsId="); + builder.append(credentialsId); + builder.append(", credentialsValue="); + builder.append(credentialsValue); + builder.append("]"); + return builder.toString(); + } + + @Override + public DeviceCredentials toData() { + DeviceCredentials deviceCredentials = new DeviceCredentials(new DeviceCredentialsId(id)); + deviceCredentials.setCreatedTime(UUIDs.unixTimestamp(id)); + if (deviceId != null) { + deviceCredentials.setDeviceId(new DeviceId(deviceId)); + } + deviceCredentials.setCredentialsType(credentialsType); + deviceCredentials.setCredentialsId(credentialsId); + deviceCredentials.setCredentialsValue(credentialsValue); + return deviceCredentials; + } + +} \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java new file mode 100644 index 0000000000..72c2dd5310 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java @@ -0,0 +1,213 @@ +/** + * 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.model.sql; + +import com.datastax.driver.core.utils.UUIDs; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import com.fasterxml.jackson.databind.JsonNode; +import org.thingsboard.server.common.data.Device; +import org.thingsboard.server.common.data.id.CustomerId; +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 java.util.UUID; + +@Entity +@Table(name = ModelConstants.DEVICE_COLUMN_FAMILY_NAME) +public final class DeviceEntity implements SearchTextEntity { + + @Transient + private static final long serialVersionUID = 8050086401213322856L; + + @Id + @Column(name = ModelConstants.ID_PROPERTY) + private UUID id; + + @Column(name = ModelConstants.DEVICE_TENANT_ID_PROPERTY) + private UUID tenantId; + + @Column(name = ModelConstants.DEVICE_CUSTOMER_ID_PROPERTY) + private UUID customerId; + + @Column(name = ModelConstants.DEVICE_NAME_PROPERTY) + private String name; + + @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + private String searchText; + + @Column(name = ModelConstants.DEVICE_ADDITIONAL_INFO_PROPERTY) + private JsonNode additionalInfo; + + public DeviceEntity() { + super(); + } + + public DeviceEntity(Device device) { + if (device.getId() != null) { + this.id = device.getId().getId(); + } + if (device.getTenantId() != null) { + this.tenantId = device.getTenantId().getId(); + } + if (device.getCustomerId() != null) { + this.customerId = device.getCustomerId().getId(); + } + this.name = device.getName(); + this.additionalInfo = device.getAdditionalInfo(); + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public UUID getTenantId() { + return tenantId; + } + + public void setTenantId(UUID tenantId) { + this.tenantId = tenantId; + } + + public UUID getCustomerId() { + return customerId; + } + + public void setCustomerId(UUID customerId) { + this.customerId = customerId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public JsonNode getAdditionalInfo() { + return additionalInfo; + } + + public void setAdditionalInfo(JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + @Override + public String getSearchTextSource() { + return name; + } + + @Override + public void setSearchText(String searchText) { + this.searchText = searchText; + } + + public String getSearchText() { + return searchText; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((additionalInfo == null) ? 0 : additionalInfo.hashCode()); + result = prime * result + ((customerId == null) ? 0 : customerId.hashCode()); + result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((tenantId == null) ? 0 : tenantId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + DeviceEntity other = (DeviceEntity) obj; + if (additionalInfo == null) { + if (other.additionalInfo != null) + return false; + } else if (!additionalInfo.equals(other.additionalInfo)) + return false; + if (customerId == null) { + if (other.customerId != null) + return false; + } else if (!customerId.equals(other.customerId)) + return false; + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) + return false; + if (name == null) { + if (other.name != null) + return false; + } else if (!name.equals(other.name)) + return false; + if (tenantId == null) { + if (other.tenantId != null) + return false; + } else if (!tenantId.equals(other.tenantId)) + return false; + return true; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("DeviceEntity [id="); + builder.append(id); + builder.append(", tenantId="); + builder.append(tenantId); + builder.append(", customerId="); + builder.append(customerId); + builder.append(", name="); + builder.append(name); + builder.append(", additionalInfo="); + builder.append(additionalInfo); + builder.append("]"); + return builder.toString(); + } + + @Override + public Device toData() { + Device device = new Device(new DeviceId(id)); + device.setCreatedTime(UUIDs.unixTimestamp(id)); + if (tenantId != null) { + device.setTenantId(new TenantId(tenantId)); + } + if (customerId != null) { + device.setCustomerId(new CustomerId(customerId)); + } + device.setName(name); + device.setAdditionalInfo(additionalInfo); + return device; + } + +} \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java new file mode 100644 index 0000000000..4618f42b13 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java @@ -0,0 +1,119 @@ +/** + * 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.model.sql; + +import com.datastax.driver.core.utils.UUIDs; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import com.fasterxml.jackson.databind.JsonNode; +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.dao.model.BaseEntity; +import org.thingsboard.server.dao.model.ModelConstants; + +import java.util.UUID; + +@Data +@NoArgsConstructor +@Entity +@Table(name = ModelConstants.DEVICE_COLUMN_FAMILY_NAME) +public class EventEntity implements BaseEntity { + + @Transient + private static final long serialVersionUID = -5717830061727466727L; + + @Column(name = ModelConstants.ID_PROPERTY) + private UUID id; + + @Id + @Column(name = ModelConstants.EVENT_TENANT_ID_PROPERTY) + private UUID tenantId; + + @Column(name = ModelConstants.EVENT_ENTITY_TYPE_PROPERTY) + private EntityType entityType; + + @Column(name = ModelConstants.EVENT_ENTITY_ID_PROPERTY) + private UUID entityId; + + @Column(name = ModelConstants.EVENT_TYPE_PROPERTY) + private String eventType; + + @Column(name = ModelConstants.EVENT_UID_PROPERTY) + private String eventUId; + + @Column(name = ModelConstants.EVENT_BODY_PROPERTY) + private JsonNode body; + + public EventEntity(Event event) { + if (event.getId() != null) { + this.id = event.getId().getId(); + } + if (event.getTenantId() != null) { + this.tenantId = event.getTenantId().getId(); + } + if (event.getEntityId() != null) { + this.entityType = event.getEntityId().getEntityType(); + this.entityId = event.getEntityId().getId(); + } + this.eventType = event.getType(); + this.eventUId = event.getUid(); + this.body = event.getBody(); + } + + @Override + public UUID getId() { + return id; + } + + @Override + public void setId(UUID id) { + this.id = id; + } + + @Override + public Event toData() { + Event event = new Event(new EventId(id)); + event.setCreatedTime(UUIDs.unixTimestamp(id)); + event.setTenantId(new TenantId(tenantId)); + switch (entityType) { + case TENANT: + event.setEntityId(new TenantId(entityId)); + break; + case DEVICE: + event.setEntityId(new DeviceId(entityId)); + break; + case CUSTOMER: + event.setEntityId(new CustomerId(entityId)); + break; + case RULE: + event.setEntityId(new RuleId(entityId)); + break; + case PLUGIN: + event.setEntityId(new PluginId(entityId)); + break; + } + event.setBody(body); + event.setType(eventType); + event.setUid(eventUId); + return event; + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java new file mode 100644 index 0000000000..fc58f90736 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java @@ -0,0 +1,216 @@ +/** + * 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.model.sql; + +import com.datastax.driver.core.utils.UUIDs; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import com.fasterxml.jackson.databind.JsonNode; +import org.thingsboard.server.common.data.id.PluginId; +import org.thingsboard.server.common.data.id.TenantId; +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 java.util.Objects; +import java.util.UUID; + +@Entity +@Table(name = ModelConstants.PLUGIN_COLUMN_FAMILY_NAME) +public class PluginMetaDataEntity implements SearchTextEntity { + + @Transient + private static final long serialVersionUID = -6164321050824823149L; + @Id + @Column(name = ModelConstants.ID_PROPERTY) + private UUID id; + + @Column(name = ModelConstants.PLUGIN_API_TOKEN_PROPERTY) + private String apiToken; + + @Column(name = ModelConstants.PLUGIN_TENANT_ID_PROPERTY) + private UUID tenantId; + + @Column(name = ModelConstants.PLUGIN_NAME_PROPERTY) + private String name; + + @Column(name = ModelConstants.PLUGIN_CLASS_PROPERTY) + private String clazz; + + @Column(name = ModelConstants.PLUGIN_ACCESS_PROPERTY) + private boolean publicAccess; + + @Column(name = ModelConstants.PLUGIN_STATE_PROPERTY) + private ComponentLifecycleState state; + + @Column(name = ModelConstants.PLUGIN_CONFIGURATION_PROPERTY) + private JsonNode configuration; + + @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + private String searchText; + + @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY) + private JsonNode additionalInfo; + + public PluginMetaDataEntity() { + } + + public PluginMetaDataEntity(PluginMetaData pluginMetaData) { + if (pluginMetaData.getId() != null) { + this.id = pluginMetaData.getId().getId(); + } + this.tenantId = pluginMetaData.getTenantId().getId(); + this.apiToken = pluginMetaData.getApiToken(); + this.clazz = pluginMetaData.getClazz(); + this.name = pluginMetaData.getName(); + this.publicAccess = pluginMetaData.isPublicAccess(); + this.state = pluginMetaData.getState(); + this.configuration = pluginMetaData.getConfiguration(); + this.searchText = pluginMetaData.getName(); + this.additionalInfo = pluginMetaData.getAdditionalInfo(); + } + + @Override + public String getSearchTextSource() { + return searchText; + } + + @Override + public void setSearchText(String searchText) { + this.searchText = searchText; + } + + @Override + public UUID getId() { + return id; + } + + @Override + public void setId(UUID id) { + this.id = id; + } + + public String getApiToken() { + return apiToken; + } + + public void setApiToken(String apiToken) { + this.apiToken = apiToken; + } + + public UUID getTenantId() { + return tenantId; + } + + public void setTenantId(UUID tenantId) { + this.tenantId = tenantId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getClazz() { + return clazz; + } + + public void setClazz(String clazz) { + this.clazz = clazz; + } + + public JsonNode getConfiguration() { + return configuration; + } + + public void setConfiguration(JsonNode configuration) { + this.configuration = configuration; + } + + public boolean isPublicAccess() { + return publicAccess; + } + + public void setPublicAccess(boolean publicAccess) { + this.publicAccess = publicAccess; + } + + public ComponentLifecycleState getState() { + return state; + } + + public void setState(ComponentLifecycleState state) { + this.state = state; + } + + public String getSearchText() { + return searchText; + } + + public JsonNode getAdditionalInfo() { + return additionalInfo; + } + + public void setAdditionalInfo(JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + @Override + public PluginMetaData toData() { + PluginMetaData data = new PluginMetaData(new PluginId(id)); + data.setTenantId(new TenantId(tenantId)); + data.setCreatedTime(UUIDs.unixTimestamp(id)); + data.setName(name); + data.setConfiguration(configuration); + data.setClazz(clazz); + data.setPublicAccess(publicAccess); + data.setState(state); + data.setApiToken(apiToken); + data.setAdditionalInfo(additionalInfo); + return data; + } + + @Override + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; + PluginMetaDataEntity entity = (PluginMetaDataEntity) o; + return Objects.equals(id, entity.id) && Objects.equals(apiToken, entity.apiToken) && Objects.equals(tenantId, entity.tenantId) + && Objects.equals(name, entity.name) && Objects.equals(clazz, entity.clazz) && Objects.equals(state, entity.state) + && Objects.equals(configuration, entity.configuration) + && Objects.equals(searchText, entity.searchText); + } + + @Override + public int hashCode() { + return Objects.hash(id, apiToken, tenantId, name, clazz, state, configuration, searchText); + } + + @Override + public String toString() { + return "PluginMetaDataEntity{" + "id=" + id + ", apiToken='" + apiToken + '\'' + ", tenantId=" + tenantId + ", name='" + name + '\'' + ", clazz='" + + clazz + '\'' + ", state=" + state + ", configuration=" + configuration + ", searchText='" + searchText + '\'' + '}'; + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java new file mode 100644 index 0000000000..506b74abc3 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java @@ -0,0 +1,228 @@ +/** + * 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.model.sql; + +import com.datastax.driver.core.utils.UUIDs; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import com.fasterxml.jackson.databind.JsonNode; +import org.thingsboard.server.common.data.id.RuleId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.plugin.ComponentLifecycleState; +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 java.util.Objects; +import java.util.UUID; + +@Entity +@Table(name = ModelConstants.RULE_COLUMN_FAMILY_NAME) +public class RuleMetaDataEntity implements SearchTextEntity { + + @Transient + private static final long serialVersionUID = -1506905644259463884L; + @Id + @Column(name = ModelConstants.ID_PROPERTY) + private UUID id; + @Column(name = ModelConstants.RULE_TENANT_ID_PROPERTY) + private UUID tenantId; + @Column(name = ModelConstants.RULE_NAME_PROPERTY) + private String name; + @Column(name = ModelConstants.RULE_STATE_PROPERTY) + private ComponentLifecycleState state; + @Column(name = ModelConstants.RULE_WEIGHT_PROPERTY) + private int weight; + @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + private String searchText; + @Column(name = ModelConstants.RULE_PLUGIN_TOKEN_PROPERTY) + private String pluginToken; + @Column(name = ModelConstants.RULE_FILTERS) + private JsonNode filters; + @Column(name = ModelConstants.RULE_PROCESSOR) + private JsonNode processor; + @Column(name = ModelConstants.RULE_ACTION) + private JsonNode action; + @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY) + private JsonNode additionalInfo; + + public RuleMetaDataEntity() { + } + + public RuleMetaDataEntity(RuleMetaData rule) { + if (rule.getId() != null) { + this.id = rule.getUuidId(); + } + this.tenantId = DaoUtil.getId(rule.getTenantId()); + this.name = rule.getName(); + this.pluginToken = rule.getPluginToken(); + this.state = rule.getState(); + this.weight = rule.getWeight(); + this.searchText = rule.getName(); + this.filters = rule.getFilters(); + this.processor = rule.getProcessor(); + this.action = rule.getAction(); + this.additionalInfo = rule.getAdditionalInfo(); + } + + @Override + public String getSearchTextSource() { + return searchText; + } + + @Override + public void setSearchText(String searchText) { + this.searchText = searchText; + } + + @Override + public UUID getId() { + return id; + } + + @Override + public void setId(UUID id) { + this.id = id; + } + + public UUID getTenantId() { + return tenantId; + } + + public void setTenantId(UUID tenantId) { + this.tenantId = tenantId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public ComponentLifecycleState getState() { + return state; + } + + public void setState(ComponentLifecycleState state) { + this.state = state; + } + + public int getWeight() { + return weight; + } + + public void setWeight(int weight) { + this.weight = weight; + } + + public String getPluginToken() { + return pluginToken; + } + + public void setPluginToken(String pluginToken) { + this.pluginToken = pluginToken; + } + + public String getSearchText() { + return searchText; + } + + public JsonNode getFilters() { + return filters; + } + + public void setFilters(JsonNode filters) { + this.filters = filters; + } + + public JsonNode getProcessor() { + return processor; + } + + public void setProcessor(JsonNode processor) { + this.processor = processor; + } + + public JsonNode getAction() { + return action; + } + + public void setAction(JsonNode action) { + this.action = action; + } + + public JsonNode getAdditionalInfo() { + return additionalInfo; + } + + public void setAdditionalInfo(JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + @Override + public RuleMetaData toData() { + RuleMetaData rule = new RuleMetaData(new RuleId(id)); + rule.setTenantId(new TenantId(tenantId)); + rule.setName(name); + rule.setState(state); + rule.setWeight(weight); + rule.setCreatedTime(UUIDs.unixTimestamp(id)); + rule.setPluginToken(pluginToken); + rule.setFilters(filters); + rule.setProcessor(processor); + rule.setAction(action); + rule.setAdditionalInfo(additionalInfo); + return rule; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + RuleMetaDataEntity that = (RuleMetaDataEntity) o; + return weight == that.weight && + Objects.equals(id, that.id) && + Objects.equals(tenantId, that.tenantId) && + Objects.equals(name, that.name) && + Objects.equals(pluginToken, that.pluginToken) && + Objects.equals(state, that.state) && + Objects.equals(searchText, that.searchText); + } + + @Override + public int hashCode() { + return Objects.hash(id, tenantId, name, pluginToken, state, weight, searchText); + } + + @Override + public String toString() { + return "RuleMetaDataEntity{" + + "id=" + id + + ", tenantId=" + tenantId + + ", name='" + name + '\'' + + ", pluginToken='" + pluginToken + '\'' + + ", state='" + state + '\'' + + ", weight=" + weight + + ", searchText='" + searchText + '\'' + + '}'; + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java new file mode 100644 index 0000000000..06b6131799 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java @@ -0,0 +1,351 @@ +/** + * 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.model.sql; + +import com.datastax.driver.core.utils.UUIDs; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +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 com.fasterxml.jackson.databind.JsonNode; + +import java.util.UUID; + +@Entity +@Table(name = ModelConstants.TENANT_COLUMN_FAMILY_NAME) +public final class TenantEntity implements SearchTextEntity { + + @Transient + private static final long serialVersionUID = -4330655990232136337L; + + @Id + @Column(name = ModelConstants.ID_PROPERTY) + private UUID id; + + @Column(name = ModelConstants.TENANT_TITLE_PROPERTY) + private String title; + + @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + private String searchText; + + @Column(name = ModelConstants.TENANT_REGION_PROPERTY) + private String region; + + @Column(name = ModelConstants.COUNTRY_PROPERTY) + private String country; + + @Column(name = ModelConstants.STATE_PROPERTY) + private String state; + + @Column(name = ModelConstants.CITY_PROPERTY) + private String city; + + @Column(name = ModelConstants.ADDRESS_PROPERTY) + private String address; + + @Column(name = ModelConstants.ADDRESS2_PROPERTY) + private String address2; + + @Column(name = ModelConstants.ZIP_PROPERTY) + private String zip; + + @Column(name = ModelConstants.PHONE_PROPERTY) + private String phone; + + @Column(name = ModelConstants.EMAIL_PROPERTY) + private String email; + + @Column(name = ModelConstants.TENANT_ADDITIONAL_INFO_PROPERTY) + private JsonNode additionalInfo; + + public TenantEntity() { + super(); + } + + public TenantEntity(Tenant tenant) { + if (tenant.getId() != null) { + this.id = tenant.getId().getId(); + } + this.title = tenant.getTitle(); + this.region = tenant.getRegion(); + this.country = tenant.getCountry(); + this.state = tenant.getState(); + this.city = tenant.getCity(); + this.address = tenant.getAddress(); + this.address2 = tenant.getAddress2(); + this.zip = tenant.getZip(); + this.phone = tenant.getPhone(); + this.email = tenant.getEmail(); + this.additionalInfo = tenant.getAdditionalInfo(); + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getRegion() { + return region; + } + + public void setRegion(String region) { + this.region = region; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getAddress2() { + return address2; + } + + public void setAddress2(String address2) { + this.address2 = address2; + } + + public String getZip() { + return zip; + } + + public void setZip(String zip) { + this.zip = zip; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public JsonNode getAdditionalInfo() { + return additionalInfo; + } + + public void setAdditionalInfo(JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + @Override + public String getSearchTextSource() { + return title; + } + + @Override + public void setSearchText(String searchText) { + this.searchText = searchText; + } + + public String getSearchText() { + return searchText; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((additionalInfo == null) ? 0 : additionalInfo.hashCode()); + result = prime * result + ((address == null) ? 0 : address.hashCode()); + result = prime * result + ((address2 == null) ? 0 : address2.hashCode()); + result = prime * result + ((city == null) ? 0 : city.hashCode()); + result = prime * result + ((country == null) ? 0 : country.hashCode()); + result = prime * result + ((email == null) ? 0 : email.hashCode()); + result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + ((phone == null) ? 0 : phone.hashCode()); + result = prime * result + ((region == null) ? 0 : region.hashCode()); + result = prime * result + ((state == null) ? 0 : state.hashCode()); + result = prime * result + ((title == null) ? 0 : title.hashCode()); + result = prime * result + ((zip == null) ? 0 : zip.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + TenantEntity other = (TenantEntity) obj; + if (additionalInfo == null) { + if (other.additionalInfo != null) + return false; + } else if (!additionalInfo.equals(other.additionalInfo)) + return false; + if (address == null) { + if (other.address != null) + return false; + } else if (!address.equals(other.address)) + return false; + if (address2 == null) { + if (other.address2 != null) + return false; + } else if (!address2.equals(other.address2)) + return false; + if (city == null) { + if (other.city != null) + return false; + } else if (!city.equals(other.city)) + return false; + if (country == null) { + if (other.country != null) + return false; + } else if (!country.equals(other.country)) + return false; + if (email == null) { + if (other.email != null) + return false; + } else if (!email.equals(other.email)) + return false; + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) + return false; + if (phone == null) { + if (other.phone != null) + return false; + } else if (!phone.equals(other.phone)) + return false; + if (region == null) { + if (other.region != null) + return false; + } else if (!region.equals(other.region)) + return false; + if (state == null) { + if (other.state != null) + return false; + } else if (!state.equals(other.state)) + return false; + if (title == null) { + if (other.title != null) + return false; + } else if (!title.equals(other.title)) + return false; + if (zip == null) { + if (other.zip != null) + return false; + } else if (!zip.equals(other.zip)) + return false; + return true; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("TenantEntity [id="); + builder.append(id); + builder.append(", title="); + builder.append(title); + builder.append(", region="); + builder.append(region); + builder.append(", country="); + builder.append(country); + builder.append(", state="); + builder.append(state); + builder.append(", city="); + builder.append(city); + builder.append(", address="); + builder.append(address); + builder.append(", address2="); + builder.append(address2); + builder.append(", zip="); + builder.append(zip); + builder.append(", phone="); + builder.append(phone); + builder.append(", email="); + builder.append(email); + builder.append(", additionalInfo="); + builder.append(additionalInfo); + builder.append("]"); + return builder.toString(); + } + + @Override + public Tenant toData() { + Tenant tenant = new Tenant(new TenantId(id)); + tenant.setCreatedTime(UUIDs.unixTimestamp(id)); + tenant.setTitle(title); + tenant.setRegion(region); + tenant.setCountry(country); + tenant.setState(state); + tenant.setCity(city); + tenant.setAddress(address); + tenant.setAddress2(address2); + tenant.setZip(zip); + tenant.setPhone(phone); + tenant.setEmail(email); + tenant.setAdditionalInfo(additionalInfo); + return tenant; + } + + +} \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java new file mode 100644 index 0000000000..42d4e92762 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java @@ -0,0 +1,189 @@ +/** + * 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.model.sql; + +import com.datastax.driver.core.utils.UUIDs; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import org.thingsboard.server.common.data.id.UserCredentialsId; +import org.thingsboard.server.common.data.id.UserId; +import org.thingsboard.server.common.data.security.UserCredentials; +import org.thingsboard.server.dao.model.BaseEntity; +import org.thingsboard.server.dao.model.ModelConstants; + +import java.util.UUID; + +@Entity +@Table(name = ModelConstants.USER_CREDENTIALS_COLUMN_FAMILY_NAME) +public final class UserCredentialsEntity implements BaseEntity { + + @Transient + private static final long serialVersionUID = 1348221414123438374L; + + @Id + @Column(name = ModelConstants.ID_PROPERTY) + private UUID id; + + @Column(name = ModelConstants.USER_CREDENTIALS_USER_ID_PROPERTY) + private UUID userId; + + @Column(name = ModelConstants.USER_CREDENTIALS_ENABLED_PROPERTY) + private boolean enabled; + + @Column(name = ModelConstants.USER_CREDENTIALS_PASSWORD_PROPERTY) + private String password; + + @Column(name = ModelConstants.USER_CREDENTIALS_ACTIVATE_TOKEN_PROPERTY) + private String activateToken; + + @Column(name = ModelConstants.USER_CREDENTIALS_RESET_TOKEN_PROPERTY) + private String resetToken; + + public UserCredentialsEntity() { + super(); + } + + public UserCredentialsEntity(UserCredentials userCredentials) { + if (userCredentials.getId() != null) { + this.id = userCredentials.getId().getId(); + } + if (userCredentials.getUserId() != null) { + this.userId = userCredentials.getUserId().getId(); + } + this.enabled = userCredentials.isEnabled(); + this.password = userCredentials.getPassword(); + this.activateToken = userCredentials.getActivateToken(); + this.resetToken = userCredentials.getResetToken(); + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public UUID getUserId() { + return userId; + } + + public void setUserId(UUID userId) { + this.userId = userId; + } + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getActivateToken() { + return activateToken; + } + + public void setActivateToken(String activateToken) { + this.activateToken = activateToken; + } + + public String getResetToken() { + return resetToken; + } + + public void setResetToken(String resetToken) { + this.resetToken = resetToken; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((activateToken == null) ? 0 : activateToken.hashCode()); + result = prime * result + (enabled ? 1231 : 1237); + result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + ((password == null) ? 0 : password.hashCode()); + result = prime * result + ((resetToken == null) ? 0 : resetToken.hashCode()); + result = prime * result + ((userId == null) ? 0 : userId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + UserCredentialsEntity other = (UserCredentialsEntity) obj; + if (activateToken == null) { + if (other.activateToken != null) + return false; + } else if (!activateToken.equals(other.activateToken)) + return false; + if (enabled != other.enabled) + return false; + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) + return false; + if (password == null) { + if (other.password != null) + return false; + } else if (!password.equals(other.password)) + return false; + if (resetToken == null) { + if (other.resetToken != null) + return false; + } else if (!resetToken.equals(other.resetToken)) + return false; + if (userId == null) { + if (other.userId != null) + return false; + } else if (!userId.equals(other.userId)) + return false; + return true; + } + + @Override + public UserCredentials toData() { + UserCredentials userCredentials = new UserCredentials(new UserCredentialsId(id)); + userCredentials.setCreatedTime(UUIDs.unixTimestamp(id)); + if (userId != null) { + userCredentials.setUserId(new UserId(userId)); + } + userCredentials.setEnabled(enabled); + userCredentials.setPassword(password); + userCredentials.setActivateToken(activateToken); + userCredentials.setResetToken(resetToken); + return userCredentials; + } + +} \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java new file mode 100644 index 0000000000..a02341d204 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java @@ -0,0 +1,274 @@ +/** + * 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.model.sql; + +import com.datastax.driver.core.utils.UUIDs; +import com.fasterxml.jackson.databind.JsonNode; +import org.thingsboard.server.common.data.User; +import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.id.UserId; +import org.thingsboard.server.common.data.security.Authority; +import org.thingsboard.server.dao.model.SearchTextEntity; +import org.thingsboard.server.dao.model.ModelConstants; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.UUID; + +/** + * @author Valerii Sosliuk + */ +@Entity +@Table(name= ModelConstants.USER_COLUMN_FAMILY_NAME) +public class UserEntity implements SearchTextEntity { + + @Transient + private static final long serialVersionUID = 4349485207981226785L; + + @Id + @Column(name=ModelConstants.ID_PROPERTY) + private UUID id; + + @Column(name = ModelConstants.USER_TENANT_ID_PROPERTY) + private UUID tenantId; + + @Column(name = ModelConstants.USER_CUSTOMER_ID_PROPERTY) + private UUID customerId; + + @Column(name = ModelConstants.USER_AUTHORITY_PROPERTY) + private Authority authority; + + @Column(name = ModelConstants.USER_EMAIL_PROPERTY) + private String email; + + @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + private String searchText; + + @Column(name = ModelConstants.USER_FIRST_NAME_PROPERTY) + private String firstName; + + @Column(name = ModelConstants.USER_LAST_NAME_PROPERTY) + private String lastName; + + @Column(name = ModelConstants.USER_ADDITIONAL_INFO_PROPERTY) + private JsonNode additionalInfo; + + public UserEntity(User user) { + if (user.getId() != null) { + this.id = user.getId().getId(); + } + this.authority = user.getAuthority(); + if (user.getTenantId() != null) { + this.tenantId = user.getTenantId().getId(); + } + if (user.getCustomerId() != null) { + this.customerId = user.getCustomerId().getId(); + } + this.email = user.getEmail(); + this.firstName = user.getFirstName(); + this.lastName = user.getLastName(); + this.additionalInfo = user.getAdditionalInfo(); + } + + public String getSearchText() { + return searchText; + } + + @Override + public String getSearchTextSource() { + return searchText; + } + + @Override + public void setSearchText(String searchText) { + this.searchText = searchText; + } + + @Override + public UUID getId() { + return id; + } + + @Override + public void setId(UUID id) { + this.id = id; + } + + public UUID getTenantId() { + return tenantId; + } + + public void setTenantId(UUID tenantId) { + this.tenantId = tenantId; + } + + public UUID getCustomerId() { + return customerId; + } + + public void setCustomerId(UUID customerId) { + this.customerId = customerId; + } + + public Authority getAuthority() { + return authority; + } + + public void setAuthority(Authority authority) { + this.authority = authority; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public JsonNode getAdditionalInfo() { + return additionalInfo; + } + + public void setAdditionalInfo(JsonNode additionalInfo) { + this.additionalInfo = additionalInfo; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("UserEntity [id="); + builder.append(id); + builder.append(", authority="); + builder.append(authority); + builder.append(", tenantId="); + builder.append(tenantId); + builder.append(", customerId="); + builder.append(customerId); + builder.append(", email="); + builder.append(email); + builder.append(", firstName="); + builder.append(firstName); + builder.append(", lastName="); + builder.append(lastName); + builder.append(", additionalInfo="); + builder.append(additionalInfo); + builder.append("]"); + return builder.toString(); + } + + @Override + public User toData() { + User user = new User(new UserId(id)); + user.setCreatedTime(UUIDs.unixTimestamp(id)); + user.setAuthority(authority); + if (tenantId != null) { + user.setTenantId(new TenantId(tenantId)); + } + if (customerId != null) { + user.setCustomerId(new CustomerId(customerId)); + } + user.setEmail(email); + user.setFirstName(firstName); + user.setLastName(lastName); + user.setAdditionalInfo(additionalInfo); + return user; + } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((additionalInfo == null) ? 0 : additionalInfo.hashCode()); + result = prime * result + ((authority == null) ? 0 : authority.hashCode()); + result = prime * result + ((customerId == null) ? 0 : customerId.hashCode()); + result = prime * result + ((email == null) ? 0 : email.hashCode()); + result = prime * result + ((firstName == null) ? 0 : firstName.hashCode()); + result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + ((lastName == null) ? 0 : lastName.hashCode()); + result = prime * result + ((tenantId == null) ? 0 : tenantId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + UserEntity other = (UserEntity) obj; + if (additionalInfo == null) { + if (other.additionalInfo != null) + return false; + } else if (!additionalInfo.equals(other.additionalInfo)) + return false; + if (authority != other.authority) + return false; + if (customerId == null) { + if (other.customerId != null) + return false; + } else if (!customerId.equals(other.customerId)) + return false; + if (email == null) { + if (other.email != null) + return false; + } else if (!email.equals(other.email)) + return false; + if (firstName == null) { + if (other.firstName != null) + return false; + } else if (!firstName.equals(other.firstName)) + return false; + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) + return false; + if (lastName == null) { + if (other.lastName != null) + return false; + } else if (!lastName.equals(other.lastName)) + return false; + if (tenantId == null) { + if (other.tenantId != null) + return false; + } else if (!tenantId.equals(other.tenantId)) + return false; + return true; + } + +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java new file mode 100644 index 0000000000..6c1b949720 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java @@ -0,0 +1,183 @@ +/** + * 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.model.sql; + +import com.datastax.driver.core.utils.UUIDs; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; + +import com.datastax.driver.mapping.annotations.PartitionKey; +import com.fasterxml.jackson.databind.JsonNode; +import org.thingsboard.server.common.data.id.TenantId; +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 java.util.UUID; + +@Entity +@Table(name = ModelConstants.WIDGET_TYPE_COLUMN_FAMILY_NAME) +public final class WidgetTypeEntity implements BaseEntity { + + @Transient + private static final long serialVersionUID = -5436279069884988630L; + + @Id + @Column(name = ModelConstants.ID_PROPERTY) + private UUID id; + + @PartitionKey(value = 1) + @Column(name = ModelConstants.WIDGET_TYPE_TENANT_ID_PROPERTY) + private UUID tenantId; + + @PartitionKey(value = 2) + @Column(name = ModelConstants.WIDGET_TYPE_BUNDLE_ALIAS_PROPERTY) + private String bundleAlias; + + @Column(name = ModelConstants.WIDGET_TYPE_ALIAS_PROPERTY) + private String alias; + + @Column(name = ModelConstants.WIDGET_TYPE_NAME_PROPERTY) + private String name; + + @Column(name = ModelConstants.WIDGET_TYPE_DESCRIPTOR_PROPERTY) + private JsonNode descriptor; + + public WidgetTypeEntity() { + super(); + } + + public WidgetTypeEntity(WidgetType widgetType) { + if (widgetType.getId() != null) { + this.id = widgetType.getId().getId(); + } + if (widgetType.getTenantId() != null) { + this.tenantId = widgetType.getTenantId().getId(); + } + this.bundleAlias = widgetType.getBundleAlias(); + this.alias = widgetType.getAlias(); + this.name = widgetType.getName(); + this.descriptor = widgetType.getDescriptor(); + } + + @Override + public UUID getId() { + return id; + } + + @Override + public void setId(UUID id) { + this.id = id; + } + + public UUID getTenantId() { + return tenantId; + } + + public void setTenantId(UUID tenantId) { + this.tenantId = tenantId; + } + + public String getBundleAlias() { + return bundleAlias; + } + + public void setBundleAlias(String bundleAlias) { + this.bundleAlias = bundleAlias; + } + + public String getAlias() { + return alias; + } + + public void setAlias(String alias) { + this.alias = alias; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public JsonNode getDescriptor() { + return descriptor; + } + + public void setDescriptor(JsonNode descriptor) { + this.descriptor = descriptor; + } + + @Override + public int hashCode() { + int result = id != null ? id.hashCode() : 0; + result = 31 * result + (tenantId != null ? tenantId.hashCode() : 0); + result = 31 * result + (bundleAlias != null ? bundleAlias.hashCode() : 0); + result = 31 * result + (alias != null ? alias.hashCode() : 0); + result = 31 * result + (name != null ? name.hashCode() : 0); + result = 31 * result + (descriptor != null ? descriptor.hashCode() : 0); + return result; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + WidgetTypeEntity that = (WidgetTypeEntity) o; + + if (id != null ? !id.equals(that.id) : that.id != null) return false; + if (tenantId != null ? !tenantId.equals(that.tenantId) : that.tenantId != null) return false; + if (bundleAlias != null ? !bundleAlias.equals(that.bundleAlias) : that.bundleAlias != null) return false; + if (alias != null ? !alias.equals(that.alias) : that.alias != null) return false; + if (name != null ? !name.equals(that.name) : that.name != null) return false; + return descriptor != null ? descriptor.equals(that.descriptor) : that.descriptor == null; + } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("WidgetTypeEntity{"); + sb.append("id=").append(id); + sb.append(", tenantId=").append(tenantId); + sb.append(", bundleAlias='").append(bundleAlias).append('\''); + sb.append(", alias='").append(alias).append('\''); + sb.append(", name='").append(name).append('\''); + sb.append(", descriptor=").append(descriptor); + sb.append('}'); + return sb.toString(); + } + + @Override + public WidgetType toData() { + WidgetType widgetType = new WidgetType(new WidgetTypeId(id)); + widgetType.setCreatedTime(UUIDs.unixTimestamp(id)); + if (tenantId != null) { + widgetType.setTenantId(new TenantId(tenantId)); + } + widgetType.setBundleAlias(bundleAlias); + widgetType.setAlias(alias); + widgetType.setName(name); + widgetType.setDescriptor(descriptor); + return widgetType; + } + +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java new file mode 100644 index 0000000000..c972709926 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java @@ -0,0 +1,190 @@ +/** + * 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.model.sql; + + +import com.datastax.driver.core.utils.UUIDs; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.id.WidgetsBundleId; +import org.thingsboard.server.common.data.widget.WidgetsBundle; +import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.model.SearchTextEntity; + +import java.nio.ByteBuffer; +import java.util.UUID; + +@Entity +@Table(name = ModelConstants.WIDGETS_BUNDLE_COLUMN_FAMILY_NAME) +public final class WidgetsBundleEntity implements SearchTextEntity { + + @Transient + private static final long serialVersionUID = 6897035686422298096L; + + @Id + @Column(name = ModelConstants.ID_PROPERTY) + private UUID id; + + @Column(name = ModelConstants.WIDGETS_BUNDLE_TENANT_ID_PROPERTY) + private UUID tenantId; + + @Column(name = ModelConstants.WIDGETS_BUNDLE_ALIAS_PROPERTY) + private String alias; + + @Column(name = ModelConstants.WIDGETS_BUNDLE_TITLE_PROPERTY) + private String title; + + @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + private String searchText; + + @Column(name = ModelConstants.WIDGETS_BUNDLE_IMAGE_PROPERTY) + private ByteBuffer image; + + public WidgetsBundleEntity() { + super(); + } + + public WidgetsBundleEntity(WidgetsBundle widgetsBundle) { + if (widgetsBundle.getId() != null) { + this.id = widgetsBundle.getId().getId(); + } + if (widgetsBundle.getTenantId() != null) { + this.tenantId = widgetsBundle.getTenantId().getId(); + } + this.alias = widgetsBundle.getAlias(); + this.title = widgetsBundle.getTitle(); + if (widgetsBundle.getImage() != null) { + this.image = ByteBuffer.wrap(widgetsBundle.getImage()); + } + } + + @Override + public UUID getId() { + return id; + } + + @Override + public void setId(UUID id) { + this.id = id; + } + + public UUID getTenantId() { + return tenantId; + } + + public void setTenantId(UUID tenantId) { + this.tenantId = tenantId; + } + + public String getAlias() { + return alias; + } + + public void setAlias(String alias) { + this.alias = alias; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public ByteBuffer getImage() { + return image; + } + + public void setImage(ByteBuffer image) { + this.image = image; + } + + @Override + public String getSearchTextSource() { + return title; + } + + @Override + public void setSearchText(String searchText) { + this.searchText = searchText; + } + + public String getSearchText() { + return searchText; + } + + @Override + public int hashCode() { + int result = id != null ? id.hashCode() : 0; + result = 31 * result + (tenantId != null ? tenantId.hashCode() : 0); + result = 31 * result + (alias != null ? alias.hashCode() : 0); + result = 31 * result + (title != null ? title.hashCode() : 0); + result = 31 * result + (searchText != null ? searchText.hashCode() : 0); + result = 31 * result + (image != null ? image.hashCode() : 0); + return result; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + WidgetsBundleEntity that = (WidgetsBundleEntity) o; + + if (id != null ? !id.equals(that.id) : that.id != null) return false; + if (tenantId != null ? !tenantId.equals(that.tenantId) : that.tenantId != null) return false; + if (alias != null ? !alias.equals(that.alias) : that.alias != null) return false; + if (title != null ? !title.equals(that.title) : that.title != null) return false; + if (searchText != null ? !searchText.equals(that.searchText) : that.searchText != null) return false; + return image != null ? image.equals(that.image) : that.image == null; + + } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("WidgetsBundleEntity{"); + sb.append("id=").append(id); + sb.append(", tenantId=").append(tenantId); + sb.append(", alias='").append(alias).append('\''); + sb.append(", title='").append(title).append('\''); + sb.append(", searchText='").append(searchText).append('\''); + sb.append(", image=").append(image); + sb.append('}'); + return sb.toString(); + } + + @Override + public WidgetsBundle toData() { + WidgetsBundle widgetsBundle = new WidgetsBundle(new WidgetsBundleId(id)); + widgetsBundle.setCreatedTime(UUIDs.unixTimestamp(id)); + if (tenantId != null) { + widgetsBundle.setTenantId(new TenantId(tenantId)); + } + widgetsBundle.setAlias(alias); + widgetsBundle.setTitle(title); + if (image != null) { + byte[] imageByteArray = new byte[image.remaining()]; + image.get(imageByteArray); + widgetsBundle.setImage(imageByteArray); + } + return widgetsBundle; + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/plugin/CassandraBasePluginDao.java b/dao/src/main/java/org/thingsboard/server/dao/plugin/CassandraBasePluginDao.java index 054a3655fb..9c196e8d3a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/plugin/CassandraBasePluginDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/plugin/CassandraBasePluginDao.java @@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.plugin.PluginMetaData; import org.thingsboard.server.dao.CassandraAbstractSearchTextDao; import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.ModelConstants; -import org.thingsboard.server.dao.model.PluginMetaDataEntity; +import org.thingsboard.server.dao.model.nosql.PluginMetaDataEntity; import java.util.Arrays; import java.util.List; diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/CassandraBaseRuleDao.java b/dao/src/main/java/org/thingsboard/server/dao/rule/CassandraBaseRuleDao.java index a750940968..8f62bafda3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/CassandraBaseRuleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/CassandraBaseRuleDao.java @@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.rule.RuleMetaData; import org.thingsboard.server.dao.CassandraAbstractSearchTextDao; import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.ModelConstants; -import org.thingsboard.server.dao.model.RuleMetaDataEntity; +import org.thingsboard.server.dao.model.nosql.RuleMetaDataEntity; import java.util.Arrays; import java.util.List; diff --git a/dao/src/main/java/org/thingsboard/server/dao/settings/CassandraAdminSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/settings/CassandraAdminSettingsDao.java index c1783bc76a..adeeed062b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/settings/CassandraAdminSettingsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/settings/CassandraAdminSettingsDao.java @@ -21,7 +21,7 @@ import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.AdminSettings; import org.thingsboard.server.dao.CassandraAbstractModelDao; import org.thingsboard.server.dao.DaoUtil; -import org.thingsboard.server.dao.model.AdminSettingsEntity; +import org.thingsboard.server.dao.model.nosql.AdminSettingsEntity; import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; import static com.datastax.driver.core.querybuilder.QueryBuilder.select; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java new file mode 100644 index 0000000000..a92e607472 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java @@ -0,0 +1,90 @@ +/** + * 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.sql; + +import com.google.common.collect.Lists; +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.SearchTextEntity; +import org.thingsboard.server.dao.sql.user.JpaRepository; + +import java.util.List; +import java.util.UUID; + +/** + * @author Valerii Sosliuk + */ +@Slf4j +public abstract class JpaAbstractDao, D> implements Dao { + + protected abstract Class getColumnFamilyClass(); + + protected abstract String getColumnFamilyName(); + + protected abstract JpaRepository getCrudRepository(); + + protected boolean isSearchTextDao() { + return false; + } + + @Override + public D save(D domain) { + E entity; + try { + entity = getColumnFamilyClass().getConstructor(domain.getClass()).newInstance(domain); + } catch (Exception e) { + log.error("Can't create entity for domain object {}", domain, e); + throw new IllegalArgumentException("Can't create entity for domain object {" + domain + "}", e); + } if (isSearchTextDao()) { + ((SearchTextEntity) entity).setSearchText(((SearchTextEntity) entity).getSearchTextSource().toLowerCase()); + } + log.debug("Saving entity {}", entity); + entity = getCrudRepository().save(entity); + return DaoUtil.getData(entity); + } + + @Override + public D findById(UUID key) { + log.debug("Get entity by key {}", key); + E entity = getCrudRepository().findOne(key); + return DaoUtil.getData(entity); + } + + @Override + public ListenableFuture findByIdAsync(UUID key) { + log.debug("Get entity by key {}", key); + org.springframework.util.concurrent.ListenableFuture entityFuture = getCrudRepository().findByIdAsync(key); + // TODO: vsosliuk implement + return null; + } + + @Override + public boolean removeById(UUID key) { + getCrudRepository().delete(key); + log.debug("Remove request: {}", key); + return getCrudRepository().equals(key); + } + + @Override + public List find() { + log.debug("Get all entities from column family {}", getColumnFamilyName()); + List entities = Lists.newArrayList(getCrudRepository().findAll()); + return DaoUtil.convertDataList(entities); + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaRepository.java new file mode 100644 index 0000000000..0af2bf8fc0 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaRepository.java @@ -0,0 +1,31 @@ +/** + * 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.sql.user; + +import org.springframework.data.repository.CrudRepository; +import org.springframework.scheduling.annotation.Async; +import org.springframework.util.concurrent.ListenableFuture; + +import java.io.Serializable; + +/** + * @author Valerii Sosliuk + */ +public interface JpaRepository extends CrudRepository { + + @Async + ListenableFuture findByIdAsync(ID key); +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java new file mode 100644 index 0000000000..8fb14d7cff --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java @@ -0,0 +1,52 @@ +/** + * 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.sql.user; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Component; +import org.thingsboard.server.common.data.User; +import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.model.sql.UserEntity; +import org.thingsboard.server.dao.sql.JpaAbstractDao; + +import java.util.UUID; + +/** + * @author Valerii Sosliuk + */ +@Component +@ConditionalOnProperty(prefix="sql", value="enabled",havingValue = "true", matchIfMissing = false) +public class JpaUserDao extends JpaAbstractDao { + + @Autowired + private UserRepository userRepository; + + @Override + protected Class getColumnFamilyClass() { + return UserEntity.class; + } + + @Override + protected String getColumnFamilyName() { + return ModelConstants.USER_COLUMN_FAMILY_NAME; + } + + @Override + protected JpaRepository getCrudRepository() { + return userRepository; + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java new file mode 100644 index 0000000000..51364c798b --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java @@ -0,0 +1,26 @@ +/** + * 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.sql.user; + +import org.thingsboard.server.dao.model.sql.UserEntity; + +import java.util.UUID; + +/** + * @author Valerii Sosliuk + */ +public interface UserRepository extends JpaRepository { +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/CassandraTenantDao.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/CassandraTenantDao.java index d4d067e00f..dfefb759f6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/tenant/CassandraTenantDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/CassandraTenantDao.java @@ -21,7 +21,7 @@ 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.DaoUtil; -import org.thingsboard.server.dao.model.TenantEntity; +import org.thingsboard.server.dao.model.nosql.TenantEntity; import java.util.Arrays; import java.util.List; diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserCredentialsDao.java b/dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserCredentialsDao.java index b44ab6af35..22ed06af5b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserCredentialsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserCredentialsDao.java @@ -22,7 +22,7 @@ import org.thingsboard.server.common.data.security.UserCredentials; import org.thingsboard.server.dao.CassandraAbstractModelDao; import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.ModelConstants; -import org.thingsboard.server.dao.model.UserCredentialsEntity; +import org.thingsboard.server.dao.model.nosql.UserCredentialsEntity; import java.util.UUID; diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserDao.java b/dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserDao.java index 21ffa3561c..d09c84cee1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserDao.java @@ -24,7 +24,7 @@ import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.dao.CassandraAbstractSearchTextDao; import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.ModelConstants; -import org.thingsboard.server.dao.model.UserEntity; +import org.thingsboard.server.dao.model.nosql.UserEntity; import java.util.Arrays; import java.util.List; diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetTypeDao.java b/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetTypeDao.java index 56e6db97d9..8c2cae7516 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetTypeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetTypeDao.java @@ -21,7 +21,7 @@ import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.widget.WidgetType; import org.thingsboard.server.dao.CassandraAbstractModelDao; import org.thingsboard.server.dao.DaoUtil; -import org.thingsboard.server.dao.model.WidgetTypeEntity; +import org.thingsboard.server.dao.model.nosql.WidgetTypeEntity; import java.util.List; import java.util.UUID; diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetsBundleDao.java b/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetsBundleDao.java index 036d754919..d43d25d273 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetsBundleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetsBundleDao.java @@ -22,7 +22,7 @@ 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.DaoUtil; -import org.thingsboard.server.dao.model.WidgetsBundleEntity; +import org.thingsboard.server.dao.model.nosql.WidgetsBundleEntity; import java.util.Arrays; import java.util.List; diff --git a/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java index 644e2214c8..80acec71e4 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java @@ -24,6 +24,8 @@ import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.plugin.PluginMetaData; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.service.AbstractServiceTest; +import org.junit.Assert; +import org.junit.Test; import java.util.UUID; diff --git a/pom.xml b/pom.xml index 6324712dfd..64017d79a4 100755 --- a/pom.xml +++ b/pom.xml @@ -411,6 +411,11 @@ ${spring-boot.version} test + + org.springframework.boot + spring-boot-starter-data-jpa + ${spring-boot.version} + org.springframework spring-context From 306ad5a41768422868b7e6b176afe6d5117422f8 Mon Sep 17 00:00:00 2001 From: Valerii Sosliuk Date: Fri, 14 Apr 2017 22:01:10 -0400 Subject: [PATCH 05/69] ModelConstants replaced with static imports --- .../src/main/resources/thingsboard.yml | 5 +-- .../nosql/ComponentDescriptorEntity.java | 21 +++++++------ .../dao/model/nosql/CustomerEntity.java | 31 ++++++++++--------- .../dao/model/nosql/DashboardEntity.java | 17 +++++----- .../dao/model/nosql/DashboardInfoEntity.java | 15 ++++----- .../model/nosql/DeviceCredentialsEntity.java | 15 ++++----- .../server/dao/model/nosql/DeviceEntity.java | 17 +++++----- .../server/dao/model/nosql/EventEntity.java | 19 ++++++------ .../dao/model/nosql/PluginMetaDataEntity.java | 25 ++++++++------- .../dao/model/nosql/RuleMetaDataEntity.java | 27 ++++++++-------- .../server/dao/model/nosql/TenantEntity.java | 30 +++++++++--------- .../model/nosql/UserCredentialsEntity.java | 16 +++++----- .../server/dao/model/nosql/UserEntity.java | 22 ++++++------- .../dao/model/nosql/WidgetTypeEntity.java | 18 +++++------ .../dao/model/nosql/WidgetsBundleEntity.java | 16 +++++----- .../server/dao/sql/JpaAbstractDao.java | 4 +-- .../server/dao/sql/user/JpaUserDao.java | 23 ++++++++++++-- .../server/dao/sql/user/UserRepository.java | 6 ++++ 18 files changed, 179 insertions(+), 148 deletions(-) diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 8766e5711e..c62672595c 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -95,6 +95,7 @@ coap: # Cassandra driver configuration parameters cassandra: + enabled: "${CASSANDRA_ENABLED:true}" # Thingsboard cluster name cluster_name: "${CASSANDRA_CLUSTER_NAME:Thingsboard Cluster}" # Thingsboard keyspace name @@ -189,11 +190,7 @@ updates: # Enable/disable updates checking. enabled: "${UPDATES_ENABLED:true}" -cassandra: - enabled: "${CASSANDRA_ENABLED:true}" - # SQL DAO Configuration - sql: enabled: "${SQL_ENABLED:false}" datasource: diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/ComponentDescriptorEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/ComponentDescriptorEntity.java index d5cf08cf52..2ff09a7a77 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/ComponentDescriptorEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/ComponentDescriptorEntity.java @@ -23,43 +23,44 @@ import org.thingsboard.server.common.data.id.ComponentDescriptorId; 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.model.ModelConstants; import org.thingsboard.server.dao.model.SearchTextEntity; import org.thingsboard.server.dao.model.type.JsonCodec; import java.util.UUID; +import static org.thingsboard.server.dao.model.ModelConstants.*; + /** * @author Andrew Shvayka */ -@Table(name = ModelConstants.COMPONENT_DESCRIPTOR_COLUMN_FAMILY_NAME) +@Table(name = COMPONENT_DESCRIPTOR_COLUMN_FAMILY_NAME) public class ComponentDescriptorEntity implements SearchTextEntity { private static final long serialVersionUID = 1L; @PartitionKey - @Column(name = ModelConstants.ID_PROPERTY) + @Column(name = ID_PROPERTY) private UUID id; - @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_TYPE_PROPERTY) + @Column(name = COMPONENT_DESCRIPTOR_TYPE_PROPERTY) private ComponentType type; - @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_SCOPE_PROPERTY) + @Column(name = COMPONENT_DESCRIPTOR_SCOPE_PROPERTY) private ComponentScope scope; - @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_NAME_PROPERTY) + @Column(name = COMPONENT_DESCRIPTOR_NAME_PROPERTY) private String name; - @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_CLASS_PROPERTY) + @Column(name = COMPONENT_DESCRIPTOR_CLASS_PROPERTY) private String clazz; - @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_CONFIGURATION_DESCRIPTOR_PROPERTY, codec = JsonCodec.class) + @Column(name = COMPONENT_DESCRIPTOR_CONFIGURATION_DESCRIPTOR_PROPERTY, codec = JsonCodec.class) private JsonNode configurationDescriptor; - @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_ACTIONS_PROPERTY) + @Column(name = COMPONENT_DESCRIPTOR_ACTIONS_PROPERTY) private String actions; - @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + @Column(name = SEARCH_TEXT_PROPERTY) private String searchText; public ComponentDescriptorEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/CustomerEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/CustomerEntity.java index ce3dbff0af..52134993d6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/CustomerEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/CustomerEntity.java @@ -20,7 +20,6 @@ import java.util.UUID; import org.thingsboard.server.common.data.Customer; 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.model.type.JsonCodec; @@ -31,51 +30,53 @@ import com.datastax.driver.mapping.annotations.Table; import com.datastax.driver.mapping.annotations.Transient; import com.fasterxml.jackson.databind.JsonNode; -@Table(name = ModelConstants.CUSTOMER_COLUMN_FAMILY_NAME) +import static org.thingsboard.server.dao.model.ModelConstants.*; + +@Table(name = CUSTOMER_COLUMN_FAMILY_NAME) public final class CustomerEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = -7732527103760948490L; @PartitionKey(value = 0) - @Column(name = ModelConstants.ID_PROPERTY) + @Column(name = ID_PROPERTY) private UUID id; @PartitionKey(value = 1) - @Column(name = ModelConstants.CUSTOMER_TENANT_ID_PROPERTY) + @Column(name = CUSTOMER_TENANT_ID_PROPERTY) private UUID tenantId; - @Column(name = ModelConstants.CUSTOMER_TITLE_PROPERTY) + @Column(name = CUSTOMER_TITLE_PROPERTY) private String title; - @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + @Column(name = SEARCH_TEXT_PROPERTY) private String searchText; - @Column(name = ModelConstants.COUNTRY_PROPERTY) + @Column(name = COUNTRY_PROPERTY) private String country; - @Column(name = ModelConstants.STATE_PROPERTY) + @Column(name = STATE_PROPERTY) private String state; - @Column(name = ModelConstants.CITY_PROPERTY) + @Column(name = CITY_PROPERTY) private String city; - @Column(name = ModelConstants.ADDRESS_PROPERTY) + @Column(name = ADDRESS_PROPERTY) private String address; - @Column(name = ModelConstants.ADDRESS2_PROPERTY) + @Column(name = ADDRESS2_PROPERTY) private String address2; - @Column(name = ModelConstants.ZIP_PROPERTY) + @Column(name = ZIP_PROPERTY) private String zip; - @Column(name = ModelConstants.PHONE_PROPERTY) + @Column(name = PHONE_PROPERTY) private String phone; - @Column(name = ModelConstants.EMAIL_PROPERTY) + @Column(name = EMAIL_PROPERTY) private String email; - @Column(name = ModelConstants.CUSTOMER_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) + @Column(name = CUSTOMER_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) private JsonNode additionalInfo; public CustomerEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DashboardEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DashboardEntity.java index 911e9708d0..ef9df9765d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DashboardEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DashboardEntity.java @@ -21,7 +21,6 @@ import org.thingsboard.server.common.data.Dashboard; import org.thingsboard.server.common.data.id.CustomerId; 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.model.type.JsonCodec; @@ -32,31 +31,33 @@ import com.datastax.driver.mapping.annotations.Table; import com.datastax.driver.mapping.annotations.Transient; import com.fasterxml.jackson.databind.JsonNode; -@Table(name = ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME) +import static org.thingsboard.server.dao.model.ModelConstants.*; + +@Table(name = DASHBOARD_COLUMN_FAMILY_NAME) public final class DashboardEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = 2998395951247446191L; @PartitionKey(value = 0) - @Column(name = ModelConstants.ID_PROPERTY) + @Column(name = ID_PROPERTY) private UUID id; @PartitionKey(value = 1) - @Column(name = ModelConstants.DASHBOARD_TENANT_ID_PROPERTY) + @Column(name = DASHBOARD_TENANT_ID_PROPERTY) private UUID tenantId; @PartitionKey(value = 2) - @Column(name = ModelConstants.DASHBOARD_CUSTOMER_ID_PROPERTY) + @Column(name = DASHBOARD_CUSTOMER_ID_PROPERTY) private UUID customerId; - @Column(name = ModelConstants.DASHBOARD_TITLE_PROPERTY) + @Column(name = DASHBOARD_TITLE_PROPERTY) private String title; - @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + @Column(name = SEARCH_TEXT_PROPERTY) private String searchText; - @Column(name = ModelConstants.DASHBOARD_CONFIGURATION_PROPERTY, codec = JsonCodec.class) + @Column(name = DASHBOARD_CONFIGURATION_PROPERTY, codec = JsonCodec.class) private JsonNode configuration; public DashboardEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DashboardInfoEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DashboardInfoEntity.java index 2c5fe00580..4a318592ea 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DashboardInfoEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DashboardInfoEntity.java @@ -21,7 +21,6 @@ import org.thingsboard.server.common.data.DashboardInfo; import org.thingsboard.server.common.data.id.CustomerId; 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 com.datastax.driver.core.utils.UUIDs; @@ -30,28 +29,30 @@ import com.datastax.driver.mapping.annotations.PartitionKey; import com.datastax.driver.mapping.annotations.Table; import com.datastax.driver.mapping.annotations.Transient; -@Table(name = ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME) +import static org.thingsboard.server.dao.model.ModelConstants.*; + +@Table(name = DASHBOARD_COLUMN_FAMILY_NAME) public class DashboardInfoEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = 2998395951247446191L; @PartitionKey(value = 0) - @Column(name = ModelConstants.ID_PROPERTY) + @Column(name = ID_PROPERTY) private UUID id; @PartitionKey(value = 1) - @Column(name = ModelConstants.DASHBOARD_TENANT_ID_PROPERTY) + @Column(name = DASHBOARD_TENANT_ID_PROPERTY) private UUID tenantId; @PartitionKey(value = 2) - @Column(name = ModelConstants.DASHBOARD_CUSTOMER_ID_PROPERTY) + @Column(name = DASHBOARD_CUSTOMER_ID_PROPERTY) private UUID customerId; - @Column(name = ModelConstants.DASHBOARD_TITLE_PROPERTY) + @Column(name = DASHBOARD_TITLE_PROPERTY) private String title; - @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + @Column(name = SEARCH_TEXT_PROPERTY) private String searchText; public DashboardInfoEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DeviceCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DeviceCredentialsEntity.java index 32864c64a2..3acfbad0fb 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DeviceCredentialsEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DeviceCredentialsEntity.java @@ -22,7 +22,6 @@ import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.security.DeviceCredentials; import org.thingsboard.server.common.data.security.DeviceCredentialsType; import org.thingsboard.server.dao.model.BaseEntity; -import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.type.DeviceCredentialsTypeCodec; import com.datastax.driver.core.utils.UUIDs; @@ -31,26 +30,28 @@ import com.datastax.driver.mapping.annotations.PartitionKey; import com.datastax.driver.mapping.annotations.Table; import com.datastax.driver.mapping.annotations.Transient; -@Table(name = ModelConstants.DEVICE_CREDENTIALS_COLUMN_FAMILY_NAME) +import static org.thingsboard.server.dao.model.ModelConstants.*; + +@Table(name = DEVICE_CREDENTIALS_COLUMN_FAMILY_NAME) public final class DeviceCredentialsEntity implements BaseEntity { @Transient private static final long serialVersionUID = -2667310560260623272L; @PartitionKey(value = 0) - @Column(name = ModelConstants.ID_PROPERTY) + @Column(name = ID_PROPERTY) private UUID id; - @Column(name = ModelConstants.DEVICE_CREDENTIALS_DEVICE_ID_PROPERTY) + @Column(name = DEVICE_CREDENTIALS_DEVICE_ID_PROPERTY) private UUID deviceId; - @Column(name = ModelConstants.DEVICE_CREDENTIALS_CREDENTIALS_TYPE_PROPERTY, codec = DeviceCredentialsTypeCodec.class) + @Column(name = DEVICE_CREDENTIALS_CREDENTIALS_TYPE_PROPERTY, codec = DeviceCredentialsTypeCodec.class) private DeviceCredentialsType credentialsType; - @Column(name = ModelConstants.DEVICE_CREDENTIALS_CREDENTIALS_ID_PROPERTY) + @Column(name = DEVICE_CREDENTIALS_CREDENTIALS_ID_PROPERTY) private String credentialsId; - @Column(name = ModelConstants.DEVICE_CREDENTIALS_CREDENTIALS_VALUE_PROPERTY) + @Column(name = DEVICE_CREDENTIALS_CREDENTIALS_VALUE_PROPERTY) private String credentialsValue; public DeviceCredentialsEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DeviceEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DeviceEntity.java index 70c9a36efe..8b210963ba 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DeviceEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/DeviceEntity.java @@ -25,37 +25,38 @@ import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.id.CustomerId; 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.model.type.JsonCodec; +import static org.thingsboard.server.dao.model.ModelConstants.*; + import java.util.UUID; -@Table(name = ModelConstants.DEVICE_COLUMN_FAMILY_NAME) +@Table(name = DEVICE_COLUMN_FAMILY_NAME) public final class DeviceEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = -1265181166886910152L; @PartitionKey(value = 0) - @Column(name = ModelConstants.ID_PROPERTY) + @Column(name = ID_PROPERTY) private UUID id; @PartitionKey(value = 1) - @Column(name = ModelConstants.DEVICE_TENANT_ID_PROPERTY) + @Column(name = DEVICE_TENANT_ID_PROPERTY) private UUID tenantId; @PartitionKey(value = 2) - @Column(name = ModelConstants.DEVICE_CUSTOMER_ID_PROPERTY) + @Column(name = DEVICE_CUSTOMER_ID_PROPERTY) private UUID customerId; - @Column(name = ModelConstants.DEVICE_NAME_PROPERTY) + @Column(name = DEVICE_NAME_PROPERTY) private String name; - @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + @Column(name = SEARCH_TEXT_PROPERTY) private String searchText; - @Column(name = ModelConstants.DEVICE_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) + @Column(name = DEVICE_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) private JsonNode additionalInfo; public DeviceEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/EventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/EventEntity.java index abfcfeffb0..a2987b1651 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/EventEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/EventEntity.java @@ -24,10 +24,11 @@ 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.model.ModelConstants; 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; /** @@ -35,36 +36,36 @@ import java.util.UUID; */ @Data @NoArgsConstructor -@Table(name = ModelConstants.DEVICE_COLUMN_FAMILY_NAME) +@Table(name = DEVICE_COLUMN_FAMILY_NAME) public class EventEntity implements BaseEntity { @Transient private static final long serialVersionUID = -1265181166886910153L; - @Column(name = ModelConstants.ID_PROPERTY) + @Column(name = ID_PROPERTY) private UUID id; @PartitionKey() - @Column(name = ModelConstants.EVENT_TENANT_ID_PROPERTY) + @Column(name = EVENT_TENANT_ID_PROPERTY) private UUID tenantId; @PartitionKey(value = 1) - @Column(name = ModelConstants.EVENT_ENTITY_TYPE_PROPERTY, codec = EntityTypeCodec.class) + @Column(name = EVENT_ENTITY_TYPE_PROPERTY, codec = EntityTypeCodec.class) private EntityType entityType; @PartitionKey(value = 2) - @Column(name = ModelConstants.EVENT_ENTITY_ID_PROPERTY) + @Column(name = EVENT_ENTITY_ID_PROPERTY) private UUID entityId; @ClusteringColumn() - @Column(name = ModelConstants.EVENT_TYPE_PROPERTY) + @Column(name = EVENT_TYPE_PROPERTY) private String eventType; @ClusteringColumn(value = 1) - @Column(name = ModelConstants.EVENT_UID_PROPERTY) + @Column(name = EVENT_UID_PROPERTY) private String eventUId; - @Column(name = ModelConstants.EVENT_BODY_PROPERTY, codec = JsonCodec.class) + @Column(name = EVENT_BODY_PROPERTY, codec = JsonCodec.class) private JsonNode body; public EventEntity(Event event) { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/PluginMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/PluginMetaDataEntity.java index caddacb340..4a0dca261c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/PluginMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/PluginMetaDataEntity.java @@ -22,50 +22,51 @@ import org.thingsboard.server.common.data.id.PluginId; import org.thingsboard.server.common.data.id.TenantId; 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.model.type.ComponentLifecycleStateCodec; import org.thingsboard.server.dao.model.type.JsonCodec; +import static org.thingsboard.server.dao.model.ModelConstants.*; + import java.util.Objects; import java.util.UUID; -@Table(name = ModelConstants.PLUGIN_COLUMN_FAMILY_NAME) +@Table(name = PLUGIN_COLUMN_FAMILY_NAME) public class PluginMetaDataEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = -5231612734979707866L; @PartitionKey - @Column(name = ModelConstants.ID_PROPERTY) + @Column(name = ID_PROPERTY) private UUID id; - @Column(name = ModelConstants.PLUGIN_API_TOKEN_PROPERTY) + @Column(name = PLUGIN_API_TOKEN_PROPERTY) private String apiToken; @ClusteringColumn - @Column(name = ModelConstants.PLUGIN_TENANT_ID_PROPERTY) + @Column(name = PLUGIN_TENANT_ID_PROPERTY) private UUID tenantId; - @Column(name = ModelConstants.PLUGIN_NAME_PROPERTY) + @Column(name = PLUGIN_NAME_PROPERTY) private String name; - @Column(name = ModelConstants.PLUGIN_CLASS_PROPERTY) + @Column(name = PLUGIN_CLASS_PROPERTY) private String clazz; - @Column(name = ModelConstants.PLUGIN_ACCESS_PROPERTY) + @Column(name = PLUGIN_ACCESS_PROPERTY) private boolean publicAccess; - @Column(name = ModelConstants.PLUGIN_STATE_PROPERTY, codec = ComponentLifecycleStateCodec.class) + @Column(name = PLUGIN_STATE_PROPERTY, codec = ComponentLifecycleStateCodec.class) private ComponentLifecycleState state; - @Column(name = ModelConstants.PLUGIN_CONFIGURATION_PROPERTY, codec = JsonCodec.class) + @Column(name = PLUGIN_CONFIGURATION_PROPERTY, codec = JsonCodec.class) private JsonNode configuration; - @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + @Column(name = SEARCH_TEXT_PROPERTY) private String searchText; - @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) + @Column(name = ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) private JsonNode additionalInfo; public PluginMetaDataEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleMetaDataEntity.java index 29d32fdb30..dea7661769 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/RuleMetaDataEntity.java @@ -26,43 +26,44 @@ import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.plugin.ComponentLifecycleState; 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.model.type.ComponentLifecycleStateCodec; import org.thingsboard.server.dao.model.type.JsonCodec; +import static org.thingsboard.server.dao.model.ModelConstants.*; + import javax.persistence.Transient; import java.util.Objects; import java.util.UUID; -@Table(name = ModelConstants.RULE_COLUMN_FAMILY_NAME) +@Table(name = RULE_COLUMN_FAMILY_NAME) public class RuleMetaDataEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = 4011728715100800304L; @PartitionKey - @Column(name = ModelConstants.ID_PROPERTY) + @Column(name = ID_PROPERTY) private UUID id; @ClusteringColumn - @Column(name = ModelConstants.RULE_TENANT_ID_PROPERTY) + @Column(name = RULE_TENANT_ID_PROPERTY) private UUID tenantId; - @Column(name = ModelConstants.RULE_NAME_PROPERTY) + @Column(name = RULE_NAME_PROPERTY) private String name; - @Column(name = ModelConstants.RULE_STATE_PROPERTY, codec = ComponentLifecycleStateCodec.class) + @Column(name = RULE_STATE_PROPERTY, codec = ComponentLifecycleStateCodec.class) private ComponentLifecycleState state; - @Column(name = ModelConstants.RULE_WEIGHT_PROPERTY) + @Column(name = RULE_WEIGHT_PROPERTY) private int weight; - @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + @Column(name = SEARCH_TEXT_PROPERTY) private String searchText; - @Column(name = ModelConstants.RULE_PLUGIN_TOKEN_PROPERTY) + @Column(name = RULE_PLUGIN_TOKEN_PROPERTY) private String pluginToken; - @Column(name = ModelConstants.RULE_FILTERS, codec = JsonCodec.class) + @Column(name = RULE_FILTERS, codec = JsonCodec.class) private JsonNode filters; - @Column(name = ModelConstants.RULE_PROCESSOR, codec = JsonCodec.class) + @Column(name = RULE_PROCESSOR, codec = JsonCodec.class) private JsonNode processor; - @Column(name = ModelConstants.RULE_ACTION, codec = JsonCodec.class) + @Column(name = RULE_ACTION, codec = JsonCodec.class) private JsonNode action; - @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) + @Column(name = ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) private JsonNode additionalInfo; public RuleMetaDataEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/TenantEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/TenantEntity.java index a6e3ae6efb..e97fee3cbf 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/TenantEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/TenantEntity.java @@ -19,7 +19,6 @@ import java.util.UUID; 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.model.type.JsonCodec; @@ -29,51 +28,52 @@ import com.datastax.driver.mapping.annotations.PartitionKey; import com.datastax.driver.mapping.annotations.Table; import com.datastax.driver.mapping.annotations.Transient; import com.fasterxml.jackson.databind.JsonNode; +import static org.thingsboard.server.dao.model.ModelConstants.*; -@Table(name = ModelConstants.TENANT_COLUMN_FAMILY_NAME) +@Table(name = TENANT_COLUMN_FAMILY_NAME) public final class TenantEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = -6198635547142409206L; @PartitionKey(value = 0) - @Column(name = ModelConstants.ID_PROPERTY) + @Column(name = ID_PROPERTY) private UUID id; - @Column(name = ModelConstants.TENANT_TITLE_PROPERTY) + @Column(name = TENANT_TITLE_PROPERTY) private String title; - @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + @Column(name = SEARCH_TEXT_PROPERTY) private String searchText; - @Column(name = ModelConstants.TENANT_REGION_PROPERTY) + @Column(name = TENANT_REGION_PROPERTY) private String region; - @Column(name = ModelConstants.COUNTRY_PROPERTY) + @Column(name = COUNTRY_PROPERTY) private String country; - @Column(name = ModelConstants.STATE_PROPERTY) + @Column(name = STATE_PROPERTY) private String state; - @Column(name = ModelConstants.CITY_PROPERTY) + @Column(name = CITY_PROPERTY) private String city; - @Column(name = ModelConstants.ADDRESS_PROPERTY) + @Column(name = ADDRESS_PROPERTY) private String address; - @Column(name = ModelConstants.ADDRESS2_PROPERTY) + @Column(name = ADDRESS2_PROPERTY) private String address2; - @Column(name = ModelConstants.ZIP_PROPERTY) + @Column(name = ZIP_PROPERTY) private String zip; - @Column(name = ModelConstants.PHONE_PROPERTY) + @Column(name = PHONE_PROPERTY) private String phone; - @Column(name = ModelConstants.EMAIL_PROPERTY) + @Column(name = EMAIL_PROPERTY) private String email; - @Column(name = ModelConstants.TENANT_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) + @Column(name = TENANT_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) private JsonNode additionalInfo; public TenantEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/UserCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/UserCredentialsEntity.java index d571d0fd22..8aab37dd3b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/UserCredentialsEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/UserCredentialsEntity.java @@ -27,31 +27,31 @@ import com.datastax.driver.mapping.annotations.PartitionKey; import com.datastax.driver.mapping.annotations.Table; import com.datastax.driver.mapping.annotations.Transient; import org.thingsboard.server.dao.model.BaseEntity; -import org.thingsboard.server.dao.model.ModelConstants; +import static org.thingsboard.server.dao.model.ModelConstants.*; -@Table(name = ModelConstants.USER_CREDENTIALS_COLUMN_FAMILY_NAME) +@Table(name = USER_CREDENTIALS_COLUMN_FAMILY_NAME) public final class UserCredentialsEntity implements BaseEntity { @Transient private static final long serialVersionUID = 1348221414123438374L; @PartitionKey(value = 0) - @Column(name = ModelConstants.ID_PROPERTY) + @Column(name = ID_PROPERTY) private UUID id; - @Column(name = ModelConstants.USER_CREDENTIALS_USER_ID_PROPERTY) + @Column(name = USER_CREDENTIALS_USER_ID_PROPERTY) private UUID userId; - @Column(name = ModelConstants.USER_CREDENTIALS_ENABLED_PROPERTY) + @Column(name = USER_CREDENTIALS_ENABLED_PROPERTY) private boolean enabled; - @Column(name = ModelConstants.USER_CREDENTIALS_PASSWORD_PROPERTY) + @Column(name = USER_CREDENTIALS_PASSWORD_PROPERTY) private String password; - @Column(name = ModelConstants.USER_CREDENTIALS_ACTIVATE_TOKEN_PROPERTY) + @Column(name = USER_CREDENTIALS_ACTIVATE_TOKEN_PROPERTY) private String activateToken; - @Column(name = ModelConstants.USER_CREDENTIALS_RESET_TOKEN_PROPERTY) + @Column(name = USER_CREDENTIALS_RESET_TOKEN_PROPERTY) private String resetToken; public UserCredentialsEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/UserEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/UserEntity.java index 91b9f3cd57..29beadd592 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/UserEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/UserEntity.java @@ -22,7 +22,6 @@ import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.TenantId; 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.model.type.AuthorityCodec; import org.thingsboard.server.dao.model.type.JsonCodec; @@ -33,42 +32,43 @@ import com.datastax.driver.mapping.annotations.PartitionKey; import com.datastax.driver.mapping.annotations.Table; import com.datastax.driver.mapping.annotations.Transient; import com.fasterxml.jackson.databind.JsonNode; +import static org.thingsboard.server.dao.model.ModelConstants.*; -@Table(name = ModelConstants.USER_COLUMN_FAMILY_NAME) +@Table(name = USER_COLUMN_FAMILY_NAME) public final class UserEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = -7740338274987723489L; @PartitionKey(value = 0) - @Column(name = ModelConstants.ID_PROPERTY) + @Column(name = ID_PROPERTY) private UUID id; @PartitionKey(value = 1) - @Column(name = ModelConstants.USER_TENANT_ID_PROPERTY) + @Column(name = USER_TENANT_ID_PROPERTY) private UUID tenantId; @PartitionKey(value = 2) - @Column(name = ModelConstants.USER_CUSTOMER_ID_PROPERTY) + @Column(name = USER_CUSTOMER_ID_PROPERTY) private UUID customerId; @PartitionKey(value = 3) - @Column(name = ModelConstants.USER_AUTHORITY_PROPERTY, codec = AuthorityCodec.class) + @Column(name = USER_AUTHORITY_PROPERTY, codec = AuthorityCodec.class) private Authority authority; - @Column(name = ModelConstants.USER_EMAIL_PROPERTY) + @Column(name = USER_EMAIL_PROPERTY) private String email; - @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + @Column(name = SEARCH_TEXT_PROPERTY) private String searchText; - @Column(name = ModelConstants.USER_FIRST_NAME_PROPERTY) + @Column(name = USER_FIRST_NAME_PROPERTY) private String firstName; - @Column(name = ModelConstants.USER_LAST_NAME_PROPERTY) + @Column(name = USER_LAST_NAME_PROPERTY) private String lastName; - @Column(name = ModelConstants.USER_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) + @Column(name = USER_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class) private JsonNode additionalInfo; public UserEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/WidgetTypeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/WidgetTypeEntity.java index 4fd60f3889..47db143eba 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/WidgetTypeEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/WidgetTypeEntity.java @@ -25,36 +25,36 @@ import org.thingsboard.server.common.data.id.TenantId; 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.model.type.JsonCodec; +import static org.thingsboard.server.dao.model.ModelConstants.*; import java.util.UUID; -@Table(name = ModelConstants.WIDGET_TYPE_COLUMN_FAMILY_NAME) +@Table(name = WIDGET_TYPE_COLUMN_FAMILY_NAME) public final class WidgetTypeEntity implements BaseEntity { @Transient private static final long serialVersionUID = 3591054897680176342L; @PartitionKey(value = 0) - @Column(name = ModelConstants.ID_PROPERTY) + @Column(name = ID_PROPERTY) private UUID id; @PartitionKey(value = 1) - @Column(name = ModelConstants.WIDGET_TYPE_TENANT_ID_PROPERTY) + @Column(name = WIDGET_TYPE_TENANT_ID_PROPERTY) private UUID tenantId; @PartitionKey(value = 2) - @Column(name = ModelConstants.WIDGET_TYPE_BUNDLE_ALIAS_PROPERTY) + @Column(name = WIDGET_TYPE_BUNDLE_ALIAS_PROPERTY) private String bundleAlias; - @Column(name = ModelConstants.WIDGET_TYPE_ALIAS_PROPERTY) + @Column(name = WIDGET_TYPE_ALIAS_PROPERTY) private String alias; - @Column(name = ModelConstants.WIDGET_TYPE_NAME_PROPERTY) + @Column(name = WIDGET_TYPE_NAME_PROPERTY) private String name; - @Column(name = ModelConstants.WIDGET_TYPE_DESCRIPTOR_PROPERTY, codec = JsonCodec.class) + @Column(name = WIDGET_TYPE_DESCRIPTOR_PROPERTY, codec = JsonCodec.class) private JsonNode descriptor; public WidgetTypeEntity() { @@ -157,7 +157,7 @@ public final class WidgetTypeEntity implements BaseEntity { sb.append(", tenantId=").append(tenantId); sb.append(", bundleAlias='").append(bundleAlias).append('\''); sb.append(", alias='").append(alias).append('\''); - sb.append(", name='").append(name).append('\''); + sb.append(", name ='").append(name).append('\''); sb.append(", descriptor=").append(descriptor); sb.append('}'); return sb.toString(); diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/WidgetsBundleEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/WidgetsBundleEntity.java index 889f1d6c3d..edec5bd3dc 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/WidgetsBundleEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/WidgetsBundleEntity.java @@ -24,36 +24,36 @@ import com.datastax.driver.mapping.annotations.Transient; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.WidgetsBundleId; import org.thingsboard.server.common.data.widget.WidgetsBundle; -import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.SearchTextEntity; +import static org.thingsboard.server.dao.model.ModelConstants.*; import java.nio.ByteBuffer; import java.util.UUID; -@Table(name = ModelConstants.WIDGETS_BUNDLE_COLUMN_FAMILY_NAME) +@Table(name = WIDGETS_BUNDLE_COLUMN_FAMILY_NAME) public final class WidgetsBundleEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = -8842195928585650849L; @PartitionKey(value = 0) - @Column(name = ModelConstants.ID_PROPERTY) + @Column(name = ID_PROPERTY) private UUID id; @PartitionKey(value = 1) - @Column(name = ModelConstants.WIDGETS_BUNDLE_TENANT_ID_PROPERTY) + @Column(name = WIDGETS_BUNDLE_TENANT_ID_PROPERTY) private UUID tenantId; - @Column(name = ModelConstants.WIDGETS_BUNDLE_ALIAS_PROPERTY) + @Column(name = WIDGETS_BUNDLE_ALIAS_PROPERTY) private String alias; - @Column(name = ModelConstants.WIDGETS_BUNDLE_TITLE_PROPERTY) + @Column(name = WIDGETS_BUNDLE_TITLE_PROPERTY) private String title; - @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) + @Column(name = SEARCH_TEXT_PROPERTY) private String searchText; - @Column(name = ModelConstants.WIDGETS_BUNDLE_IMAGE_PROPERTY) + @Column(name = WIDGETS_BUNDLE_IMAGE_PROPERTY) private ByteBuffer image; public WidgetsBundleEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java index a92e607472..408c4f334f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java @@ -33,7 +33,7 @@ import java.util.UUID; @Slf4j public abstract class JpaAbstractDao, D> implements Dao { - protected abstract Class getColumnFamilyClass(); + protected abstract Class getEntityClass(); protected abstract String getColumnFamilyName(); @@ -47,7 +47,7 @@ public abstract class JpaAbstractDao, D> implements Dao< public D save(D domain) { E entity; try { - entity = getColumnFamilyClass().getConstructor(domain.getClass()).newInstance(domain); + entity = getEntityClass().getConstructor(domain.getClass()).newInstance(domain); } catch (Exception e) { log.error("Can't create entity for domain object {}", domain, e); throw new IllegalArgumentException("Can't create entity for domain object {" + domain + "}", e); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java index 8fb14d7cff..551f658af1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java @@ -19,10 +19,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.User; +import org.thingsboard.server.common.data.page.TextPageLink; +import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.sql.UserEntity; import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.user.UserDao; +import java.util.List; import java.util.UUID; /** @@ -30,13 +34,13 @@ import java.util.UUID; */ @Component @ConditionalOnProperty(prefix="sql", value="enabled",havingValue = "true", matchIfMissing = false) -public class JpaUserDao extends JpaAbstractDao { +public class JpaUserDao extends JpaAbstractDao implements UserDao { @Autowired private UserRepository userRepository; @Override - protected Class getColumnFamilyClass() { + protected Class getEntityClass() { return UserEntity.class; } @@ -49,4 +53,19 @@ public class JpaUserDao extends JpaAbstractDao { protected JpaRepository getCrudRepository() { return userRepository; } + + @Override + public User findByEmail(String email) { + return DaoUtil.getData(userRepository.findByEmail(email)); + } + + @Override + public List findTenantAdmins(UUID tenantId, TextPageLink pageLink) { + return null; + } + + @Override + public List findCustomerUsers(UUID tenantId, UUID customerId, TextPageLink pageLink) { + return null; + } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java index 51364c798b..a3bcfa6d1d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java @@ -15,12 +15,18 @@ */ package org.thingsboard.server.dao.sql.user; +import org.thingsboard.server.common.data.User; +import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.dao.model.sql.UserEntity; +import java.util.List; import java.util.UUID; /** * @author Valerii Sosliuk */ public interface UserRepository extends JpaRepository { + + UserEntity findByEmail(String email); + } From 148e4ae7e81af03bd4ca497fbc75463129fedfa6 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Mon, 17 Apr 2017 12:21:12 +0300 Subject: [PATCH 06/69] Ability to ignore loading state for some device API calls --- ui/src/app/api/device.service.js | 8 ++++---- ui/src/app/global-interceptor.service.js | 17 ++++++++++++----- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ui/src/app/api/device.service.js b/ui/src/app/api/device.service.js index 2c4a100ec4..b369e90b57 100644 --- a/ui/src/app/api/device.service.js +++ b/ui/src/app/api/device.service.js @@ -51,7 +51,7 @@ function DeviceService($http, $q, $filter, userService, telemetryWebsocketServic return service; - function getTenantDevices(pageLink) { + function getTenantDevices(pageLink, config) { var deferred = $q.defer(); var url = '/api/tenant/devices?limit=' + pageLink.limit; if (angular.isDefined(pageLink.textSearch)) { @@ -63,7 +63,7 @@ function DeviceService($http, $q, $filter, userService, telemetryWebsocketServic if (angular.isDefined(pageLink.textOffset)) { url += '&textOffset=' + pageLink.textOffset; } - $http.get(url, null).then(function success(response) { + $http.get(url, config).then(function success(response) { deferred.resolve(response.data); }, function fail() { deferred.reject(); @@ -425,7 +425,7 @@ function DeviceService($http, $q, $filter, userService, telemetryWebsocketServic } } - function getDeviceAttributes(deviceId, attributeScope, query, successCallback) { + function getDeviceAttributes(deviceId, attributeScope, query, successCallback, config) { var deferred = $q.defer(); var subscriptionId = deviceId + attributeScope; var das = deviceAttributesSubscriptionMap[subscriptionId]; @@ -445,7 +445,7 @@ function DeviceService($http, $q, $filter, userService, telemetryWebsocketServic } } else { var url = '/api/plugins/telemetry/' + deviceId + '/values/attributes/' + attributeScope; - $http.get(url, null).then(function success(response) { + $http.get(url, config).then(function success(response) { processDeviceAttributes(response.data, query, deferred, successCallback); }, function fail() { deferred.reject(); diff --git a/ui/src/app/global-interceptor.service.js b/ui/src/app/global-interceptor.service.js index 8ba6c04bbe..86cd676940 100644 --- a/ui/src/app/global-interceptor.service.js +++ b/ui/src/app/global-interceptor.service.js @@ -111,11 +111,12 @@ export default function GlobalInterceptor($rootScope, $q, $injector) { function request(config) { var rejected = false; if (config.url.startsWith('/api/')) { - $rootScope.loading = !isInternalUrlPrefix(config.url); + var isLoading = !isInternalUrlPrefix(config.url); + updateLoadingState(config, isLoading); if (isTokenBasedAuthEntryPoint(config.url)) { if (!getUserService().updateAuthorizationHeader(config.headers) && !getUserService().refreshTokenPending()) { - $rootScope.loading = false; + updateLoadingState(config, false); rejected = true; getUserService().clearJwtToken(false); return $q.reject({ data: {message: getTranslate().instant('access.unauthorized')}, status: 401, config: config}); @@ -131,21 +132,21 @@ export default function GlobalInterceptor($rootScope, $q, $injector) { function requestError(rejection) { if (rejection.config.url.startsWith('/api/')) { - $rootScope.loading = false; + updateLoadingState(rejection.config, false); } return $q.reject(rejection); } function response(response) { if (response.config.url.startsWith('/api/')) { - $rootScope.loading = false; + updateLoadingState(response.config, false); } return response; } function responseError(rejection) { if (rejection.config.url.startsWith('/api/')) { - $rootScope.loading = false; + updateLoadingState(rejection.config, false); } var unhandled = false; var ignoreErrors = rejection.config.ignoreErrors; @@ -184,4 +185,10 @@ export default function GlobalInterceptor($rootScope, $q, $injector) { } return $q.reject(rejection); } + + function updateLoadingState(config, isLoading) { + if (!config || angular.isUndefined(config.ignoreLoading) || !config.ignoreLoading) { + $rootScope.loading = isLoading; + } + } } From 58cbb1165c276c211b865d6912e2e21262f127a7 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Mon, 17 Apr 2017 15:59:42 +0300 Subject: [PATCH 07/69] TB-46: Add option to make flot time-series graphs smooth --- ui/package.json | 1 + ui/src/app/widget/lib/flot-widget.js | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ui/package.json b/ui/package.json index 6e5e6eac19..5f00611bff 100644 --- a/ui/package.json +++ b/ui/package.json @@ -49,6 +49,7 @@ "clipboard": "^1.5.15", "compass-sass-mixins": "^0.12.7", "flot": "git://github.com/flot/flot.git#0.9-work", + "flot-curvedlines": "git://github.com/MichaelZinsmaier/CurvedLines.git#master", "font-awesome": "^4.6.3", "javascript-detect-element-resize": "^0.5.3", "jquery": "^3.1.0", diff --git a/ui/src/app/widget/lib/flot-widget.js b/ui/src/app/widget/lib/flot-widget.js index 446881de8b..4cc2192bea 100644 --- a/ui/src/app/widget/lib/flot-widget.js +++ b/ui/src/app/widget/lib/flot-widget.js @@ -24,6 +24,7 @@ import 'flot/src/plugins/jquery.flot.selection'; import 'flot/src/plugins/jquery.flot.pie'; import 'flot/src/plugins/jquery.flot.crosshair'; import 'flot/src/plugins/jquery.flot.stack'; +import 'flot.curvedlines/curvedLines'; /* eslint-disable angular/angularelement */ export default class TbFlot { @@ -31,6 +32,7 @@ export default class TbFlot { this.ctx = ctx; this.chartType = chartType || 'line'; + var settings = ctx.settings; var colors = []; for (var i = 0; i < ctx.data.length; i++) { @@ -53,6 +55,12 @@ export default class TbFlot { series.points.radius = 3; } + if (this.chartType === 'line' && settings.smoothLines && !series.points.show) { + series.curvedLines = { + apply: true + } + } + var lineColor = tinycolor(series.dataKey.color); lineColor.setAlpha(.75); @@ -160,7 +168,6 @@ export default class TbFlot { }; } - var settings = ctx.settings; ctx.trackDecimals = angular.isDefined(settings.decimals) ? settings.decimals : ctx.decimals; @@ -268,6 +275,13 @@ export default class TbFlot { stack: settings.stack === true } + if (this.chartType === 'line' && settings.smoothLines) { + options.series.curvedLines = { + active: true, + monotonicFit: true + } + } + if (this.chartType === 'bar') { options.series.lines = { show: false, @@ -473,6 +487,11 @@ export default class TbFlot { "type": "boolean", "default": false }, + "smoothLines": { + "title": "Display smooth (curved) lines", + "type": "boolean", + "default": false + }, "shadowSize": { "title": "Shadow size", "type": "number", @@ -591,6 +610,7 @@ export default class TbFlot { }, "form": [ "stack", + "smoothLines", "shadowSize", { "key": "fontColor", @@ -910,7 +930,7 @@ export default class TbFlot { value = series.data[hoverIndex][1]; } - if (series.stack) { + if (series.stack || (series.curvedLines && series.curvedLines.apply)) { hoverIndex = this.findHoverIndexFromDataPoints(pos.x, series, hoverIndex); } results.seriesHover.push({ From c692699f7bda203731055c6777e1d8347d9b099c Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Mon, 17 Apr 2017 19:07:32 +0300 Subject: [PATCH 08/69] TB-47: Show assigned customer title in device card. --- .../server/controller/CustomerController.java | 14 +++++ ui/src/app/api/customer.service.js | 12 +++++ ui/src/app/components/grid.directive.js | 53 +++++++++++++++++-- ui/src/app/components/grid.tpl.html | 2 +- ui/src/app/device/device-card.tpl.html | 4 +- ui/src/app/device/device.controller.js | 32 ++++++++++- ui/src/app/device/index.js | 3 +- 7 files changed, 110 insertions(+), 10 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/controller/CustomerController.java b/application/src/main/java/org/thingsboard/server/controller/CustomerController.java index 4d7c7cd49d..96458cf273 100644 --- a/application/src/main/java/org/thingsboard/server/controller/CustomerController.java +++ b/application/src/main/java/org/thingsboard/server/controller/CustomerController.java @@ -42,6 +42,20 @@ public class CustomerController extends BaseController { } } + @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')") + @RequestMapping(value = "/customer/{customerId}/title", method = RequestMethod.GET, produces = "application/text") + @ResponseBody + public String getCustomerTitleById(@PathVariable("customerId") String strCustomerId) throws ThingsboardException { + checkParameter("customerId", strCustomerId); + try { + CustomerId customerId = new CustomerId(toUUID(strCustomerId)); + Customer customer = checkCustomerId(customerId); + return customer.getTitle(); + } catch (Exception e) { + throw handleException(e); + } + } + @PreAuthorize("hasAuthority('TENANT_ADMIN')") @RequestMapping(value = "/customer", method = RequestMethod.POST) @ResponseBody diff --git a/ui/src/app/api/customer.service.js b/ui/src/app/api/customer.service.js index 5524e91c04..133021bc40 100644 --- a/ui/src/app/api/customer.service.js +++ b/ui/src/app/api/customer.service.js @@ -23,6 +23,7 @@ function CustomerService($http, $q) { var service = { getCustomers: getCustomers, getCustomer: getCustomer, + getCustomerTitle: getCustomerTitle, deleteCustomer: deleteCustomer, saveCustomer: saveCustomer } @@ -60,6 +61,17 @@ function CustomerService($http, $q) { return deferred.promise; } + function getCustomerTitle(customerId) { + var deferred = $q.defer(); + var url = '/api/customer/' + customerId + '/title'; + $http.get(url, null).then(function success(response) { + deferred.resolve(response.data); + }, function fail(response) { + deferred.reject(response.data); + }); + return deferred.promise; + } + function saveCustomer(customer) { var deferred = $q.defer(); var url = '/api/customer'; diff --git a/ui/src/app/components/grid.directive.js b/ui/src/app/components/grid.directive.js index 7f610dc847..f6b66ee67e 100644 --- a/ui/src/app/components/grid.directive.js +++ b/ui/src/app/components/grid.directive.js @@ -26,6 +26,7 @@ import gridTemplate from './grid.tpl.html'; export default angular.module('thingsboard.directives.grid', [thingsboardScopeElement, thingsboardDetailsSidenav]) .directive('tbGrid', Grid) + .controller('ItemCardController', ItemCardController) .directive('tbGridCardContent', GridCardContent) .filter('range', RangeFilter) .name; @@ -44,14 +45,52 @@ function RangeFilter() { } /*@ngInject*/ -function GridCardContent($compile) { +function ItemCardController() { + + var vm = this; //eslint-disable-line + +} + +/*@ngInject*/ +function GridCardContent($compile, $controller) { var linker = function(scope, element) { + + var controllerInstance = null; + scope.$watch('itemTemplate', - function(value) { - element.html(value); - $compile(element.contents())(scope); + function() { + initContent(); + } + ); + scope.$watch('itemController', + function() { + initContent(); } ); + scope.$watch('parentCtl', + function() { + controllerInstance.parentCtl = scope.parentCtl; + } + ); + scope.$watch('item', + function() { + controllerInstance.item = scope.item; + } + ); + + function initContent() { + if (scope.itemTemplate && scope.itemController && !controllerInstance) { + element.html(scope.itemTemplate); + var locals = {}; + angular.extend(locals, {$scope: scope, $element: element}); + var controller = $controller(scope.itemController, locals, true, 'vm'); + controller.instance = controller(); + controllerInstance = controller.instance; + controllerInstance.item = scope.item; + controllerInstance.parentCtl = scope.parentCtl; + $compile(element.contents())(scope); + } + } }; return { @@ -61,6 +100,7 @@ function GridCardContent($compile) { parentCtl: "=parentCtl", gridCtl: "=gridCtl", itemTemplate: "=itemTemplate", + itemController: "=itemController", item: "=item" } }; @@ -291,6 +331,11 @@ function GridController($scope, $state, $mdDialog, $document, $q, $timeout, $tra } else if (vm.config.itemCardTemplateUrl) { vm.itemCardTemplate = $templateCache.get(vm.config.itemCardTemplateUrl); } + if (vm.config.itemCardController) { + vm.itemCardController = vm.config.itemCardController; + } else { + vm.itemCardController = 'ItemCardController'; + } vm.parentCtl = vm.config.parentCtl || vm; diff --git a/ui/src/app/components/grid.tpl.html b/ui/src/app/components/grid.tpl.html index 05eb35016a..1cf0085576 100644 --- a/ui/src/app/components/grid.tpl.html +++ b/ui/src/app/components/grid.tpl.html @@ -43,7 +43,7 @@ - + -

device.assignedToCustomer
+
{{'device.assignedToCustomer' | translate}} '{{vm.customerTitle}}'
diff --git a/ui/src/app/device/device.controller.js b/ui/src/app/device/device.controller.js index d111df8acb..4a054e2896 100644 --- a/ui/src/app/device/device.controller.js +++ b/ui/src/app/device/device.controller.js @@ -24,7 +24,36 @@ import deviceCredentialsTemplate from './device-credentials.tpl.html'; /* eslint-enable import/no-unresolved, import/default */ /*@ngInject*/ -export default function DeviceController(userService, deviceService, customerService, $scope, $controller, $state, $stateParams, $document, $mdDialog, $q, $translate, types) { +export function DeviceCardController($scope, types, customerService) { + + var vm = this; + + vm.types = types; + + vm.isAssignedToCustomer = function() { + if (vm.item && vm.item.customerId && vm.parentCtl.devicesScope === 'tenant', + vm.item.customerId.id != vm.types.id.nullUid) { + return true; + } + return false; + } + + $scope.$watch('vm.item', + function() { + if (vm.item && vm.item.customerId && vm.item.customerId.id != vm.types.id.nullUid) { + customerService.getCustomerTitle(vm.item.customerId.id).then( + function success(title) { + vm.customerTitle = title; + } + ); + } + } + ); +} + + +/*@ngInject*/ +export function DeviceController(userService, deviceService, customerService, $scope, $controller, $state, $stateParams, $document, $mdDialog, $q, $translate, types) { var customerId = $stateParams.customerId; @@ -47,6 +76,7 @@ export default function DeviceController(userService, deviceService, customerSer getItemTitleFunc: getDeviceTitle, + itemCardController: 'DeviceCardController', itemCardTemplateUrl: deviceCard, parentCtl: vm, diff --git a/ui/src/app/device/index.js b/ui/src/app/device/index.js index 611e664837..b84497aa21 100644 --- a/ui/src/app/device/index.js +++ b/ui/src/app/device/index.js @@ -21,7 +21,7 @@ import thingsboardApiDevice from '../api/device.service'; import thingsboardApiCustomer from '../api/customer.service'; import DeviceRoutes from './device.routes'; -import DeviceController from './device.controller'; +import {DeviceController, DeviceCardController} from './device.controller'; import AssignDeviceToCustomerController from './assign-to-customer.controller'; import AddDevicesToCustomerController from './add-devices-to-customer.controller'; import ManageDeviceCredentialsController from './device-credentials.controller'; @@ -40,6 +40,7 @@ export default angular.module('thingsboard.device', [ ]) .config(DeviceRoutes) .controller('DeviceController', DeviceController) + .controller('DeviceCardController', DeviceCardController) .controller('AssignDeviceToCustomerController', AssignDeviceToCustomerController) .controller('AddDevicesToCustomerController', AddDevicesToCustomerController) .controller('ManageDeviceCredentialsController', ManageDeviceCredentialsController) From d530a98b8e405e08d05e730263f97ae95fadc17e Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Mon, 17 Apr 2017 19:59:03 +0300 Subject: [PATCH 09/69] TB-48: Show assigned customer title in dashboard card. --- ui/src/app/dashboard/dashboard-card.tpl.html | 5 ++- ui/src/app/dashboard/dashboards.controller.js | 31 ++++++++++++++++++- ui/src/app/dashboard/index.js | 3 +- ui/src/app/device/device.controller.js | 4 +-- 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/ui/src/app/dashboard/dashboard-card.tpl.html b/ui/src/app/dashboard/dashboard-card.tpl.html index 9cb8a4bd81..9f6cd00b7a 100644 --- a/ui/src/app/dashboard/dashboard-card.tpl.html +++ b/ui/src/app/dashboard/dashboard-card.tpl.html @@ -15,6 +15,5 @@ limitations under the License. --> -
dashboard.assignedToCustomer
+
{{'dashboard.assignedToCustomer' | translate}} '{{vm.customerTitle}}'
+ diff --git a/ui/src/app/dashboard/dashboards.controller.js b/ui/src/app/dashboard/dashboards.controller.js index b006d95981..3ef96a7198 100644 --- a/ui/src/app/dashboard/dashboards.controller.js +++ b/ui/src/app/dashboard/dashboards.controller.js @@ -23,7 +23,35 @@ import addDashboardsToCustomerTemplate from './add-dashboards-to-customer.tpl.ht /* eslint-enable import/no-unresolved, import/default */ /*@ngInject*/ -export default function DashboardsController(userService, dashboardService, customerService, importExport, types, $scope, $controller, +export function DashboardCardController($scope, types, customerService) { + + var vm = this; + + vm.types = types; + + vm.isAssignedToCustomer = function() { + if (vm.item && vm.item.customerId && vm.parentCtl.dashboardsScope === 'tenant' && + vm.item.customerId.id != vm.types.id.nullUid) { + return true; + } + return false; + } + + $scope.$watch('vm.item', + function() { + if (vm.isAssignedToCustomer()) { + customerService.getCustomerTitle(vm.item.customerId.id).then( + function success(title) { + vm.customerTitle = title; + } + ); + } + } + ); +} + +/*@ngInject*/ +export function DashboardsController(userService, dashboardService, customerService, importExport, types, $scope, $controller, $state, $stateParams, $mdDialog, $document, $q, $translate) { var customerId = $stateParams.customerId; @@ -58,6 +86,7 @@ export default function DashboardsController(userService, dashboardService, cust clickItemFunc: openDashboard, getItemTitleFunc: getDashboardTitle, + itemCardController: 'DashboardCardController', itemCardTemplateUrl: dashboardCard, parentCtl: vm, diff --git a/ui/src/app/dashboard/index.js b/ui/src/app/dashboard/index.js index 83dc850c6d..dc74c76ed4 100644 --- a/ui/src/app/dashboard/index.js +++ b/ui/src/app/dashboard/index.js @@ -35,7 +35,7 @@ import thingsboardItemBuffer from '../services/item-buffer.service'; import thingsboardImportExport from '../import-export'; import DashboardRoutes from './dashboard.routes'; -import DashboardsController from './dashboards.controller'; +import {DashboardsController, DashboardCardController} from './dashboards.controller'; import DashboardController from './dashboard.controller'; import DeviceAliasesController from './device-aliases.controller'; import AliasesDeviceSelectPanelController from './aliases-device-select-panel.controller'; @@ -68,6 +68,7 @@ export default angular.module('thingsboard.dashboard', [ ]) .config(DashboardRoutes) .controller('DashboardsController', DashboardsController) + .controller('DashboardCardController', DashboardCardController) .controller('DashboardController', DashboardController) .controller('DeviceAliasesController', DeviceAliasesController) .controller('AliasesDeviceSelectPanelController', AliasesDeviceSelectPanelController) diff --git a/ui/src/app/device/device.controller.js b/ui/src/app/device/device.controller.js index 4a054e2896..4de12bb3a4 100644 --- a/ui/src/app/device/device.controller.js +++ b/ui/src/app/device/device.controller.js @@ -31,7 +31,7 @@ export function DeviceCardController($scope, types, customerService) { vm.types = types; vm.isAssignedToCustomer = function() { - if (vm.item && vm.item.customerId && vm.parentCtl.devicesScope === 'tenant', + if (vm.item && vm.item.customerId && vm.parentCtl.devicesScope === 'tenant' && vm.item.customerId.id != vm.types.id.nullUid) { return true; } @@ -40,7 +40,7 @@ export function DeviceCardController($scope, types, customerService) { $scope.$watch('vm.item', function() { - if (vm.item && vm.item.customerId && vm.item.customerId.id != vm.types.id.nullUid) { + if (vm.isAssignedToCustomer()) { customerService.getCustomerTitle(vm.item.customerId.id).then( function success(title) { vm.customerTitle = title; From c9a8ddb16b3056bc0e7f20372b2d8409f7a7d6e8 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Mon, 17 Apr 2017 20:22:16 +0300 Subject: [PATCH 10/69] TB-49: Add back navigation ability in customer profile view in full-screen mode. --- ui/src/app/components/grid.directive.js | 78 +++++++++++++++---------- ui/src/app/layout/home.controller.js | 7 ++- ui/src/app/layout/home.tpl.html | 4 ++ 3 files changed, 56 insertions(+), 33 deletions(-) diff --git a/ui/src/app/components/grid.directive.js b/ui/src/app/components/grid.directive.js index f6b66ee67e..56644009c8 100644 --- a/ui/src/app/components/grid.directive.js +++ b/ui/src/app/components/grid.directive.js @@ -211,26 +211,31 @@ function GridController($scope, $state, $mdDialog, $document, $q, $timeout, $tra vm.items.pending = true; promise.then( function success(items) { - vm.items.data = vm.items.data.concat(items.data); - var startIndex = vm.items.data.length - items.data.length; - var endIndex = vm.items.data.length; - for (var i = startIndex; i < endIndex; i++) { - var item = vm.items.data[i]; - item.index = i; - var row = Math.floor(i / vm.columns); - var itemRow = vm.items.rowData[row]; - if (!itemRow) { - itemRow = []; - vm.items.rowData.push(itemRow); + if (vm.items.reloadPending) { + vm.items.pending = false; + reload(); + } else { + vm.items.data = vm.items.data.concat(items.data); + var startIndex = vm.items.data.length - items.data.length; + var endIndex = vm.items.data.length; + for (var i = startIndex; i < endIndex; i++) { + var item = vm.items.data[i]; + item.index = i; + var row = Math.floor(i / vm.columns); + var itemRow = vm.items.rowData[row]; + if (!itemRow) { + itemRow = []; + vm.items.rowData.push(itemRow); + } + itemRow.push(item); } - itemRow.push(item); - } - vm.items.nextPageLink = items.nextPageLink; - vm.items.hasNext = items.hasNext; - if (vm.items.hasNext) { - vm.items.nextPageLink.limit = pageSize; + vm.items.nextPageLink = items.nextPageLink; + vm.items.hasNext = items.hasNext; + if (vm.items.hasNext) { + vm.items.nextPageLink.limit = pageSize; + } + vm.items.pending = false; } - vm.items.pending = false; }, function fail() { vm.items.hasNext = false; @@ -425,26 +430,35 @@ function GridController($scope, $state, $mdDialog, $document, $q, $timeout, $tra } $scope.$on('searchTextUpdated', function () { - vm.items = { - data: [], - rowData: [], - nextPageLink: { - limit: pageSize, - textSearch: $scope.searchConfig.searchText - }, - selections: {}, - selectedCount: 0, - hasNext: true, - pending: false - }; - vm.detailsConfig.isDetailsOpen = false; - vm.itemRows.getItemAtIndex(pageSize); + reload(); }); vm.onGridInited(vm); vm.itemRows.getItemAtIndex(pageSize); + function reload() { + if (vm.items && vm.items.pending) { + vm.items.reloadPending = true; + } else { + vm.items = { + data: [], + rowData: [], + nextPageLink: { + limit: pageSize, + textSearch: $scope.searchConfig.searchText + }, + selections: {}, + selectedCount: 0, + hasNext: true, + pending: false + }; + vm.detailsConfig.isDetailsOpen = false; + vm.items.reloadPending = false; + vm.itemRows.getItemAtIndex(pageSize); + } + } + function refreshList() { $state.go($state.current, vm.refreshParamsFunc(), {reload: true}); } diff --git a/ui/src/app/layout/home.controller.js b/ui/src/app/layout/home.controller.js index 290cacf9a1..4979501085 100644 --- a/ui/src/app/layout/home.controller.js +++ b/ui/src/app/layout/home.controller.js @@ -26,7 +26,7 @@ import logoSvg from '../../svg/logo_title_white.svg'; /*@ngInject*/ export default function HomeController(loginService, userService, deviceService, Fullscreen, $scope, $element, $rootScope, $document, $state, - $log, $mdMedia, $animate, $timeout) { + $window, $log, $mdMedia, $animate, $timeout) { var siteSideNav = $('.tb-site-sidenav', $element); @@ -48,6 +48,7 @@ export default function HomeController(loginService, userService, deviceService, vm.displaySearchMode = displaySearchMode; vm.openSidenav = openSidenav; + vm.goBack = goBack; vm.searchTextUpdated = searchTextUpdated; vm.sidenavClicked = sidenavClicked; vm.toggleFullscreen = toggleFullscreen; @@ -104,6 +105,10 @@ export default function HomeController(loginService, userService, deviceService, vm.isShowSidenav = true; } + function goBack() { + $window.history.back(); + } + function closeSidenav() { vm.isShowSidenav = false; } diff --git a/ui/src/app/layout/home.tpl.html b/ui/src/app/layout/home.tpl.html index 31c8e7fad9..bfb37eb3cd 100644 --- a/ui/src/app/layout/home.tpl.html +++ b/ui/src/app/layout/home.tpl.html @@ -45,6 +45,10 @@ class="md-icon-button" ng-click="vm.openSidenav()" aria-label="{{ 'home.menu' | translate }}" ng-class="{'tb-invisible': vm.displaySearchMode()}"> menu + + arrow_back + arrow_back From 12f0fd6c9a9f00eb19b7c59a341d71145e581eef Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Mon, 17 Apr 2017 20:45:29 +0300 Subject: [PATCH 11/69] TB-52: Fix improper legend values selection/deselection for multiple datasources. --- ui/src/app/components/widget.controller.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/src/app/components/widget.controller.js b/ui/src/app/components/widget.controller.js index 6307a87e1a..bf500b1746 100644 --- a/ui/src/app/components/widget.controller.js +++ b/ui/src/app/components/widget.controller.js @@ -341,6 +341,7 @@ export default function WidgetController($scope, $timeout, $window, $element, $q $scope.legendConfig.showTotal === true); if (widget.type !== types.widgetType.rpc.value && widget.type !== types.widgetType.static.value) { + var dataIndex = 0; for (var i = 0; i < widgetContext.datasources.length; i++) { var datasource = widgetContext.datasources[i]; for (var a = 0; a < datasource.dataKeys.length; a++) { @@ -356,7 +357,7 @@ export default function WidgetController($scope, $timeout, $window, $element, $q if ($scope.displayLegend) { var legendKey = { dataKey: dataKey, - dataIndex: Number(i) + Number(a) + dataIndex: dataIndex++ }; $scope.legendData.keys.push(legendKey); var legendKeyData = { From 4feb78144b71924d835ae82c507f7a84d4f6dce6 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 18 Apr 2017 19:05:46 +0300 Subject: [PATCH 12/69] TB-53: Fixed handling of mouse events on dashboard widgets. --- ui/src/app/components/dashboard.directive.js | 77 +++++--------------- ui/src/app/components/dashboard.tpl.html | 6 +- 2 files changed, 22 insertions(+), 61 deletions(-) diff --git a/ui/src/app/components/dashboard.directive.js b/ui/src/app/components/dashboard.directive.js index 101ff51563..7c7a5526dc 100644 --- a/ui/src/app/components/dashboard.directive.js +++ b/ui/src/app/components/dashboard.directive.js @@ -87,8 +87,6 @@ function DashboardController($scope, $rootScope, $element, $timeout, $mdMedia, t var highlightedMode = false; var highlightedWidget = null; var selectedWidget = null; - var mouseDownWidget = -1; - var widgetMouseMoved = false; var gridsterParent = $('#gridster-parent', $element); var gridsterElement = angular.element($('#gridster-child', gridsterParent)); @@ -152,9 +150,9 @@ function DashboardController($scope, $rootScope, $element, $timeout, $mdMedia, t vm.resetHighlight = resetHighlight; vm.onWidgetFullscreenChanged = onWidgetFullscreenChanged; + vm.widgetMouseDown = widgetMouseDown; - vm.widgetMouseMove = widgetMouseMove; - vm.widgetMouseUp = widgetMouseUp; + vm.widgetClicked = widgetClicked; vm.widgetSizeX = widgetSizeX; vm.widgetSizeY = widgetSizeY; @@ -185,22 +183,22 @@ function DashboardController($scope, $rootScope, $element, $timeout, $mdMedia, t vm.dashboardTimewindowApi = { onResetTimewindow: function() { if (vm.originalDashboardTimewindow) { - vm.dashboardTimewindow = angular.copy(vm.originalDashboardTimewindow); - vm.originalDashboardTimewindow = null; + $timeout(function() { + vm.dashboardTimewindow = angular.copy(vm.originalDashboardTimewindow); + vm.originalDashboardTimewindow = null; + }, 0); } }, onUpdateTimewindow: function(startTimeMs, endTimeMs) { if (!vm.originalDashboardTimewindow) { vm.originalDashboardTimewindow = angular.copy(vm.dashboardTimewindow); } - vm.dashboardTimewindow = timeService.toHistoryTimewindow(vm.dashboardTimewindow, startTimeMs, endTimeMs); + $timeout(function() { + vm.dashboardTimewindow = timeService.toHistoryTimewindow(vm.dashboardTimewindow, startTimeMs, endTimeMs); + }, 0); } }; - //$element[0].onmousemove=function(){ - // widgetMouseMove(); - // } - //TODO: widgets visibility /*gridsterParent.scroll(function () { updateVisibleRect(); @@ -350,7 +348,6 @@ function DashboardController($scope, $rootScope, $element, $timeout, $mdMedia, t } function loadDashboard() { - resetWidgetClick(); $timeout(function () { if (vm.loadWidgets) { var promise = vm.loadWidgets(); @@ -434,42 +431,17 @@ function DashboardController($scope, $rootScope, $element, $timeout, $mdMedia, t return gridsterElement && gridsterElement[0] === gridster.$element[0]; } - function resetWidgetClick () { - mouseDownWidget = -1; - widgetMouseMoved = false; - } - function onWidgetFullscreenChanged(expanded, widget) { vm.isWidgetExpanded = expanded; $scope.$broadcast('onWidgetFullscreenChanged', vm.isWidgetExpanded, widget); } function widgetMouseDown ($event, widget) { - mouseDownWidget = widget; - widgetMouseMoved = false; if (vm.onWidgetMouseDown) { vm.onWidgetMouseDown({event: $event, widget: widget}); } } - function widgetMouseMove () { - if (mouseDownWidget) { - widgetMouseMoved = true; - } - } - - function widgetMouseUp ($event, widget) { - $timeout(function () { - if (!widgetMouseMoved && mouseDownWidget) { - if (widget === mouseDownWidget) { - widgetClicked($event, widget); - } - } - mouseDownWidget = null; - widgetMouseMoved = false; - }, 0); - } - function widgetClicked ($event, widget) { if ($event) { $event.stopPropagation(); @@ -518,7 +490,6 @@ function DashboardController($scope, $rootScope, $element, $timeout, $mdMedia, t } function editWidget ($event, widget) { - resetWidgetClick(); if ($event) { $event.stopPropagation(); } @@ -528,7 +499,6 @@ function DashboardController($scope, $rootScope, $element, $timeout, $mdMedia, t } function exportWidget ($event, widget) { - resetWidgetClick(); if ($event) { $event.stopPropagation(); } @@ -538,7 +508,6 @@ function DashboardController($scope, $rootScope, $element, $timeout, $mdMedia, t } function removeWidget($event, widget) { - resetWidgetClick(); if ($event) { $event.stopPropagation(); } @@ -548,27 +517,21 @@ function DashboardController($scope, $rootScope, $element, $timeout, $mdMedia, t } function highlightWidget(widget, delay) { - highlightedMode = true; - highlightedWidget = widget; - if (vm.gridster) { - var item = $('.gridster-item', vm.gridster.$element)[vm.widgets.indexOf(widget)]; - if (item) { - var height = $(item).outerHeight(true); - var rectHeight = gridsterParent.height(); - var offset = (rectHeight - height) / 2; - var scrollTop = item.offsetTop; - if (offset > 0) { - scrollTop -= offset; - } - gridsterParent.animate({ - scrollTop: scrollTop - }, delay); - } + if (!highlightedMode || highlightedWidget != widget) { + highlightedMode = true; + highlightedWidget = widget; + scrollToWidget(widget, delay); } } function selectWidget(widget, delay) { - selectedWidget = widget; + if (selectedWidget != widget) { + selectedWidget = widget; + scrollToWidget(widget, delay); + } + } + + function scrollToWidget(widget, delay) { if (vm.gridster) { var item = $('.gridster-item', vm.gridster.$element)[vm.widgets.indexOf(widget)]; if (item) { diff --git a/ui/src/app/components/dashboard.tpl.html b/ui/src/app/components/dashboard.tpl.html index 8c42278784..3d11e46531 100644 --- a/ui/src/app/components/dashboard.tpl.html +++ b/ui/src/app/components/dashboard.tpl.html @@ -37,9 +37,7 @@ 'tb-not-highlighted': vm.isNotHighlighted(widget), 'md-whiteframe-4dp': vm.dropWidgetShadow(widget)}" tb-mousedown="vm.widgetMouseDown($event, widget)" - tb-mousemove="vm.widgetMouseMove($event, widget)" - tb-mouseup="vm.widgetMouseUp($event, widget)" - ng-click="" + ng-click="vm.widgetClicked($event, widget)" tb-contextmenu="vm.openWidgetContextMenu($event, widget, $mdOpenMousepointMenu)" ng-style="{cursor: 'pointer', color: vm.widgetColor(widget), @@ -49,7 +47,7 @@ {{widget.config.title}} -
+
Date: Tue, 18 Apr 2017 19:11:33 +0300 Subject: [PATCH 13/69] TB-51: Fix java version check procedure in windows installation script. --- application/src/main/scripts/windows/install.bat | 4 ---- 1 file changed, 4 deletions(-) diff --git a/application/src/main/scripts/windows/install.bat b/application/src/main/scripts/windows/install.bat index 562661435b..d124e9a358 100644 --- a/application/src/main/scripts/windows/install.bat +++ b/application/src/main/scripts/windows/install.bat @@ -2,9 +2,6 @@ setlocal ENABLEEXTENSIONS -IF %PROCESSOR_ARCHITECTURE%==AMD64 GOTO CHECK_JAVA_64 -IF %PROCESSOR_ARCHITECTURE%==x86 GOTO CHECK_JAVA_32 - @ECHO Detecting Java version installed. :CHECK_JAVA_64 @ECHO Detecting if it is 64 bit machine @@ -36,7 +33,6 @@ if defined ValueName ( ) IF NOT "%JRE_PATH2%" == "" GOTO JAVA_INSTALLED -IF "%JRE_PATH2%" == "" GOTO JAVA_NOT_INSTALLED :CHECK_JAVA_32 @ECHO Detecting if it is 32 bit machine From 83f179e8c776e205cfdc4e15c06f6fd4f1473bee Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Fri, 21 Apr 2017 13:33:22 +0300 Subject: [PATCH 14/69] Fixed bug with REST API data representation for telemetry plugin --- .../core/plugin/telemetry/SubscriptionManager.java | 1 - .../plugin/telemetry/handlers/TelemetryRestMsgHandler.java | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/SubscriptionManager.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/SubscriptionManager.java index 8788f3ebf6..8cb1bf364e 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/SubscriptionManager.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/SubscriptionManager.java @@ -291,7 +291,6 @@ public class SubscriptionManager { } else { log.trace("[{}] Remote subscription is now handled on new server address: [{}]", s.getWsSessionId(), newAddress); subscriptionIterator.remove(); - //TODO: onUpdate state of subscription by WsSessionId and other maps. } } diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRestMsgHandler.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRestMsgHandler.java index c7cb47c2a1..633f620e97 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRestMsgHandler.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRestMsgHandler.java @@ -139,7 +139,12 @@ public class TelemetryRestMsgHandler extends DefaultRestMsgHandler { public void onSuccess(PluginContext ctx, List data) { Map> result = new LinkedHashMap<>(); for (TsKvEntry entry : data) { - result.put(entry.getKey(), data.stream().map(v -> new TsData(v.getTs(), v.getValueAsString())).collect(Collectors.toList())); + List vList = result.get(entry.getKey()); + if (vList == null) { + vList = new ArrayList<>(); + result.put(entry.getKey(), vList); + } + vList.add(new TsData(entry.getTs(), entry.getValueAsString())); } msg.getResponseHolder().setResult(new ResponseEntity<>(result, HttpStatus.OK)); } From a6e9ca9eb11ac58c7169db7a494a9642c4fe9c4e Mon Sep 17 00:00:00 2001 From: mp-loki Date: Sat, 22 Apr 2017 22:37:51 -0400 Subject: [PATCH 15/69] JPA DAO Basic Implementation & Tests --- .../plugin/PluginProcessingContext.java | 3 + dao/pom.xml | 28 +++++ .../thingsboard/server/dao/JpaDaoConfig.java | 26 +++-- .../server/dao/attributes/AttributesDao.java | 2 + .../dao/attributes/AttributesService.java | 4 + .../dao/attributes/BaseAttributesService.java | 2 + .../dao/model/sql/AdminSettingsEntity.java | 2 +- .../model/sql/ComponentDescriptorEntity.java | 5 +- .../server/dao/model/sql/CustomerEntity.java | 2 +- .../server/dao/model/sql/DashboardEntity.java | 2 +- .../dao/model/sql/DashboardInfoEntity.java | 2 +- .../model/sql/DeviceCredentialsEntity.java | 2 +- .../server/dao/model/sql/DeviceEntity.java | 2 +- .../server/dao/model/sql/EventEntity.java | 2 +- .../dao/model/sql/PluginMetaDataEntity.java | 2 +- .../dao/model/sql/RuleMetaDataEntity.java | 2 +- .../server/dao/model/sql/TenantEntity.java | 2 +- .../dao/model/sql/UserCredentialsEntity.java | 73 ++++-------- .../server/dao/model/sql/UserEntity.java | 106 +++++------------- .../dao/model/sql/WidgetTypeEntity.java | 2 +- .../dao/model/sql/WidgetsBundleEntity.java | 54 ++------- .../server/dao/sql/JpaAbstractDao.java | 6 +- .../dao/sql/user/JpaUserCredentialsDao.java | 71 ++++++++++++ .../server/dao/sql/user/JpaUserDao.java | 7 +- ...ry.java => UserCredentialsRepository.java} | 18 +-- .../server/dao/sql/user/UserRepository.java | 8 +- .../dao/sql/widget/JpaWidgetsBundleDao.java | 91 +++++++++++++++ .../sql/widget/WidgetsBundleRepository.java | 50 +++++++++ .../dao/timeseries/BaseTimeseriesService.java | 3 + .../server/dao/timeseries/TimeseriesDao.java | 2 + .../dao/timeseries/TimeseriesService.java | 3 + .../server/dao/AbstractJpaDaoTest.java | 39 +++++++ .../attributes/BaseAttributesServiceTest.java | 1 + .../dao/event/BaseEventServiceTest.java | 1 + .../dao/plugin/BasePluginServiceTest.java | 1 + .../server/dao/rule/BaseRuleServiceTest.java | 1 + .../dao/service/AbstractServiceTest.java | 1 + .../dao/service/CustomerServiceImplTest.java | 1 + .../dao/service/DashboardServiceImplTest.java | 1 + .../service/DeviceCredentialsCacheTest.java | 1 + .../DeviceCredentialsServiceImplTest.java | 1 + .../dao/service/DeviceServiceImplTest.java | 1 + .../service/WidgetTypeServiceImplTest.java | 1 + .../service/WidgetsBundleServiceImplTest.java | 1 + .../sql/user/JpaUserCredentialsDaoTest.java | 73 ++++++++++++ .../server/dao/sql/user/JpaUserDaoTest.java | 85 ++++++++++++++ .../sql/widget/JpaWidgetsBundleDaoTest.java | 82 ++++++++++++++ .../dao/timeseries/TimeseriesServiceTest.java | 3 + .../resources/application-test.properties | 4 +- .../test/resources/dbunit/empty_dataset.xml | 1 + .../resources/dbunit/user_credentials.xml | 28 +++++ dao/src/test/resources/dbunit/users.xml | 52 +++++++++ .../test/resources/dbunit/widgets_bundle.xml | 56 +++++++++ dao/src/test/resources/jpa-test.properties | 7 ++ pom.xml | 19 ++++ 55 files changed, 827 insertions(+), 218 deletions(-) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserCredentialsDao.java rename dao/src/main/java/org/thingsboard/server/dao/sql/user/{JpaRepository.java => UserCredentialsRepository.java} (55%) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserCredentialsDaoTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java create mode 100644 dao/src/test/resources/dbunit/empty_dataset.xml create mode 100644 dao/src/test/resources/dbunit/user_credentials.xml create mode 100644 dao/src/test/resources/dbunit/users.xml create mode 100644 dao/src/test/resources/dbunit/widgets_bundle.xml create mode 100644 dao/src/test/resources/jpa-test.properties diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java index ed75b10bc7..0b9e37c4e7 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java @@ -16,6 +16,9 @@ package org.thingsboard.server.actors.plugin; import akka.actor.ActorRef; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.ResultSetFuture; +import com.datastax.driver.core.Row; import com.google.common.base.Function; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; diff --git a/dao/pom.xml b/dao/pom.xml index 977be95f95..fddc440eea 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -65,6 +65,16 @@ junit test + + org.dbunit + dbunit + test + + + com.github.springtestdbunit + spring-test-dbunit + test + org.mockito mockito-all @@ -154,6 +164,24 @@ org.springframework.boot spring-boot-starter-data-jpa + + org.springframework + spring-test + test + + + org.springframework + spring-test + compile + + + com.h2database + h2 + + + org.springframework.boot + spring-boot-starter-data-jpa + diff --git a/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java b/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java index 167518a6b7..f349baae6e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java +++ b/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java @@ -16,27 +16,33 @@ package org.thingsboard.server.dao; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder; +import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.test.context.TestPropertySource; +import org.springframework.transaction.annotation.EnableTransactionManagement; +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; import javax.sql.DataSource; /** * @author Valerii Sosliuk */ @Configuration +@EnableAutoConfiguration @ConditionalOnProperty(prefix="sql", value="enabled",havingValue = "true", matchIfMissing = false) +@ComponentScan("org.thingsboard.server.dao.sql") +@EnableJpaRepositories("org.thingsboard.server.dao.sql") +@EntityScan("org.thingsboard.server.dao.model.sql") +@EnableTransactionManagement public class JpaDaoConfig { - @Value("sql.datasource.url") - private String url; - @Value("sql.datasource.username") - private String username; - @Value("sql.datasource.password") - private String password; - - public DataSource dataSource() { - return DataSourceBuilder.create().url(url).username(username).password(password).build(); - } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java index 6696f39556..ae58d4d9c6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java @@ -15,6 +15,8 @@ */ package org.thingsboard.server.dao.attributes; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.ResultSetFuture; import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.kv.AttributeKvEntry; diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java index 222ffa3b1a..6bf9fb2bd5 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java @@ -15,8 +15,12 @@ */ package org.thingsboard.server.dao.attributes; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.ResultSetFuture; import com.google.common.util.concurrent.ListenableFuture; +import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.UUIDBased; import org.thingsboard.server.common.data.kv.AttributeKvEntry; import java.util.Collection; diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java index 5ed231bd9f..da4611973d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java @@ -15,6 +15,8 @@ */ package org.thingsboard.server.dao.attributes; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.ResultSetFuture; import com.google.common.collect.Lists; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java index 40580ee1f4..b090d7da84 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java @@ -30,7 +30,7 @@ import java.util.UUID; import static org.thingsboard.server.dao.model.ModelConstants.*; -@Entity +//@Entity @Table(name = ADMIN_SETTINGS_COLUMN_FAMILY_NAME) public final class AdminSettingsEntity implements BaseEntity { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java index 53bac762c2..f32a89ec23 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java @@ -30,7 +30,10 @@ import org.thingsboard.server.dao.model.SearchTextEntity; import java.util.UUID; -@Entity +/** + * @author Andrew Shvayka + */ +//@Entity @Table(name = ModelConstants.COMPONENT_DESCRIPTOR_COLUMN_FAMILY_NAME) public class ComponentDescriptorEntity implements SearchTextEntity { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java index bf7404f50e..b651306861 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java @@ -30,7 +30,7 @@ import org.thingsboard.server.dao.model.SearchTextEntity; import java.util.UUID; -@Entity +//@Entity @Table(name = ModelConstants.CUSTOMER_COLUMN_FAMILY_NAME) public final class CustomerEntity implements SearchTextEntity { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java index 12a12c1403..77e12e2381 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java @@ -31,7 +31,7 @@ import org.thingsboard.server.dao.model.SearchTextEntity; import java.util.UUID; -@Entity +//@Entity @Table(name = ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME) public final class DashboardEntity implements SearchTextEntity { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java index 5fb052b55b..f0a50f1ffb 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java @@ -30,7 +30,7 @@ import org.thingsboard.server.dao.model.SearchTextEntity; import java.util.UUID; -@Entity +//@Entity @Table(name = ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME) public class DashboardInfoEntity implements SearchTextEntity { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java index de4399463d..56ebc43154 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java @@ -30,7 +30,7 @@ import org.thingsboard.server.dao.model.ModelConstants; import java.util.UUID; -@Entity +//@Entity @Table(name = ModelConstants.DEVICE_CREDENTIALS_COLUMN_FAMILY_NAME) public final class DeviceCredentialsEntity implements BaseEntity { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java index 72c2dd5310..4cab621e10 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java @@ -31,7 +31,7 @@ import org.thingsboard.server.dao.model.SearchTextEntity; import java.util.UUID; -@Entity +//@Entity @Table(name = ModelConstants.DEVICE_COLUMN_FAMILY_NAME) public final class DeviceEntity implements SearchTextEntity { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java index 4618f42b13..92808ba2b5 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java @@ -34,7 +34,7 @@ import java.util.UUID; @Data @NoArgsConstructor -@Entity +//@Entity @Table(name = ModelConstants.DEVICE_COLUMN_FAMILY_NAME) public class EventEntity implements BaseEntity { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java index fc58f90736..239e51d40c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java @@ -32,7 +32,7 @@ import org.thingsboard.server.dao.model.SearchTextEntity; import java.util.Objects; import java.util.UUID; -@Entity +//@Entity @Table(name = ModelConstants.PLUGIN_COLUMN_FAMILY_NAME) public class PluginMetaDataEntity implements SearchTextEntity { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java index 506b74abc3..56b8260ae4 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java @@ -33,7 +33,7 @@ import org.thingsboard.server.dao.model.SearchTextEntity; import java.util.Objects; import java.util.UUID; -@Entity +//@Entity @Table(name = ModelConstants.RULE_COLUMN_FAMILY_NAME) public class RuleMetaDataEntity implements SearchTextEntity { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java index 06b6131799..8987425f00 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java @@ -29,7 +29,7 @@ import com.fasterxml.jackson.databind.JsonNode; import java.util.UUID; -@Entity +//@Entity @Table(name = ModelConstants.TENANT_COLUMN_FAMILY_NAME) public final class TenantEntity implements SearchTextEntity { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java index 42d4e92762..b750ecea00 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java @@ -16,11 +16,14 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; + +import lombok.Data; import org.thingsboard.server.common.data.id.UserCredentialsId; import org.thingsboard.server.common.data.id.UserId; import org.thingsboard.server.common.data.security.UserCredentials; @@ -29,18 +32,19 @@ import org.thingsboard.server.dao.model.ModelConstants; import java.util.UUID; +@Data @Entity @Table(name = ModelConstants.USER_CREDENTIALS_COLUMN_FAMILY_NAME) public final class UserCredentialsEntity implements BaseEntity { @Transient - private static final long serialVersionUID = 1348221414123438374L; + private static final long serialVersionUID = -3989724854149114846L; @Id - @Column(name = ModelConstants.ID_PROPERTY) + @Column(name = ModelConstants.ID_PROPERTY, columnDefinition = "BINARY(16)") private UUID id; - - @Column(name = ModelConstants.USER_CREDENTIALS_USER_ID_PROPERTY) + + @Column(name = ModelConstants.USER_CREDENTIALS_USER_ID_PROPERTY, columnDefinition = "BINARY(16)", unique = true) private UUID userId; @Column(name = ModelConstants.USER_CREDENTIALS_ENABLED_PROPERTY) @@ -49,10 +53,10 @@ public final class UserCredentialsEntity implements BaseEntity @Column(name = ModelConstants.USER_CREDENTIALS_PASSWORD_PROPERTY) private String password; - @Column(name = ModelConstants.USER_CREDENTIALS_ACTIVATE_TOKEN_PROPERTY) + @Column(name = ModelConstants.USER_CREDENTIALS_ACTIVATE_TOKEN_PROPERTY, unique = true) private String activateToken; - @Column(name = ModelConstants.USER_CREDENTIALS_RESET_TOKEN_PROPERTY) + @Column(name = ModelConstants.USER_CREDENTIALS_RESET_TOKEN_PROPERTY, unique = true) private String resetToken; public UserCredentialsEntity() { @@ -71,54 +75,6 @@ public final class UserCredentialsEntity implements BaseEntity this.activateToken = userCredentials.getActivateToken(); this.resetToken = userCredentials.getResetToken(); } - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public UUID getUserId() { - return userId; - } - - public void setUserId(UUID userId) { - this.userId = userId; - } - - public boolean isEnabled() { - return enabled; - } - - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getActivateToken() { - return activateToken; - } - - public void setActivateToken(String activateToken) { - this.activateToken = activateToken; - } - - public String getResetToken() { - return resetToken; - } - - public void setResetToken(String resetToken) { - this.resetToken = resetToken; - } @Override public int hashCode() { @@ -186,4 +142,13 @@ public final class UserCredentialsEntity implements BaseEntity return userCredentials; } + @Override + public UUID getId() { + return id; + } + + @Override + public void setId(UUID id) { + this.id = id; + } } \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java index a02341d204..bf006bb22d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java @@ -17,45 +17,44 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.Data; import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.UserId; import org.thingsboard.server.common.data.security.Authority; -import org.thingsboard.server.dao.model.SearchTextEntity; import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.model.SearchTextEntity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; +import java.io.IOException; import java.util.UUID; /** - * @author Valerii Sosliuk + * Created by Valerii Sosliuk on 4/21/2017. */ +@Data @Entity -@Table(name= ModelConstants.USER_COLUMN_FAMILY_NAME) +@Table(name = ModelConstants.USER_COLUMN_FAMILY_NAME) public class UserEntity implements SearchTextEntity { - @Transient - private static final long serialVersionUID = 4349485207981226785L; + private static final long serialVersionUID = -271106508790582977L; @Id - @Column(name=ModelConstants.ID_PROPERTY) + @Column(name = ModelConstants.ID_PROPERTY, columnDefinition = "BINARY(16)") private UUID id; - @Column(name = ModelConstants.USER_TENANT_ID_PROPERTY) + @Column(name = ModelConstants.USER_TENANT_ID_PROPERTY, columnDefinition = "BINARY(16)") private UUID tenantId; - @Column(name = ModelConstants.USER_CUSTOMER_ID_PROPERTY) + @Column(name = ModelConstants.USER_CUSTOMER_ID_PROPERTY, columnDefinition = "BINARY(16)") private UUID customerId; @Column(name = ModelConstants.USER_AUTHORITY_PROPERTY) private Authority authority; - @Column(name = ModelConstants.USER_EMAIL_PROPERTY) + @Column(name = ModelConstants.USER_EMAIL_PROPERTY, unique = true) private String email; @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) @@ -68,7 +67,10 @@ public class UserEntity implements SearchTextEntity { private String lastName; @Column(name = ModelConstants.USER_ADDITIONAL_INFO_PROPERTY) - private JsonNode additionalInfo; + private String additionalInfo; + + public UserEntity() { + } public UserEntity(User user) { if (user.getId() != null) { @@ -84,11 +86,7 @@ public class UserEntity implements SearchTextEntity { this.email = user.getEmail(); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); - this.additionalInfo = user.getAdditionalInfo(); - } - - public String getSearchText() { - return searchText; + this.additionalInfo = user.getAdditionalInfo().toString(); } @Override @@ -111,62 +109,6 @@ public class UserEntity implements SearchTextEntity { this.id = id; } - public UUID getTenantId() { - return tenantId; - } - - public void setTenantId(UUID tenantId) { - this.tenantId = tenantId; - } - - public UUID getCustomerId() { - return customerId; - } - - public void setCustomerId(UUID customerId) { - this.customerId = customerId; - } - - public Authority getAuthority() { - return authority; - } - - public void setAuthority(Authority authority) { - this.authority = authority; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public JsonNode getAdditionalInfo() { - return additionalInfo; - } - - public void setAdditionalInfo(JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - @Override public String toString() { StringBuilder builder = new StringBuilder(); @@ -204,9 +146,18 @@ public class UserEntity implements SearchTextEntity { user.setEmail(email); user.setFirstName(firstName); user.setLastName(lastName); - user.setAdditionalInfo(additionalInfo); + ObjectMapper mapper = new ObjectMapper(); + if (additionalInfo != null) { + try { + JsonNode jsonNode = mapper.readTree(additionalInfo); + user.setAdditionalInfo(jsonNode); + } catch (IOException e) { + e.printStackTrace(); + } + } return user; } + @Override public int hashCode() { final int prime = 31; @@ -270,5 +221,4 @@ public class UserEntity implements SearchTextEntity { return false; return true; } - } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java index 6c1b949720..2c84f72d9e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java @@ -32,7 +32,7 @@ import org.thingsboard.server.dao.model.ModelConstants; import java.util.UUID; -@Entity +//@Entity @Table(name = ModelConstants.WIDGET_TYPE_COLUMN_FAMILY_NAME) public final class WidgetTypeEntity implements BaseEntity { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java index c972709926..92f2e414da 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java @@ -22,6 +22,8 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; + +import lombok.Data; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.WidgetsBundleId; import org.thingsboard.server.common.data.widget.WidgetsBundle; @@ -31,6 +33,7 @@ import org.thingsboard.server.dao.model.SearchTextEntity; import java.nio.ByteBuffer; import java.util.UUID; +@Data @Entity @Table(name = ModelConstants.WIDGETS_BUNDLE_COLUMN_FAMILY_NAME) public final class WidgetsBundleEntity implements SearchTextEntity { @@ -39,10 +42,10 @@ public final class WidgetsBundleEntity implements SearchTextEntity, D> implements Dao< protected abstract String getColumnFamilyName(); - protected abstract JpaRepository getCrudRepository(); + protected abstract CrudRepository getCrudRepository(); protected boolean isSearchTextDao() { return false; @@ -69,7 +69,7 @@ public abstract class JpaAbstractDao, D> implements Dao< @Override public ListenableFuture findByIdAsync(UUID key) { log.debug("Get entity by key {}", key); - org.springframework.util.concurrent.ListenableFuture entityFuture = getCrudRepository().findByIdAsync(key); + // org.springframework.util.concurrent.ListenableFuture entityFuture = getCrudRepository().findByIdAsync(key); // TODO: vsosliuk implement return null; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserCredentialsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserCredentialsDao.java new file mode 100644 index 0000000000..fa119b679f --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserCredentialsDao.java @@ -0,0 +1,71 @@ +/** + * 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.sql.user; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Component; +import org.thingsboard.server.common.data.User; +import org.thingsboard.server.common.data.security.UserCredentials; +import org.thingsboard.server.dao.DaoUtil; +import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.model.sql.UserCredentialsEntity; +import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.user.UserCredentialsDao; + +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 4/22/2017. + */ +@Component +@ConditionalOnProperty(prefix="sql", value="enabled",havingValue = "true", matchIfMissing = false) +public class JpaUserCredentialsDao extends JpaAbstractDao implements UserCredentialsDao { + + @Autowired + private UserCredentialsRepository userCredentialsRepository; + + @Override + protected Class getEntityClass() { + return UserCredentialsEntity.class; + } + + @Override + protected String getColumnFamilyName() { + return ModelConstants.USER_CREDENTIALS_COLUMN_FAMILY_NAME; + } + + @Override + protected CrudRepository getCrudRepository() { + return userCredentialsRepository; + } + + @Override + public UserCredentials findByUserId(UUID userId) { + return DaoUtil.getData(userCredentialsRepository.findByUserId(userId)); + } + + @Override + public UserCredentials findByActivateToken(String activateToken) { + return DaoUtil.getData(userCredentialsRepository.findByActivateToken(activateToken)); + } + + @Override + public UserCredentials findByResetToken(String resetToken) { + return DaoUtil.getData(userCredentialsRepository.findByResetToken(resetToken)); + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java index 551f658af1..662dbeea06 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java @@ -17,6 +17,7 @@ package org.thingsboard.server.dao.sql.user; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.page.TextPageLink; @@ -50,7 +51,7 @@ public class JpaUserDao extends JpaAbstractDao implements User } @Override - protected JpaRepository getCrudRepository() { + protected CrudRepository getCrudRepository() { return userRepository; } @@ -61,11 +62,11 @@ public class JpaUserDao extends JpaAbstractDao implements User @Override public List findTenantAdmins(UUID tenantId, TextPageLink pageLink) { - return null; + throw new RuntimeException("Not Implemented"); } @Override public List findCustomerUsers(UUID tenantId, UUID customerId, TextPageLink pageLink) { - return null; + throw new RuntimeException("Not Implemented"); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserCredentialsRepository.java similarity index 55% rename from dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaRepository.java rename to dao/src/main/java/org/thingsboard/server/dao/sql/user/UserCredentialsRepository.java index 0af2bf8fc0..bb61aed13d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserCredentialsRepository.java @@ -15,17 +15,21 @@ */ package org.thingsboard.server.dao.sql.user; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; -import org.springframework.scheduling.annotation.Async; -import org.springframework.util.concurrent.ListenableFuture; +import org.thingsboard.server.dao.model.sql.UserCredentialsEntity; -import java.io.Serializable; +import java.util.UUID; /** - * @author Valerii Sosliuk + * Created by Valerii Sosliuk on 4/22/2017. */ -public interface JpaRepository extends CrudRepository { +@ConditionalOnProperty(prefix="sql", value="enabled",havingValue = "true", matchIfMissing = false) +public interface UserCredentialsRepository extends CrudRepository { - @Async - ListenableFuture findByIdAsync(ID key); + UserCredentialsEntity findByUserId(UUID userId); + + UserCredentialsEntity findByActivateToken(String activateToken); + + UserCredentialsEntity findByResetToken(String resetToken); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java index a3bcfa6d1d..aec4137366 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java @@ -15,17 +15,17 @@ */ package org.thingsboard.server.dao.sql.user; -import org.thingsboard.server.common.data.User; -import org.thingsboard.server.common.data.page.TextPageLink; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.repository.CrudRepository; import org.thingsboard.server.dao.model.sql.UserEntity; -import java.util.List; import java.util.UUID; /** * @author Valerii Sosliuk */ -public interface UserRepository extends JpaRepository { +@ConditionalOnProperty(prefix="sql", value="enabled",havingValue = "true", matchIfMissing = false) +public interface UserRepository extends CrudRepository { UserEntity findByEmail(String email); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java new file mode 100644 index 0000000000..afa409a74b --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java @@ -0,0 +1,91 @@ +/** + * 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.sql.widget; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.repository.CrudRepository; +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.model.sql.WidgetsBundleEntity; +import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.widget.WidgetsBundleDao; + +import java.util.List; +import java.util.UUID; + +import static org.thingsboard.server.dao.model.ModelConstants.WIDGETS_BUNDLE_COLUMN_FAMILY_NAME; + +/** + * Created by Valerii Sosliuk on 4/23/2017. + */ +@Component +public class JpaWidgetsBundleDao extends JpaAbstractDao implements WidgetsBundleDao { + + @Autowired + private WidgetsBundleRepository widgetsBundleRepository; + + @Override + protected Class getEntityClass() { + return WidgetsBundleEntity.class; + } + + @Override + protected String getColumnFamilyName() { + return WIDGETS_BUNDLE_COLUMN_FAMILY_NAME; + } + + @Override + protected CrudRepository getCrudRepository() { + return widgetsBundleRepository; + } + + @Override + public WidgetsBundle findWidgetsBundleByTenantIdAndAlias(UUID tenantId, String alias) { + return DaoUtil.getData(widgetsBundleRepository.findWidgetsBundleByTenantIdAndAlias(tenantId, alias)); + } + + @Override + public List findSystemWidgetsBundles(TextPageLink pageLink) { + if (pageLink.getIdOffset() == null) { + return DaoUtil.convertDataList(widgetsBundleRepository.findSystemWidgetsBundlesFirstPage(pageLink.getLimit() + , pageLink.getTextSearch())); + } else { + return DaoUtil.convertDataList(widgetsBundleRepository.findSystemWidgetsBundlesNextPage(pageLink.getLimit() + , pageLink.getTextSearch(), pageLink.getIdOffset())); + } + //return DaoUtil.convertDataList(widgetsBundleRepository.findBySearchTextStartsWithIgnoreCase(pageLink.getTextSearch().toLowerCase())); + //return DaoUtil.convertDataList(widgetsBundleRepository.findBySearchTextStartsWithIgnoreCase(pageLink.getTextSearch().toLowerCase() ,pageable)); + } + + @Override + public List findTenantWidgetsBundlesByTenantId(UUID tenantId, TextPageLink pageLink) { + throw new RuntimeException("Not implemented"); + } + + @Override + public List findAllTenantWidgetsBundlesByTenantId(UUID tenantId, TextPageLink pageLink) { + throw new RuntimeException("Not implemented"); + } + + @Override + protected boolean isSearchTextDao() { + return true; + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java new file mode 100644 index 0000000000..ac163df189 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java @@ -0,0 +1,50 @@ +/** + * 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.sql.widget; + +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +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.page.TextPageLink; +import org.thingsboard.server.dao.model.ToData; +import org.thingsboard.server.dao.model.sql.WidgetsBundleEntity; + +import java.util.Collection; +import java.util.List; +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 4/23/2017. + */ +//public interface WidgetsBundleRepository extends CrudRepository { +public interface WidgetsBundleRepository extends JpaRepository, JpaSpecificationExecutor { + + WidgetsBundleEntity findWidgetsBundleByTenantIdAndAlias(UUID tenantId, String alias); + + @Query(nativeQuery = true, value = "SELECT * FROM WIDGETS_BUNDLE WHERE TENANT_ID IS NULL " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?2, '%')) " + + "ORDER BY ID LIMIT ?1") + List findSystemWidgetsBundlesFirstPage(Integer limit, String searchText); + + @Query(nativeQuery = true, value = "SELECT * FROM WIDGETS_BUNDLE WHERE TENANT_ID IS NULL " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?2, '%')) " + + "AND ID > ?3 ORDER BY ID LIMIT ?1") + List findSystemWidgetsBundlesNextPage(Integer limit, String searchText, UUID idOffset); + +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java index d58815f955..7a59dcc51b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java @@ -15,6 +15,9 @@ */ package org.thingsboard.server.dao.timeseries; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.ResultSetFuture; +import com.datastax.driver.core.Row; import com.google.common.collect.Lists; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java index 733200d976..452eb2cae3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java @@ -15,6 +15,8 @@ */ package org.thingsboard.server.dao.timeseries; +import com.datastax.driver.core.ResultSetFuture; +import com.datastax.driver.core.Row; import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.common.data.kv.TsKvQuery; diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java index b2bf2e02dc..20731b22c0 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java @@ -15,6 +15,9 @@ */ package org.thingsboard.server.dao.timeseries; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.ResultSetFuture; +import com.datastax.driver.core.Row; import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.server.common.data.id.UUIDBased; import org.thingsboard.server.common.data.kv.TsKvEntry; diff --git a/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java new file mode 100644 index 0000000000..e610245f96 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java @@ -0,0 +1,39 @@ +/** + * 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 com.github.springtestdbunit.DbUnitTestExecutionListener; +import org.junit.runner.RunWith; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestExecutionListeners; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; +import org.springframework.test.context.support.DirtiesContextTestExecutionListener; + +/** + * Created by Valerii Sosliuk on 4/22/2017. + */ +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = {JpaDaoConfig.class}) +@TestPropertySource("classpath:jpa-test.properties") +@TestExecutionListeners({ DependencyInjectionTestExecutionListener.class, + DirtiesContextTestExecutionListener.class, + DbUnitTestExecutionListener.class }) +public class AbstractJpaDaoTest extends AbstractTransactionalJUnit4SpringContextTests { + +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/attributes/BaseAttributesServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/attributes/BaseAttributesServiceTest.java index a9835cbe45..559a3130e8 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/attributes/BaseAttributesServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/attributes/BaseAttributesServiceTest.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.attributes; +import com.datastax.driver.core.utils.UUIDs; import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.kv.AttributeKvEntry; diff --git a/dao/src/test/java/org/thingsboard/server/dao/event/BaseEventServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/event/BaseEventServiceTest.java index b185d2c3ce..e2c473f82c 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/event/BaseEventServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/event/BaseEventServiceTest.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.event; +import com.datastax.driver.core.utils.UUIDs; import org.junit.Assert; import org.junit.Test; import org.thingsboard.server.common.data.DataConstants; diff --git a/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java index 80acec71e4..7c0291cf56 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.plugin; +import com.datastax.driver.core.utils.UUIDs; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; import org.junit.Test; diff --git a/dao/src/test/java/org/thingsboard/server/dao/rule/BaseRuleServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/rule/BaseRuleServiceTest.java index fe40b84edf..f62f26c2fb 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/rule/BaseRuleServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/rule/BaseRuleServiceTest.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.rule; +import com.datastax.driver.core.utils.UUIDs; import org.junit.Assert; import org.junit.Test; import org.thingsboard.server.common.data.id.TenantId; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java index 01de94f365..f66e6eee69 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.service; +import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/CustomerServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/CustomerServiceImplTest.java index 67ff8b0fa3..0271cad6df 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/CustomerServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/CustomerServiceImplTest.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.service; +import com.datastax.driver.core.utils.UUIDs; import org.apache.commons.lang3.RandomStringUtils; import org.junit.After; import org.junit.Assert; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceImplTest.java index 95f9430b2d..949198c553 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceImplTest.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.service; +import com.datastax.driver.core.utils.UUIDs; import org.apache.commons.lang3.RandomStringUtils; import org.junit.After; import org.junit.Assert; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java index f9068ed0d5..4428d020eb 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.service; +import com.datastax.driver.core.utils.UUIDs; import com.hazelcast.core.HazelcastInstance; import org.apache.commons.lang3.RandomStringUtils; import org.junit.After; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsServiceImplTest.java index c31fd2babc..efdab8a08a 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsServiceImplTest.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.service; +import com.datastax.driver.core.utils.UUIDs; import org.apache.commons.lang3.RandomStringUtils; import org.junit.After; import org.junit.Assert; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceImplTest.java index 8126bfaa83..b256daa7bb 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceImplTest.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.service; +import com.datastax.driver.core.utils.UUIDs; import org.apache.commons.lang3.RandomStringUtils; import org.junit.After; import org.junit.Assert; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/WidgetTypeServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/WidgetTypeServiceImplTest.java index 9c5fb64313..8f0a9f710f 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/WidgetTypeServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/WidgetTypeServiceImplTest.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.service; +import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.After; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/WidgetsBundleServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/WidgetsBundleServiceImplTest.java index f7794626c3..6345567832 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/WidgetsBundleServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/WidgetsBundleServiceImplTest.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.service; +import com.datastax.driver.core.utils.UUIDs; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserCredentialsDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserCredentialsDaoTest.java new file mode 100644 index 0000000000..8c754015e0 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserCredentialsDaoTest.java @@ -0,0 +1,73 @@ +/** + * 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.sql.user; + +import com.github.springtestdbunit.annotation.DatabaseSetup; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.thingsboard.server.common.data.security.UserCredentials; +import org.thingsboard.server.dao.AbstractJpaDaoTest; +import org.thingsboard.server.dao.user.UserCredentialsDao; + +import java.util.List; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +/** + * Created by Valerii Sosliuk on 4/22/2017. + */ +public class JpaUserCredentialsDaoTest extends AbstractJpaDaoTest { + + @Autowired + private UserCredentialsDao userCredentialsDao; + + @Test + @DatabaseSetup("classpath:dbunit/user_credentials.xml") + public void testFindAll() { + List userCredentials = userCredentialsDao.find(); + assertEquals(2, userCredentials.size()); + } + + @Test + @DatabaseSetup("classpath:dbunit/user_credentials.xml") + public void testFindByUserId() { + UserCredentials userCredentials = userCredentialsDao.findByUserId(UUID.fromString("787827e6-27d7-11e7-93ae-92361f002671")); + assertNotNull(userCredentials); + assertEquals("4b9e010c-27d5-11e7-93ae-92361f002671", userCredentials.getId().toString()); + assertEquals(true, userCredentials.isEnabled()); + assertEquals("password", userCredentials.getPassword()); + assertEquals("ACTIVATE_TOKEN_2", userCredentials.getActivateToken()); + assertEquals("RESET_TOKEN_2", userCredentials.getResetToken()); + } + + @Test + @DatabaseSetup("classpath:dbunit/user_credentials.xml") + public void testFindByActivateToken() { + UserCredentials userCredentials = userCredentialsDao.findByActivateToken("ACTIVATE_TOKEN_1"); + assertNotNull(userCredentials); + assertEquals("3ed10af0-27d5-11e7-93ae-92361f002671", userCredentials.getId().toString()); + } + + @Test + @DatabaseSetup("classpath:dbunit/user_credentials.xml") + public void testFindByResetToken() { + UserCredentials userCredentials = userCredentialsDao.findByResetToken("RESET_TOKEN_2"); + assertNotNull(userCredentials); + assertEquals("4b9e010c-27d5-11e7-93ae-92361f002671", userCredentials.getId().toString()); + } +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java new file mode 100644 index 0000000000..5bd254fa67 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java @@ -0,0 +1,85 @@ +/** + * 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.sql.user; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.springtestdbunit.annotation.DatabaseSetup; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.thingsboard.server.common.data.User; +import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.id.UserId; +import org.thingsboard.server.common.data.security.Authority; +import org.thingsboard.server.dao.AbstractJpaDaoTest; +import org.thingsboard.server.dao.user.UserDao; + +import java.io.IOException; +import java.util.List; +import java.util.UUID; + +import static org.junit.Assert.*; + +/** + * Created by Valerii Sosliuk on 4/18/2017. + */ +public class JpaUserDaoTest extends AbstractJpaDaoTest { + + @Autowired + private UserDao userDao; + + @Test + @DatabaseSetup("classpath:dbunit/users.xml") + public void testFindAll() { + List users = userDao.find(); + assertEquals(users.size(), 5); + } + + @Test + @DatabaseSetup("classpath:dbunit/users.xml") + public void findByEmail() { + User user = userDao.findByEmail("sysadm@thingsboard.org"); + assertNotNull("User is expected to be not null", user); + assertEquals("9cb58ba0-27c1-11e7-93ae-92361f002671", user.getId().toString()); + assertEquals("c97ea14e-27c1-11e7-93ae-92361f002671", user.getTenantId().toString()); + assertEquals("cdf9c79e-27c1-11e7-93ae-92361f002671", user.getCustomerId().toString()); + assertEquals(Authority.SYS_ADMIN, user.getAuthority()); + assertEquals("John", user.getFirstName()); + assertEquals("Doe", user.getLastName()); + assertEquals("{\"key\":\"value-0\"}", user.getAdditionalInfo().toString()); + } + + @Test + @DatabaseSetup("classpath:dbunit/users.xml") + public void testSave() throws IOException { + User user = new User(); + user.setId(new UserId(UUID.fromString("cd481534-27cc-11e7-93ae-92361f002671"))); + user.setTenantId(new TenantId(UUID.fromString("1edcb2c6-27cb-11e7-93ae-92361f002671"))); + user.setCustomerId(new CustomerId(UUID.fromString("51477cb4-27cb-11e7-93ae-92361f002671"))); + user.setEmail("user@thingsboard.org"); + user.setFirstName("Jackson"); + user.setLastName("Roberts"); + ObjectMapper mapper = new ObjectMapper(); + String additionalInfo = "{\"key\":\"value-100\"}"; + JsonNode jsonNode = mapper.readTree(additionalInfo); + user.setAdditionalInfo(jsonNode); + userDao.save(user); + assertEquals(6, userDao.find().size()); + User savedUser = userDao.findByEmail("user@thingsboard.org"); + assertNotNull(savedUser); + } +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java new file mode 100644 index 0000000000..4fcf7cb924 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java @@ -0,0 +1,82 @@ +/** + * 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.sql.widget; + +import com.datastax.driver.core.utils.UUIDs; +import com.github.springtestdbunit.annotation.DatabaseSetup; +import org.junit.Ignore; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.thingsboard.server.common.data.id.WidgetsBundleId; +import org.thingsboard.server.common.data.page.TextPageLink; +import org.thingsboard.server.common.data.widget.WidgetsBundle; +import org.thingsboard.server.dao.AbstractJpaDaoTest; +import org.thingsboard.server.dao.widget.WidgetsBundleDao; + +import java.util.List; +import java.util.UUID; + +import static org.junit.Assert.*; + +/** + * Created by Valerii Sosliuk on 4/23/2017. + */ +public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest { + + @Autowired + private WidgetsBundleDao widgetsBundleDao; + + @Test + @DatabaseSetup("classpath:dbunit/widgets_bundle.xml") + public void testFindAll() { + assertEquals(7, widgetsBundleDao.find().size()); + } + + @Test + @DatabaseSetup("classpath:dbunit/widgets_bundle.xml") + public void testFindWidgetsBundleByTenantIdAndAlias() { + WidgetsBundle widgetsBundle = widgetsBundleDao.findWidgetsBundleByTenantIdAndAlias( + UUID.fromString("250aca8e-2825-11e7-93ae-92361f002671"), "WB3"); + assertEquals("44e6af4e-2825-11e7-93ae-92361f002671", widgetsBundle.getId().toString()); + } + + @Test + @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + public void testFindSystemWidgetsBundles() { + for (int i = 0; i < 30; i++) { + WidgetsBundle widgetsBundle = new WidgetsBundle(); + widgetsBundle.setAlias("WB" + i); + widgetsBundle.setTitle("WB" + i); + widgetsBundle.setId(new WidgetsBundleId(UUIDs.timeBased())); + widgetsBundleDao.save(widgetsBundle); + } + assertEquals(30, widgetsBundleDao.find().size()); + // Get first page + TextPageLink textPageLink1 = new TextPageLink(10, "WB"); + List widgetsBundles1 = widgetsBundleDao.findSystemWidgetsBundles(textPageLink1); + assertEquals(10, widgetsBundles1.size()); + for (WidgetsBundle widgetsBundle : widgetsBundles1) { + System.out.println(widgetsBundle.getSearchText()); + } + TextPageLink textPageLink2 = new TextPageLink(10, "WB", widgetsBundles1.get(9).getId().getId(), null); + List widgetsBundles2 = widgetsBundleDao.findSystemWidgetsBundles(textPageLink2); + assertEquals(10, widgetsBundles1.size()); + for (WidgetsBundle widgetsBundle : widgetsBundles2) { + System.out.println(widgetsBundle.getSearchText()); + } + + } +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/TimeseriesServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/TimeseriesServiceTest.java index 49b77c2b32..ae49cb1c23 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/TimeseriesServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/TimeseriesServiceTest.java @@ -15,6 +15,9 @@ */ package org.thingsboard.server.dao.timeseries; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.ResultSetFuture; +import com.datastax.driver.core.utils.UUIDs; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; import org.junit.Test; diff --git a/dao/src/test/resources/application-test.properties b/dao/src/test/resources/application-test.properties index 289f94689b..1430eb4f10 100644 --- a/dao/src/test/resources/application-test.properties +++ b/dao/src/test/resources/application-test.properties @@ -5,4 +5,6 @@ cache.device_credentials.max_size.policy=PER_NODE zk.enabled=false zk.url=localhost:2181 -zk.zk_dir=/thingsboard \ No newline at end of file +zk.zk_dir=/thingsboard + +sql.enabled=false \ No newline at end of file diff --git a/dao/src/test/resources/dbunit/empty_dataset.xml b/dao/src/test/resources/dbunit/empty_dataset.xml new file mode 100644 index 0000000000..5ed00ba028 --- /dev/null +++ b/dao/src/test/resources/dbunit/empty_dataset.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/dao/src/test/resources/dbunit/user_credentials.xml b/dao/src/test/resources/dbunit/user_credentials.xml new file mode 100644 index 0000000000..c6607e9895 --- /dev/null +++ b/dao/src/test/resources/dbunit/user_credentials.xml @@ -0,0 +1,28 @@ + + + + + \ No newline at end of file diff --git a/dao/src/test/resources/dbunit/users.xml b/dao/src/test/resources/dbunit/users.xml new file mode 100644 index 0000000000..644a6e982d --- /dev/null +++ b/dao/src/test/resources/dbunit/users.xml @@ -0,0 +1,52 @@ + + + + + + + \ No newline at end of file diff --git a/dao/src/test/resources/dbunit/widgets_bundle.xml b/dao/src/test/resources/dbunit/widgets_bundle.xml new file mode 100644 index 0000000000..10a8d22e05 --- /dev/null +++ b/dao/src/test/resources/dbunit/widgets_bundle.xml @@ -0,0 +1,56 @@ + + + + + + + + + + \ No newline at end of file diff --git a/dao/src/test/resources/jpa-test.properties b/dao/src/test/resources/jpa-test.properties new file mode 100644 index 0000000000..7fff922c93 --- /dev/null +++ b/dao/src/test/resources/jpa-test.properties @@ -0,0 +1,7 @@ +cassandra.enabled=false + +sql.enabled=true +sql.datasource.url=jdbc:h2:mem:thingsboard +sql.datasource.username=sa +sql.datasource.password= + diff --git a/pom.xml b/pom.xml index 64017d79a4..909936f074 100755 --- a/pom.xml +++ b/pom.xml @@ -71,6 +71,9 @@ 2.6.1 1.56 2.0.1 + 1.4.194 + 2.5.3 + 1.2.1 @@ -442,6 +445,11 @@ ${spring-security.version} test + + com.github.springtestdbunit + spring-test-dbunit + ${spring-test-dbunit.version} + io.jsonwebtoken jjwt @@ -640,6 +648,12 @@ ${junit.version} test + + org.dbunit + dbunit + ${dbunit.version} + test + org.mockito mockito-all @@ -712,6 +726,11 @@ bcpkix-jdk15on ${bouncycastle.version} + + com.h2database + h2 + ${h2.version} + com.sun.winsw winsw From 66d0e0ccc3a105381df598befc9d492034f92e12 Mon Sep 17 00:00:00 2001 From: mp-loki Date: Fri, 28 Apr 2017 01:50:06 -0400 Subject: [PATCH 16/69] JpaWidgetsBundleDao - added missing implementations and tests --- .../thingsboard/server/dao/JpaDaoConfig.java | 10 -- .../dao/sql/widget/JpaWidgetsBundleDao.java | 30 +++-- .../sql/widget/WidgetsBundleRepository.java | 19 +++ .../sql/widget/JpaWidgetsBundleDaoTest.java | 108 +++++++++++++++--- 4 files changed, 134 insertions(+), 33 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java b/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java index f349baae6e..b93ac0fc73 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java +++ b/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java @@ -15,24 +15,14 @@ */ package org.thingsboard.server.dao; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder; -import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; -import org.springframework.test.context.TestPropertySource; import org.springframework.transaction.annotation.EnableTransactionManagement; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.sql.DataSource; - /** * @author Valerii Sosliuk */ diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java index afa409a74b..512e661d1c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java @@ -16,8 +16,7 @@ package org.thingsboard.server.dao.sql.widget; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.page.TextPageLink; @@ -36,6 +35,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.WIDGETS_BUNDLE_COL * Created by Valerii Sosliuk on 4/23/2017. */ @Component +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) public class JpaWidgetsBundleDao extends JpaAbstractDao implements WidgetsBundleDao { @Autowired @@ -64,24 +64,34 @@ public class JpaWidgetsBundleDao extends JpaAbstractDao findSystemWidgetsBundles(TextPageLink pageLink) { if (pageLink.getIdOffset() == null) { - return DaoUtil.convertDataList(widgetsBundleRepository.findSystemWidgetsBundlesFirstPage(pageLink.getLimit() - , pageLink.getTextSearch())); + return DaoUtil.convertDataList(widgetsBundleRepository.findSystemWidgetsBundlesFirstPage(pageLink.getLimit(), + pageLink.getTextSearch())); } else { - return DaoUtil.convertDataList(widgetsBundleRepository.findSystemWidgetsBundlesNextPage(pageLink.getLimit() - , pageLink.getTextSearch(), pageLink.getIdOffset())); + return DaoUtil.convertDataList(widgetsBundleRepository.findSystemWidgetsBundlesNextPage(pageLink.getLimit(), + pageLink.getTextSearch(), pageLink.getIdOffset())); } - //return DaoUtil.convertDataList(widgetsBundleRepository.findBySearchTextStartsWithIgnoreCase(pageLink.getTextSearch().toLowerCase())); - //return DaoUtil.convertDataList(widgetsBundleRepository.findBySearchTextStartsWithIgnoreCase(pageLink.getTextSearch().toLowerCase() ,pageable)); } @Override public List findTenantWidgetsBundlesByTenantId(UUID tenantId, TextPageLink pageLink) { - throw new RuntimeException("Not implemented"); + if (pageLink.getIdOffset() == null) { + return DaoUtil.convertDataList(widgetsBundleRepository.findTenantWidgetsBundlesByTenantIdFirstPage(pageLink.getLimit(), + tenantId, pageLink.getTextSearch())); + } else { + return DaoUtil.convertDataList(widgetsBundleRepository.findTenantWidgetsBundlesByTenantIdNextPage(pageLink.getLimit(), + tenantId, pageLink.getTextSearch(), pageLink.getIdOffset())); + } } @Override public List findAllTenantWidgetsBundlesByTenantId(UUID tenantId, TextPageLink pageLink) { - throw new RuntimeException("Not implemented"); + if (pageLink.getIdOffset() == null) { + return DaoUtil.convertDataList(widgetsBundleRepository.findAllTenantWidgetsBundlesByTenantIdFirstPage(pageLink.getLimit(), + tenantId, pageLink.getTextSearch())); + } else { + return DaoUtil.convertDataList(widgetsBundleRepository.findAllTenantWidgetsBundlesByTenantIdNextPage(pageLink.getLimit(), + tenantId, pageLink.getTextSearch(), pageLink.getIdOffset())); + } } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java index ac163df189..cc47762de9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java @@ -47,4 +47,23 @@ public interface WidgetsBundleRepository extends JpaRepository ?3 ORDER BY ID LIMIT ?1") List findSystemWidgetsBundlesNextPage(Integer limit, String searchText, UUID idOffset); + @Query(nativeQuery = true, value = "SELECT * FROM WIDGETS_BUNDLE WHERE TENANT_ID = ?2 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "ORDER BY ID LIMIT ?1") + List findTenantWidgetsBundlesByTenantIdFirstPage(int limit, UUID tenantId, String textSearch); + + @Query(nativeQuery = true, value = "SELECT * FROM WIDGETS_BUNDLE WHERE TENANT_ID = ?2 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "AND ID > ?4 ORDER BY ID LIMIT ?1") + List findTenantWidgetsBundlesByTenantIdNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); + + @Query(nativeQuery = true, value = "SELECT * FROM WIDGETS_BUNDLE WHERE (TENANT_ID IS NULL OR TENANT_ID = ?2) " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "ORDER BY ID LIMIT ?1") + List findAllTenantWidgetsBundlesByTenantIdFirstPage(int limit, UUID tenantId, String textSearch); + + @Query(nativeQuery = true, value = "SELECT * FROM WIDGETS_BUNDLE WHERE (TENANT_ID IS NULL OR TENANT_ID = ?2) " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "AND ID > ?4 ORDER BY ID LIMIT ?1") + List findAllTenantWidgetsBundlesByTenantIdNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); } diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java index 4fcf7cb924..eafcfd3820 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java @@ -20,6 +20,7 @@ import com.github.springtestdbunit.annotation.DatabaseSetup; import org.junit.Ignore; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.WidgetsBundleId; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.widget.WidgetsBundle; @@ -56,27 +57,108 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest { @Test @DatabaseSetup("classpath:dbunit/empty_dataset.xml") public void testFindSystemWidgetsBundles() { - for (int i = 0; i < 30; i++) { - WidgetsBundle widgetsBundle = new WidgetsBundle(); - widgetsBundle.setAlias("WB" + i); - widgetsBundle.setTitle("WB" + i); - widgetsBundle.setId(new WidgetsBundleId(UUIDs.timeBased())); - widgetsBundleDao.save(widgetsBundle); - } + createSystemWidgetBundles(30, "WB_"); assertEquals(30, widgetsBundleDao.find().size()); // Get first page TextPageLink textPageLink1 = new TextPageLink(10, "WB"); List widgetsBundles1 = widgetsBundleDao.findSystemWidgetsBundles(textPageLink1); assertEquals(10, widgetsBundles1.size()); - for (WidgetsBundle widgetsBundle : widgetsBundles1) { - System.out.println(widgetsBundle.getSearchText()); - } + // Get next page TextPageLink textPageLink2 = new TextPageLink(10, "WB", widgetsBundles1.get(9).getId().getId(), null); List widgetsBundles2 = widgetsBundleDao.findSystemWidgetsBundles(textPageLink2); - assertEquals(10, widgetsBundles1.size()); - for (WidgetsBundle widgetsBundle : widgetsBundles2) { - System.out.println(widgetsBundle.getSearchText()); + assertEquals(10, widgetsBundles2.size()); + } + + @Test + @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + public void testFindWidgetsBundlesByTenantId() { + UUID tenantId1 = UUIDs.timeBased(); + UUID tenantId2 = UUIDs.timeBased(); + // Create a bunch of widgetBundles + for (int i= 0; i < 10; i++) { + createWidgetBundles(3, tenantId1, "WB1_"); + createWidgetBundles(5, tenantId2, "WB2_"); + createSystemWidgetBundles(10, "WB_SYS_"); } + assertEquals(180, widgetsBundleDao.find().size()); + + TextPageLink textPageLink1 = new TextPageLink(40, "WB"); + List widgetsBundles1 = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId1, textPageLink1); + assertEquals(30, widgetsBundles1.size()); + + TextPageLink textPageLink2 = new TextPageLink(40, "WB"); + List widgetsBundles2 = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId2, textPageLink2); + assertEquals(40, widgetsBundles2.size()); + + TextPageLink textPageLink3 = new TextPageLink(40, "WB", + widgetsBundles2.get(39).getId().getId(), null); + List widgetsBundles3 = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId2, textPageLink3); + assertEquals(10, widgetsBundles3.size()); + } + + @Test + @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + public void testFindAllWidgetsBundlesByTenantId() { + UUID tenantId1 = UUIDs.timeBased(); + UUID tenantId2 = UUIDs.timeBased(); + // Create a bunch of widgetBundles + for (int i= 0; i < 10; i++) { + createWidgetBundles( 5, tenantId1,"WB1_"); + createWidgetBundles(3, tenantId2, "WB2_"); + createSystemWidgetBundles(2, "WB_SYS_"); + } + + TextPageLink textPageLink1 = new TextPageLink(30, "WB"); + List widgetsBundles1 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, textPageLink1); + assertEquals(30, widgetsBundles1.size()); + + TextPageLink textPageLink2 = new TextPageLink(30, "WB", + widgetsBundles1.get(29).getId().getId(), null); + List widgetsBundles2 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, textPageLink2); + assertEquals(30, widgetsBundles2.size()); + + TextPageLink textPageLink3 = new TextPageLink(30, "WB", + widgetsBundles2.get(29).getId().getId(), null); + List widgetsBundles3 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, textPageLink3); + assertEquals(10, widgetsBundles3.size()); + + TextPageLink textPageLink4 = new TextPageLink(30, "WB", + widgetsBundles3.get(9).getId().getId(), null); + List widgetsBundles4 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, textPageLink4); + assertEquals(0, widgetsBundles4.size()); + } + + + @Test + @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + public void testNonSearchTextNotFound() { + UUID tenantId = UUIDs.timeBased(); + createWidgetBundles(5, tenantId, "ABC_"); + createSystemWidgetBundles(5, "SYS_"); + + TextPageLink textPageLink = new TextPageLink(30, "WB"); + List widgetsBundles4 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId, textPageLink); + assertEquals(0, widgetsBundles4.size()); + } + + private void createWidgetBundles(int count, UUID tenantId, String prefix) { + for (int i = 0; i < count; i++) { + WidgetsBundle widgetsBundle = new WidgetsBundle(); + widgetsBundle.setAlias(prefix + i); + widgetsBundle.setTitle(prefix + i); + widgetsBundle.setId(new WidgetsBundleId(UUIDs.timeBased())); + widgetsBundle.setTenantId(new TenantId(tenantId)); + widgetsBundleDao.save(widgetsBundle); + } + } + private void createSystemWidgetBundles(int count, String prefix) { + for (int i = 0; i < count; i++) { + WidgetsBundle widgetsBundle = new WidgetsBundle(); + widgetsBundle.setAlias(prefix + i); + widgetsBundle.setTitle(prefix + i); + widgetsBundle.setId(new WidgetsBundleId(UUIDs.timeBased())); + widgetsBundleDao.save(widgetsBundle); + } } } From 5860a0651b3974be3ce010795d0ff87238a2eb63 Mon Sep 17 00:00:00 2001 From: mp-loki Date: Sun, 30 Apr 2017 20:33:43 -0400 Subject: [PATCH 17/69] JPA WidgetType, WidgetsBundle, Tenant DAO --- .../server/dao/model/sql/TenantEntity.java | 139 ++++-------------- .../server/dao/model/sql/UserEntity.java | 8 +- .../dao/model/sql/WidgetTypeEntity.java | 30 +++- .../server/dao/sql/JpaAbstractDao.java | 23 +-- .../server/dao/sql/tenant/JpaTenantDao.java | 57 +++++++ .../dao/sql/tenant/TenantRepository.java | 28 ++++ .../server/dao/sql/user/JpaUserDao.java | 23 ++- .../server/dao/sql/user/UserRepository.java | 34 ++++- .../dao/sql/widget/JpaWidgetTypeDao.java | 52 +++++++ .../dao/sql/widget/JpaWidgetsBundleDao.java | 10 +- .../dao/sql/widget/WidgetTypeRepository.java | 20 +++ .../sql/widget/WidgetsBundleRepository.java | 12 +- .../dao/sql/tenant/JpaTenantDaoTest.java | 55 +++++++ .../server/dao/sql/user/JpaUserDaoTest.java | 64 +++++++- .../dao/sql/widget/JpaWidgetTypeDaoTest.java | 40 +++++ dao/src/test/resources/dbunit/users.xml | 2 - dao/src/test/resources/dbunit/widget_type.xml | 31 ++++ 17 files changed, 471 insertions(+), 157 deletions(-) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetTypeRepository.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java create mode 100644 dao/src/test/resources/dbunit/widget_type.xml diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java index 8987425f00..6c54fd01c7 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java @@ -1,12 +1,12 @@ /** * 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 - * + *

+ * 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. @@ -16,20 +16,28 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; + +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; 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 com.fasterxml.jackson.databind.JsonNode; +import java.io.IOException; import java.util.UUID; -//@Entity +@Slf4j +@Data +@Entity @Table(name = ModelConstants.TENANT_COLUMN_FAMILY_NAME) public final class TenantEntity implements SearchTextEntity { @@ -37,21 +45,21 @@ public final class TenantEntity implements SearchTextEntity { private static final long serialVersionUID = -4330655990232136337L; @Id - @Column(name = ModelConstants.ID_PROPERTY) + @Column(name = ModelConstants.ID_PROPERTY, columnDefinition = "BINARY(16)") private UUID id; @Column(name = ModelConstants.TENANT_TITLE_PROPERTY) private String title; - + @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) private String searchText; @Column(name = ModelConstants.TENANT_REGION_PROPERTY) private String region; - + @Column(name = ModelConstants.COUNTRY_PROPERTY) private String country; - + @Column(name = ModelConstants.STATE_PROPERTY) private String state; @@ -74,7 +82,7 @@ public final class TenantEntity implements SearchTextEntity { private String email; @Column(name = ModelConstants.TENANT_ADDITIONAL_INFO_PROPERTY) - private JsonNode additionalInfo; + private String additionalInfo; public TenantEntity() { super(); @@ -94,104 +102,11 @@ public final class TenantEntity implements SearchTextEntity { this.zip = tenant.getZip(); this.phone = tenant.getPhone(); this.email = tenant.getEmail(); - this.additionalInfo = tenant.getAdditionalInfo(); - } - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getRegion() { - return region; - } - - public void setRegion(String region) { - this.region = region; - } - - public String getCountry() { - return country; - } - - public void setCountry(String country) { - this.country = country; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAddress2() { - return address2; - } - - public void setAddress2(String address2) { - this.address2 = address2; - } - - public String getZip() { - return zip; - } - - public void setZip(String zip) { - this.zip = zip; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public JsonNode getAdditionalInfo() { - return additionalInfo; + if (tenant.getAdditionalInfo() != null) { + this.additionalInfo = tenant.getAdditionalInfo().toString(); + } } - public void setAdditionalInfo(JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } @Override public String getSearchTextSource() { @@ -202,7 +117,7 @@ public final class TenantEntity implements SearchTextEntity { public void setSearchText(String searchText) { this.searchText = searchText; } - + public String getSearchText() { return searchText; } @@ -343,7 +258,15 @@ public final class TenantEntity implements SearchTextEntity { tenant.setZip(zip); tenant.setPhone(phone); tenant.setEmail(email); - tenant.setAdditionalInfo(additionalInfo); + ObjectMapper mapper = new ObjectMapper(); + if (additionalInfo != null) { + try { + JsonNode jsonNode = mapper.readTree(additionalInfo); + tenant.setAdditionalInfo(jsonNode); + } catch (IOException e) { + log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", additionalInfo, e.getMessage()), e); + } + } return tenant; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java index bf006bb22d..9df32e3eda 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java @@ -19,6 +19,7 @@ import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; +import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.TenantId; @@ -34,6 +35,7 @@ import java.util.UUID; /** * Created by Valerii Sosliuk on 4/21/2017. */ +@Slf4j @Data @Entity @Table(name = ModelConstants.USER_COLUMN_FAMILY_NAME) @@ -86,7 +88,9 @@ public class UserEntity implements SearchTextEntity { this.email = user.getEmail(); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); - this.additionalInfo = user.getAdditionalInfo().toString(); + if (user.getAdditionalInfo() != null) { + this.additionalInfo = user.getAdditionalInfo().toString(); + } } @Override @@ -152,7 +156,7 @@ public class UserEntity implements SearchTextEntity { JsonNode jsonNode = mapper.readTree(additionalInfo); user.setAdditionalInfo(jsonNode); } catch (IOException e) { - e.printStackTrace(); + log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", additionalInfo, e.getMessage()), e); } } return user; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java index 2c84f72d9e..790089182f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java @@ -24,15 +24,19 @@ import javax.persistence.Transient; import com.datastax.driver.mapping.annotations.PartitionKey; import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.common.data.id.TenantId; 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 java.io.IOException; import java.util.UUID; -//@Entity +@Slf4j +@Entity @Table(name = ModelConstants.WIDGET_TYPE_COLUMN_FAMILY_NAME) public final class WidgetTypeEntity implements BaseEntity { @@ -40,11 +44,11 @@ public final class WidgetTypeEntity implements BaseEntity { private static final long serialVersionUID = -5436279069884988630L; @Id - @Column(name = ModelConstants.ID_PROPERTY) + @Column(name = ModelConstants.ID_PROPERTY, columnDefinition = "BINARY(16)") private UUID id; @PartitionKey(value = 1) - @Column(name = ModelConstants.WIDGET_TYPE_TENANT_ID_PROPERTY) + @Column(name = ModelConstants.WIDGET_TYPE_TENANT_ID_PROPERTY, columnDefinition = "BINARY(16)") private UUID tenantId; @PartitionKey(value = 2) @@ -58,7 +62,7 @@ public final class WidgetTypeEntity implements BaseEntity { private String name; @Column(name = ModelConstants.WIDGET_TYPE_DESCRIPTOR_PROPERTY) - private JsonNode descriptor; + private String descriptor; public WidgetTypeEntity() { super(); @@ -74,7 +78,9 @@ public final class WidgetTypeEntity implements BaseEntity { this.bundleAlias = widgetType.getBundleAlias(); this.alias = widgetType.getAlias(); this.name = widgetType.getName(); - this.descriptor = widgetType.getDescriptor(); + if (widgetType.getDescriptor() != null) { + this.descriptor = widgetType.getDescriptor().toString(); + } } @Override @@ -119,11 +125,11 @@ public final class WidgetTypeEntity implements BaseEntity { this.name = name; } - public JsonNode getDescriptor() { + public String getDescriptor() { return descriptor; } - public void setDescriptor(JsonNode descriptor) { + public void setDescriptor(String descriptor) { this.descriptor = descriptor; } @@ -176,7 +182,15 @@ public final class WidgetTypeEntity implements BaseEntity { widgetType.setBundleAlias(bundleAlias); widgetType.setAlias(alias); widgetType.setName(name); - widgetType.setDescriptor(descriptor); + ObjectMapper mapper = new ObjectMapper(); + if (descriptor != null) { + try { + JsonNode jsonNode = mapper.readTree(descriptor); + widgetType.setDescriptor(jsonNode); + } catch (IOException e) { + log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", descriptor, e.getMessage()), e); + } + } return widgetType; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java index f38f49e25f..414c213240 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java @@ -1,12 +1,12 @@ /** * 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 - * + *

+ * 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. @@ -17,6 +17,8 @@ package org.thingsboard.server.dao.sql; import com.google.common.collect.Lists; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; import lombok.extern.slf4j.Slf4j; import org.springframework.data.repository.CrudRepository; import org.thingsboard.server.dao.Dao; @@ -26,6 +28,7 @@ import org.thingsboard.server.dao.model.SearchTextEntity; import java.util.List; import java.util.UUID; +import java.util.concurrent.Executors; /** * @author Valerii Sosliuk @@ -51,7 +54,8 @@ public abstract class JpaAbstractDao, D> implements Dao< } catch (Exception e) { log.error("Can't create entity for domain object {}", domain, e); throw new IllegalArgumentException("Can't create entity for domain object {" + domain + "}", e); - } if (isSearchTextDao()) { + } + if (isSearchTextDao()) { ((SearchTextEntity) entity).setSearchText(((SearchTextEntity) entity).getSearchTextSource().toLowerCase()); } log.debug("Saving entity {}", entity); @@ -68,10 +72,11 @@ public abstract class JpaAbstractDao, D> implements Dao< @Override public ListenableFuture findByIdAsync(UUID key) { - log.debug("Get entity by key {}", key); - // org.springframework.util.concurrent.ListenableFuture entityFuture = getCrudRepository().findByIdAsync(key); - // TODO: vsosliuk implement - return null; + log.debug("Get entity by key async {}", key); + // Should it be a field? + ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); + ListenableFuture listenableFuture = service.submit(() -> DaoUtil.getData(getCrudRepository().findOne(key))); + return listenableFuture; } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java new file mode 100644 index 0000000000..7cdb72796b --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java @@ -0,0 +1,57 @@ +package org.thingsboard.server.dao.sql.tenant; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.repository.CrudRepository; +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.model.sql.TenantEntity; +import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.tenant.TenantDao; + +import java.util.List; +import java.util.UUID; + +import static org.thingsboard.server.dao.model.ModelConstants.TENANT_COLUMN_FAMILY_NAME; + +/** + * Created by Valerii Sosliuk on 4/30/2017. + */ +@Component +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public class JpaTenantDao extends JpaAbstractDao implements TenantDao { + + @Autowired + private TenantRepository tenantRepository; + + @Override + protected Class getEntityClass() { + return TenantEntity.class; + } + + @Override + protected String getColumnFamilyName() { + return TENANT_COLUMN_FAMILY_NAME; + } + + @Override + protected CrudRepository getCrudRepository() { + return tenantRepository; + } + + @Override + protected boolean isSearchTextDao() { + return true; + } + + @Override + public List findTenantsByRegion(String region, TextPageLink pageLink) { + if (pageLink.getIdOffset() == null) { + return DaoUtil.convertDataList(tenantRepository.findByRegionFirstPage(pageLink.getLimit(), region, pageLink.getTextSearch())); + } else { + return DaoUtil.convertDataList(tenantRepository.findByRegionNextPage(pageLink.getLimit(), region, pageLink.getTextSearch(), pageLink.getIdOffset())); + } + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java new file mode 100644 index 0000000000..ec533f47a0 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java @@ -0,0 +1,28 @@ +package org.thingsboard.server.dao.sql.tenant; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; +import org.thingsboard.server.dao.model.sql.TenantEntity; + +import java.util.List; +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 4/30/2017. + */ +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public interface TenantRepository extends CrudRepository { + + + @Query(nativeQuery = true, value = "SELECT * FROM TENANT WHERE REGION = ?2 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "ORDER BY ID LIMIT ?1") + List findByRegionFirstPage(int limit, String region, String textSearch); + + + @Query(nativeQuery = true, value = "SELECT * FROM TENANT WHERE REGION = ?2 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "AND ID > ?4 ORDER BY ID LIMIT ?1") + List findByRegionNextPage(int limit, String region, String textSearch, UUID idOffset); +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java index 662dbeea06..cffccdb291 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java @@ -1,12 +1,12 @@ /** * 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 - * + *

+ * 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. @@ -34,7 +34,7 @@ import java.util.UUID; * @author Valerii Sosliuk */ @Component -@ConditionalOnProperty(prefix="sql", value="enabled",havingValue = "true", matchIfMissing = false) +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) public class JpaUserDao extends JpaAbstractDao implements UserDao { @Autowired @@ -62,11 +62,20 @@ public class JpaUserDao extends JpaAbstractDao implements User @Override public List findTenantAdmins(UUID tenantId, TextPageLink pageLink) { - throw new RuntimeException("Not Implemented"); + if (pageLink.getIdOffset() == null) { + return DaoUtil.convertDataList(userRepository.findTenantAdminsFirstPage(pageLink.getLimit(), tenantId)); + } else { + return DaoUtil.convertDataList(userRepository.findTenantAdminsNextPage(pageLink.getLimit(), tenantId, pageLink.getIdOffset())); + } } @Override public List findCustomerUsers(UUID tenantId, UUID customerId, TextPageLink pageLink) { - throw new RuntimeException("Not Implemented"); + if (pageLink.getIdOffset() == null) { + return DaoUtil.convertDataList(userRepository.findCustomerUsersFirstPage(pageLink.getLimit(), tenantId, customerId)); + } else { + return DaoUtil.convertDataList(userRepository.findCustomerUsersNextPage(pageLink.getLimit(), tenantId, + customerId, pageLink.getIdOffset())); + } } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java index aec4137366..cc4df06b94 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java @@ -1,12 +1,12 @@ /** * 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 - * + *

+ * 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. @@ -16,17 +16,39 @@ package org.thingsboard.server.dao.sql.user; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.thingsboard.server.dao.model.sql.UserEntity; +import java.util.List; import java.util.UUID; /** * @author Valerii Sosliuk */ -@ConditionalOnProperty(prefix="sql", value="enabled",havingValue = "true", matchIfMissing = false) +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) public interface UserRepository extends CrudRepository { UserEntity findByEmail(String email); -} + @Query(nativeQuery = true, value = "SELECT * FROM USER WHERE TENANT_ID = ?2 " + + "AND CUSTOMER_ID IS NULL AND AUTHORITY = 1 " + + "ORDER BY ID LIMIT ?1") + List findTenantAdminsFirstPage(int limit, UUID tenantId); + + @Query(nativeQuery = true, value = "SELECT * FROM USER WHERE TENANT_ID = ?2 " + + "AND CUSTOMER_ID IS NULL AND AUTHORITY = 1 " + + "AND ID > ?3 ORDER BY ID LIMIT ?1") + List findTenantAdminsNextPage(int limit, UUID tenantId, UUID idOffset); + + @Query(nativeQuery = true, value = "SELECT * FROM USER WHERE TENANT_ID = ?2 " + + "AND CUSTOMER_ID = ?3 AND AUTHORITY = 2 " + + "ORDER BY ID LIMIT ?1") + List findCustomerUsersFirstPage(int limit, UUID tenantId, UUID customerId); + + @Query(nativeQuery = true, value = "SELECT * FROM USER WHERE TENANT_ID = ?2 " + + "AND CUSTOMER_ID = ?3 AND AUTHORITY = 2 " + + "AND ID > ?4 ORDER BY ID LIMIT ?1") + List findCustomerUsersNextPage(int limit, UUID tenantId, UUID customerId, UUID idOffset); + +} \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java new file mode 100644 index 0000000000..9cc89b23f6 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java @@ -0,0 +1,52 @@ +package org.thingsboard.server.dao.sql.widget; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +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.model.sql.WidgetTypeEntity; +import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.widget.WidgetTypeDao; + +import java.util.List; +import java.util.UUID; + +import static org.thingsboard.server.dao.model.ModelConstants.WIDGET_TYPE_COLUMN_FAMILY_NAME; + +/** + * Created by Valerii Sosliuk on 4/29/2017. + */ +@Component +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public class JpaWidgetTypeDao extends JpaAbstractDao implements WidgetTypeDao { + + @Autowired + private WidgetTypeRepository widgetTypeRepository; + + @Override + protected Class getEntityClass() { + return WidgetTypeEntity.class; + } + + @Override + protected String getColumnFamilyName() { + return WIDGET_TYPE_COLUMN_FAMILY_NAME; + } + + @Override + protected CrudRepository getCrudRepository() { + return widgetTypeRepository; + } + + @Override + public List findWidgetTypesByTenantIdAndBundleAlias(UUID tenantId, String bundleAlias) { + return DaoUtil.convertDataList(widgetTypeRepository.findByTenantIdAndBundleAlias(tenantId, bundleAlias)); + } + + @Override + public WidgetType findByTenantIdBundleAliasAndAlias(UUID tenantId, String bundleAlias, String alias) { + return DaoUtil.getData(widgetTypeRepository.findByTenantIdAndBundleAliasAndAlias(tenantId, bundleAlias, alias)); + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java index 512e661d1c..ff40dd29af 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java @@ -61,6 +61,11 @@ public class JpaWidgetsBundleDao extends JpaAbstractDao findSystemWidgetsBundles(TextPageLink pageLink) { if (pageLink.getIdOffset() == null) { @@ -93,9 +98,4 @@ public class JpaWidgetsBundleDao extends JpaAbstractDao { + + List findByTenantIdAndBundleAlias(UUID tenantId, String bundleAlias); + + WidgetTypeEntity findByTenantIdAndBundleAliasAndAlias(UUID tenantId, String bundleAlias, String alias); +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java index cc47762de9..d94dd1370d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java @@ -15,25 +15,19 @@ */ package org.thingsboard.server.dao.sql.widget; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.page.TextPageLink; -import org.thingsboard.server.dao.model.ToData; import org.thingsboard.server.dao.model.sql.WidgetsBundleEntity; -import java.util.Collection; import java.util.List; import java.util.UUID; /** * Created by Valerii Sosliuk on 4/23/2017. */ -//public interface WidgetsBundleRepository extends CrudRepository { -public interface WidgetsBundleRepository extends JpaRepository, JpaSpecificationExecutor { +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public interface WidgetsBundleRepository extends CrudRepository { WidgetsBundleEntity findWidgetsBundleByTenantIdAndAlias(UUID tenantId, String alias); diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java new file mode 100644 index 0000000000..2515618829 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java @@ -0,0 +1,55 @@ +package org.thingsboard.server.dao.sql.tenant; + +import com.datastax.driver.core.utils.UUIDs; +import com.github.springtestdbunit.annotation.DatabaseSetup; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.thingsboard.server.common.data.Tenant; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.page.TextPageLink; +import org.thingsboard.server.dao.AbstractJpaDaoTest; +import org.thingsboard.server.dao.tenant.TenantDao; + +import java.util.List; + +import static org.junit.Assert.*; + +/** + * Created by Valerii Sosliuk on 4/30/2017. + */ +public class JpaTenantDaoTest extends AbstractJpaDaoTest { + + @Autowired + private TenantDao tenantDao; + + @Test + @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + public void testFindTenantsByRegion() { + createTenants(); + assertEquals(60, tenantDao.find().size()); + List tenants1 = tenantDao.findTenantsByRegion("REGION_1", new TextPageLink(20,"title")); + assertEquals(20, tenants1.size()); + List tenants2 = tenantDao.findTenantsByRegion("REGION_1", + new TextPageLink(20,"title", tenants1.get(19).getId().getId(), null)); + assertEquals(10, tenants2.size()); + List tenants3 = tenantDao.findTenantsByRegion("REGION_1", + new TextPageLink(20,"title", tenants2.get(9).getId().getId(), null)); + assertEquals(0, tenants3.size()); + } + + private void createTenants() { + for (int i = 0; i < 30; i++) { + createTenant("REGION_1", "TITLE", i); + createTenant("REGION_2", "TITLE", i); + } + } + + private void createTenant(String region, String title, int index) { + Tenant tenant = new Tenant(); + tenant.setId(new TenantId(UUIDs.timeBased())); + tenant.setRegion(region); + tenant.setTitle(title + "_" + index); + tenantDao.save(tenant); + } + +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java index 5bd254fa67..fe540fa017 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.sql.user; +import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.springtestdbunit.annotation.DatabaseSetup; @@ -24,6 +25,7 @@ import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.UserId; +import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.dao.AbstractJpaDaoTest; import org.thingsboard.server.dao.user.UserDao; @@ -51,7 +53,7 @@ public class JpaUserDaoTest extends AbstractJpaDaoTest { @Test @DatabaseSetup("classpath:dbunit/users.xml") - public void findByEmail() { + public void testFindByEmail() { User user = userDao.findByEmail("sysadm@thingsboard.org"); assertNotNull("User is expected to be not null", user); assertEquals("9cb58ba0-27c1-11e7-93ae-92361f002671", user.getId().toString()); @@ -63,6 +65,40 @@ public class JpaUserDaoTest extends AbstractJpaDaoTest { assertEquals("{\"key\":\"value-0\"}", user.getAdditionalInfo().toString()); } + @Test + @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + public void testFindTenantAdmins() { + UUID tenantId = UUIDs.timeBased(); + UUID customerId = UUIDs.timeBased(); + create30Adminsand60Users(tenantId, customerId); + assertEquals(90, userDao.find().size()); + List tenantAdmins1 = userDao.findTenantAdmins(tenantId, new TextPageLink(20)); + assertEquals(20, tenantAdmins1.size()); + List tenantAdmins2 = userDao.findTenantAdmins(tenantId, + new TextPageLink(20, null, tenantAdmins1.get(19).getId().getId(), null)); + assertEquals(10, tenantAdmins2.size()); + List tenantAdmins3 = userDao.findTenantAdmins(tenantId, + new TextPageLink(20, null, tenantAdmins2.get(9).getId().getId(), null)); + assertEquals(0, tenantAdmins3.size()); + } + + @Test + @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + public void testFindCustomerUsers() { + UUID tenantId = UUIDs.timeBased(); + UUID customerId = UUIDs.timeBased(); + create30Adminsand60Users(tenantId, customerId); + assertEquals(90, userDao.find().size()); + List customerUsers1 = userDao.findCustomerUsers(tenantId, customerId, new TextPageLink(40)); + assertEquals(40, customerUsers1.size()); + List customerUsers2 = userDao.findCustomerUsers(tenantId, customerId, + new TextPageLink(20, null, customerUsers1.get(39).getId().getId(), null)); + assertEquals(20, customerUsers2.size()); + List customerUsers3 = userDao.findCustomerUsers(tenantId, customerId, + new TextPageLink(20, null, customerUsers2.get(19).getId().getId(), null)); + assertEquals(0, customerUsers3.size()); + } + @Test @DatabaseSetup("classpath:dbunit/users.xml") public void testSave() throws IOException { @@ -82,4 +118,30 @@ public class JpaUserDaoTest extends AbstractJpaDaoTest { User savedUser = userDao.findByEmail("user@thingsboard.org"); assertNotNull(savedUser); } + + private void create30Adminsand60Users(UUID tenantId, UUID customerId) { + // Create 30 tenant admins and 60 customer users + for (int i = 0; i < 30; i++) { + saveUser(tenantId, null); + saveUser(tenantId, customerId); + saveUser(tenantId, customerId); + } + } + + private void saveUser(UUID tenantId, UUID customerId) { + User user = new User(); + UUID id = UUIDs.timeBased(); + user.setId(new UserId(id)); + user.setTenantId(new TenantId(tenantId)); + if (customerId == null) { + user.setAuthority(Authority.TENANT_ADMIN); + } else { + user.setCustomerId(new CustomerId(customerId)); + user.setAuthority(Authority.CUSTOMER_USER); + } + String idString = id.toString(); + String email = idString.substring(0, idString.indexOf('-')) + "@thingsboard.org"; + user.setEmail(email); + userDao.save(user); + } } diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java new file mode 100644 index 0000000000..c41a7c5495 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java @@ -0,0 +1,40 @@ +package org.thingsboard.server.dao.sql.widget; + +import com.datastax.driver.core.utils.UUIDs; +import com.github.springtestdbunit.annotation.DatabaseSetup; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.thingsboard.server.common.data.widget.WidgetType; +import org.thingsboard.server.dao.AbstractJpaDaoTest; +import org.thingsboard.server.dao.widget.WidgetTypeDao; + +import java.util.List; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; + +/** + * Created by Valerii Sosliuk on 4/30/2017. + */ +public class JpaWidgetTypeDaoTest extends AbstractJpaDaoTest { + + @Autowired + private WidgetTypeDao widgetTypeDao; + + @Test + @DatabaseSetup(("classpath:dbunit/widget_type.xml")) + public void testFindByTenantIdAndBundleAlias() { + UUID tenantId = UUID.fromString("2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833"); + List widgetTypes = widgetTypeDao.findWidgetTypesByTenantIdAndBundleAlias(tenantId, "BUNDLE_ALIAS_1"); + assertEquals(3, widgetTypes.size()); + } + + @Test + @DatabaseSetup(("classpath:dbunit/widget_type.xml")) + public void testFindByTenantIdAndBundleAliasAndAlias() { + UUID tenantId = UUID.fromString("2b7e4c90-2dfe-11e7-94aa-f7f6dbfb4833"); + WidgetType widgetType = widgetTypeDao.findByTenantIdBundleAliasAndAlias(tenantId, "BUNDLE_ALIAS_1", "ALIAS3"); + UUID id = UUID.fromString("2b7e4c93-2dfe-11e7-94aa-f7f6dbfb4833"); + assertEquals(id, widgetType.getId().getId()); + } +} diff --git a/dao/src/test/resources/dbunit/users.xml b/dao/src/test/resources/dbunit/users.xml index 644a6e982d..b1e51dde3e 100644 --- a/dao/src/test/resources/dbunit/users.xml +++ b/dao/src/test/resources/dbunit/users.xml @@ -11,7 +11,6 @@ /> + + + + + + \ No newline at end of file From d65d788b5d4be0ee65f1003d716cada60dba0335 Mon Sep 17 00:00:00 2001 From: mp-loki Date: Mon, 1 May 2017 23:14:29 -0400 Subject: [PATCH 18/69] JPA Rule and Plugin DAO added --- .../server/dao/model/ModelConstants.java | 20 +-- .../dao/model/sql/PluginMetaDataEntity.java | 112 ++++--------- .../dao/model/sql/RuleMetaDataEntity.java | 151 +++++++----------- .../server/dao/model/sql/TenantEntity.java | 8 +- .../dao/model/sql/WidgetTypeEntity.java | 42 +---- .../server/dao/sql/JpaAbstractDao.java | 8 +- .../dao/sql/plugin/JpaBasePluginDao.java | 140 ++++++++++++++++ .../sql/plugin/PluginMetaDataRepository.java | 55 +++++++ .../server/dao/sql/rule/JpaBaseRuleDao.java | 126 +++++++++++++++ .../dao/sql/rule/RuleMetaDataRepository.java | 56 +++++++ .../server/dao/sql/tenant/JpaTenantDao.java | 15 ++ .../dao/sql/tenant/TenantRepository.java | 15 ++ .../server/dao/sql/user/JpaUserDao.java | 8 +- .../server/dao/sql/user/UserRepository.java | 8 +- .../dao/sql/widget/JpaWidgetTypeDao.java | 15 ++ .../dao/sql/widget/WidgetTypeRepository.java | 15 ++ .../dao/sql/plugin/JpaBasePluginDaoTest.java | 104 ++++++++++++ .../dao/sql/rule/JpaBaseRuleDaoTest.java | 110 +++++++++++++ .../dao/sql/tenant/JpaTenantDaoTest.java | 15 ++ .../dao/sql/widget/JpaWidgetTypeDaoTest.java | 15 ++ dao/src/test/resources/dbunit/rule.xml | 34 ++++ 21 files changed, 837 insertions(+), 235 deletions(-) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/plugin/PluginMetaDataRepository.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleMetaDataRepository.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDaoTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDaoTest.java create mode 100644 dao/src/test/resources/dbunit/rule.xml diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java index d3ed5d1dd1..584beed2ed 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java @@ -33,7 +33,7 @@ public class ModelConstants { */ public static final String ID_PROPERTY = "id"; public static final String USER_ID_PROPERTY = "user_id"; - public static final String TENTANT_ID_PROPERTY = "tenant_id"; + public static final String TENANT_ID_PROPERTY = "tenant_id"; public static final String CUSTOMER_ID_PROPERTY = "customer_id"; public static final String DEVICE_ID_PROPERTY = "device_id"; public static final String TITLE_PROPERTY = "title"; @@ -45,7 +45,7 @@ public class ModelConstants { * Cassandra user constants. */ public static final String USER_COLUMN_FAMILY_NAME = "user"; - public static final String USER_TENANT_ID_PROPERTY = TENTANT_ID_PROPERTY; + public static final String USER_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY; public static final String USER_CUSTOMER_ID_PROPERTY = CUSTOMER_ID_PROPERTY; public static final String USER_EMAIL_PROPERTY = "email"; public static final String USER_AUTHORITY_PROPERTY = "authority"; @@ -106,7 +106,7 @@ public class ModelConstants { * Cassandra customer constants. */ public static final String CUSTOMER_COLUMN_FAMILY_NAME = "customer"; - public static final String CUSTOMER_TENANT_ID_PROPERTY = TENTANT_ID_PROPERTY; + public static final String CUSTOMER_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY; public static final String CUSTOMER_TITLE_PROPERTY = TITLE_PROPERTY; public static final String CUSTOMER_ADDITIONAL_INFO_PROPERTY = ADDITIONAL_INFO_PROPERTY; @@ -116,7 +116,7 @@ public class ModelConstants { * Cassandra device constants. */ public static final String DEVICE_COLUMN_FAMILY_NAME = "device"; - public static final String DEVICE_TENANT_ID_PROPERTY = TENTANT_ID_PROPERTY; + public static final String DEVICE_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY; public static final String DEVICE_CUSTOMER_ID_PROPERTY = CUSTOMER_ID_PROPERTY; public static final String DEVICE_NAME_PROPERTY = "name"; public static final String DEVICE_ADDITIONAL_INFO_PROPERTY = ADDITIONAL_INFO_PROPERTY; @@ -142,7 +142,7 @@ public class ModelConstants { * Cassandra widgets_bundle constants. */ public static final String WIDGETS_BUNDLE_COLUMN_FAMILY_NAME = "widgets_bundle"; - public static final String WIDGETS_BUNDLE_TENANT_ID_PROPERTY = TENTANT_ID_PROPERTY; + public static final String WIDGETS_BUNDLE_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY; public static final String WIDGETS_BUNDLE_ALIAS_PROPERTY = ALIAS_PROPERTY; public static final String WIDGETS_BUNDLE_TITLE_PROPERTY = TITLE_PROPERTY; public static final String WIDGETS_BUNDLE_IMAGE_PROPERTY = "image"; @@ -154,7 +154,7 @@ public class ModelConstants { * Cassandra widget_type constants. */ public static final String WIDGET_TYPE_COLUMN_FAMILY_NAME = "widget_type"; - public static final String WIDGET_TYPE_TENANT_ID_PROPERTY = TENTANT_ID_PROPERTY; + public static final String WIDGET_TYPE_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY; public static final String WIDGET_TYPE_BUNDLE_ALIAS_PROPERTY = "bundle_alias"; public static final String WIDGET_TYPE_ALIAS_PROPERTY = ALIAS_PROPERTY; public static final String WIDGET_TYPE_NAME_PROPERTY = "name"; @@ -166,7 +166,7 @@ public class ModelConstants { * Cassandra dashboard constants. */ public static final String DASHBOARD_COLUMN_FAMILY_NAME = "dashboard"; - public static final String DASHBOARD_TENANT_ID_PROPERTY = TENTANT_ID_PROPERTY; + public static final String DASHBOARD_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY; public static final String DASHBOARD_CUSTOMER_ID_PROPERTY = CUSTOMER_ID_PROPERTY; public static final String DASHBOARD_TITLE_PROPERTY = TITLE_PROPERTY; public static final String DASHBOARD_CONFIGURATION_PROPERTY = "configuration"; @@ -179,7 +179,7 @@ public class ModelConstants { * Cassandra plugin metadata constants. */ public static final String PLUGIN_COLUMN_FAMILY_NAME = "plugin"; - public static final String PLUGIN_TENANT_ID_PROPERTY = TENTANT_ID_PROPERTY; + public static final String PLUGIN_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY; public static final String PLUGIN_NAME_PROPERTY = "name"; public static final String PLUGIN_API_TOKEN_PROPERTY = "api_token"; public static final String PLUGIN_CLASS_PROPERTY = "plugin_class"; @@ -209,7 +209,7 @@ public class ModelConstants { * Cassandra rule metadata constants. */ public static final String RULE_COLUMN_FAMILY_NAME = "rule"; - public static final String RULE_TENANT_ID_PROPERTY = TENTANT_ID_PROPERTY; + public static final String RULE_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY; public static final String RULE_NAME_PROPERTY = "name"; public static final String RULE_STATE_PROPERTY = "state"; public static final String RULE_WEIGHT_PROPERTY = "weight"; @@ -225,7 +225,7 @@ public class ModelConstants { * Cassandra event constants. */ public static final String EVENT_COLUMN_FAMILY_NAME = "event"; - public static final String EVENT_TENANT_ID_PROPERTY = TENTANT_ID_PROPERTY; + public static final String EVENT_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY; public static final String EVENT_TYPE_PROPERTY = "event_type"; public static final String EVENT_UID_PROPERTY = "event_uid"; public static final String EVENT_ENTITY_TYPE_PROPERTY = "entity_type"; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java index 239e51d40c..46f1e32974 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java @@ -22,6 +22,9 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.common.data.id.PluginId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.plugin.ComponentLifecycleState; @@ -29,23 +32,25 @@ import org.thingsboard.server.common.data.plugin.PluginMetaData; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.SearchTextEntity; +import java.io.IOException; import java.util.Objects; import java.util.UUID; - -//@Entity +@Slf4j +@Data +@Entity @Table(name = ModelConstants.PLUGIN_COLUMN_FAMILY_NAME) public class PluginMetaDataEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = -6164321050824823149L; @Id - @Column(name = ModelConstants.ID_PROPERTY) + @Column(name = ModelConstants.ID_PROPERTY, columnDefinition = "BINARY(16)") private UUID id; @Column(name = ModelConstants.PLUGIN_API_TOKEN_PROPERTY) private String apiToken; - @Column(name = ModelConstants.PLUGIN_TENANT_ID_PROPERTY) + @Column(name = ModelConstants.PLUGIN_TENANT_ID_PROPERTY, columnDefinition = "BINARY(16)") private UUID tenantId; @Column(name = ModelConstants.PLUGIN_NAME_PROPERTY) @@ -61,13 +66,13 @@ public class PluginMetaDataEntity implements SearchTextEntity { private ComponentLifecycleState state; @Column(name = ModelConstants.PLUGIN_CONFIGURATION_PROPERTY) - private JsonNode configuration; + private String configuration; @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) private String searchText; @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY) - private JsonNode additionalInfo; + private String additionalInfo; public PluginMetaDataEntity() { } @@ -82,9 +87,13 @@ public class PluginMetaDataEntity implements SearchTextEntity { this.name = pluginMetaData.getName(); this.publicAccess = pluginMetaData.isPublicAccess(); this.state = pluginMetaData.getState(); - this.configuration = pluginMetaData.getConfiguration(); this.searchText = pluginMetaData.getName(); - this.additionalInfo = pluginMetaData.getAdditionalInfo(); + if (pluginMetaData.getConfiguration() != null) { + this.configuration = pluginMetaData.getConfiguration().toString(); + } + if (pluginMetaData.getAdditionalInfo() != null) { + this.additionalInfo = pluginMetaData.getAdditionalInfo().toString(); + } } @Override @@ -107,86 +116,33 @@ public class PluginMetaDataEntity implements SearchTextEntity { this.id = id; } - public String getApiToken() { - return apiToken; - } - - public void setApiToken(String apiToken) { - this.apiToken = apiToken; - } - - public UUID getTenantId() { - return tenantId; - } - - public void setTenantId(UUID tenantId) { - this.tenantId = tenantId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getClazz() { - return clazz; - } - - public void setClazz(String clazz) { - this.clazz = clazz; - } - - public JsonNode getConfiguration() { - return configuration; - } - - public void setConfiguration(JsonNode configuration) { - this.configuration = configuration; - } - - public boolean isPublicAccess() { - return publicAccess; - } - - public void setPublicAccess(boolean publicAccess) { - this.publicAccess = publicAccess; - } - - public ComponentLifecycleState getState() { - return state; - } - - public void setState(ComponentLifecycleState state) { - this.state = state; - } - - public String getSearchText() { - return searchText; - } - - public JsonNode getAdditionalInfo() { - return additionalInfo; - } - - public void setAdditionalInfo(JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - @Override public PluginMetaData toData() { PluginMetaData data = new PluginMetaData(new PluginId(id)); data.setTenantId(new TenantId(tenantId)); data.setCreatedTime(UUIDs.unixTimestamp(id)); data.setName(name); - data.setConfiguration(configuration); data.setClazz(clazz); data.setPublicAccess(publicAccess); data.setState(state); data.setApiToken(apiToken); - data.setAdditionalInfo(additionalInfo); + ObjectMapper mapper = new ObjectMapper(); + if (configuration != null) { + try { + JsonNode jsonNode = mapper.readTree(configuration); + data.setConfiguration(jsonNode); + } catch (IOException e) { + log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", configuration, e.getMessage()), e); + } + } + if (additionalInfo != null) { + try { + JsonNode jsonNode = mapper.readTree(additionalInfo); + data.setAdditionalInfo(jsonNode); + } catch (IOException e) { + log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", additionalInfo, e.getMessage()), e); + } + } return data; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java index 56b8260ae4..54b74b43cc 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java @@ -16,12 +16,17 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; + import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.common.data.id.RuleId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.plugin.ComponentLifecycleState; @@ -30,19 +35,22 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.SearchTextEntity; +import java.io.IOException; import java.util.Objects; import java.util.UUID; -//@Entity +@Slf4j +@Data +@Entity @Table(name = ModelConstants.RULE_COLUMN_FAMILY_NAME) public class RuleMetaDataEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = -1506905644259463884L; @Id - @Column(name = ModelConstants.ID_PROPERTY) + @Column(name = ModelConstants.ID_PROPERTY, columnDefinition = "BINARY(16)") private UUID id; - @Column(name = ModelConstants.RULE_TENANT_ID_PROPERTY) + @Column(name = ModelConstants.RULE_TENANT_ID_PROPERTY, columnDefinition = "BINARY(16)") private UUID tenantId; @Column(name = ModelConstants.RULE_NAME_PROPERTY) private String name; @@ -55,13 +63,13 @@ public class RuleMetaDataEntity implements SearchTextEntity { @Column(name = ModelConstants.RULE_PLUGIN_TOKEN_PROPERTY) private String pluginToken; @Column(name = ModelConstants.RULE_FILTERS) - private JsonNode filters; + private String filters; @Column(name = ModelConstants.RULE_PROCESSOR) - private JsonNode processor; + private String processor; @Column(name = ModelConstants.RULE_ACTION) - private JsonNode action; + private String action; @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY) - private JsonNode additionalInfo; + private String additionalInfo; public RuleMetaDataEntity() { } @@ -76,10 +84,18 @@ public class RuleMetaDataEntity implements SearchTextEntity { this.state = rule.getState(); this.weight = rule.getWeight(); this.searchText = rule.getName(); - this.filters = rule.getFilters(); - this.processor = rule.getProcessor(); - this.action = rule.getAction(); - this.additionalInfo = rule.getAdditionalInfo(); + if (rule.getFilters() != null) { + this.filters = rule.getFilters().toString(); + } + if (rule.getProcessor() != null) { + this.processor = rule.getProcessor().toString(); + } + if (rule.getAction() != null) { + this.action = rule.getAction().toString(); + } + if (rule.getAdditionalInfo() != null) { + this.additionalInfo = rule.getAdditionalInfo().toString(); + } } @Override @@ -102,82 +118,6 @@ public class RuleMetaDataEntity implements SearchTextEntity { this.id = id; } - public UUID getTenantId() { - return tenantId; - } - - public void setTenantId(UUID tenantId) { - this.tenantId = tenantId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public ComponentLifecycleState getState() { - return state; - } - - public void setState(ComponentLifecycleState state) { - this.state = state; - } - - public int getWeight() { - return weight; - } - - public void setWeight(int weight) { - this.weight = weight; - } - - public String getPluginToken() { - return pluginToken; - } - - public void setPluginToken(String pluginToken) { - this.pluginToken = pluginToken; - } - - public String getSearchText() { - return searchText; - } - - public JsonNode getFilters() { - return filters; - } - - public void setFilters(JsonNode filters) { - this.filters = filters; - } - - public JsonNode getProcessor() { - return processor; - } - - public void setProcessor(JsonNode processor) { - this.processor = processor; - } - - public JsonNode getAction() { - return action; - } - - public void setAction(JsonNode action) { - this.action = action; - } - - public JsonNode getAdditionalInfo() { - return additionalInfo; - } - - public void setAdditionalInfo(JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - @Override public RuleMetaData toData() { RuleMetaData rule = new RuleMetaData(new RuleId(id)); @@ -187,10 +127,39 @@ public class RuleMetaDataEntity implements SearchTextEntity { rule.setWeight(weight); rule.setCreatedTime(UUIDs.unixTimestamp(id)); rule.setPluginToken(pluginToken); - rule.setFilters(filters); - rule.setProcessor(processor); - rule.setAction(action); - rule.setAdditionalInfo(additionalInfo); + ObjectMapper mapper = new ObjectMapper(); + if (filters != null) { + try { + JsonNode jsonNode = mapper.readTree(filters); + rule.setFilters(jsonNode); + } catch (IOException e) { + log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", filters, e.getMessage()), e); + } + } + if (processor != null) { + try { + JsonNode jsonNode = mapper.readTree(processor); + rule.setProcessor(jsonNode); + } catch (IOException e) { + log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", processor, e.getMessage()), e); + } + } + if (action != null) { + try { + JsonNode jsonNode = mapper.readTree(action); + rule.setAction(jsonNode); + } catch (IOException e) { + log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", action, e.getMessage()), e); + } + } + if (additionalInfo != null) { + try { + JsonNode jsonNode = mapper.readTree(additionalInfo); + rule.setAdditionalInfo(jsonNode); + } catch (IOException e) { + log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", additionalInfo, e.getMessage()), e); + } + } return rule; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java index 6c54fd01c7..aa388d23d0 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java @@ -1,12 +1,12 @@ /** * 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 - *

+ * + * 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. diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java index 790089182f..00ff20546d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java @@ -25,6 +25,7 @@ import javax.persistence.Transient; import com.datastax.driver.mapping.annotations.PartitionKey; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.WidgetTypeId; @@ -36,6 +37,7 @@ import java.io.IOException; import java.util.UUID; @Slf4j +@Data @Entity @Table(name = ModelConstants.WIDGET_TYPE_COLUMN_FAMILY_NAME) public final class WidgetTypeEntity implements BaseEntity { @@ -93,46 +95,6 @@ public final class WidgetTypeEntity implements BaseEntity { this.id = id; } - public UUID getTenantId() { - return tenantId; - } - - public void setTenantId(UUID tenantId) { - this.tenantId = tenantId; - } - - public String getBundleAlias() { - return bundleAlias; - } - - public void setBundleAlias(String bundleAlias) { - this.bundleAlias = bundleAlias; - } - - public String getAlias() { - return alias; - } - - public void setAlias(String alias) { - this.alias = alias; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescriptor() { - return descriptor; - } - - public void setDescriptor(String descriptor) { - this.descriptor = descriptor; - } - @Override public int hashCode() { int result = id != null ? id.hashCode() : 0; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java index 414c213240..8d064c3138 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java @@ -1,12 +1,12 @@ /** * 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 - *

+ * + * 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. diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java new file mode 100644 index 0000000000..5134ae6994 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java @@ -0,0 +1,140 @@ +/** + * 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.sql.plugin; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Component; +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.DaoUtil; +import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.model.sql.PluginMetaDataEntity; +import org.thingsboard.server.dao.plugin.PluginDao; +import org.thingsboard.server.dao.sql.JpaAbstractDao; + +import java.util.Arrays; +import java.util.List; +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 5/1/2017. + */ +@Slf4j +@Component +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public class JpaBasePluginDao extends JpaAbstractDao implements PluginDao { + + @Autowired + private PluginMetaDataRepository pluginMetaDataRepository; + + @Override + protected Class getEntityClass() { + return PluginMetaDataEntity.class; + } + + @Override + protected String getColumnFamilyName() { + return ModelConstants.PLUGIN_COLUMN_FAMILY_NAME; + } + + @Override + protected CrudRepository getCrudRepository() { + return pluginMetaDataRepository; + } + + @Override + protected boolean isSearchTextDao() { + return true; + } + + @Override + public PluginMetaData findById(PluginId pluginId) { + log.debug("Search plugin meta-data entity by id [{}]", pluginId); + PluginMetaData pluginMetaData = super.findById(pluginId.getId()); + if (log.isTraceEnabled()) { + log.trace("Search result: [{}] for plugin entity [{}]", pluginMetaData != null, pluginMetaData); + } else { + log.debug("Search result: [{}]", pluginMetaData != null); + } + return pluginMetaData; + } + + @Override + public PluginMetaData findByApiToken(String apiToken) { + log.debug("Search plugin meta-data entity by api token [{}]", apiToken); + PluginMetaDataEntity entity = pluginMetaDataRepository.findByApiToken(apiToken); + if (log.isTraceEnabled()) { + log.trace("Search result: [{}] for plugin entity [{}]", entity != null, entity); + } else { + log.debug("Search result: [{}]", entity != null); + } + return DaoUtil.getData(entity); + } + + @Override + public void deleteById(UUID id) { + log.debug("Delete plugin meta-data entity by id [{}]", id); + pluginMetaDataRepository.delete(id); + } + + @Override + public void deleteById(PluginId pluginId) { + deleteById(pluginId.getId()); + } + + @Override + public List findByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink) { + log.debug("Try to find здгпшты by tenantId [{}] and pageLink [{}]", tenantId, pageLink); + List entities; + if (pageLink.getIdOffset() == null) { + entities = pluginMetaDataRepository + .findByTenantIdAndPageLinkFirstPage(pageLink.getLimit(), tenantId.getId(), pageLink.getTextSearch()); + } else { + entities = pluginMetaDataRepository + .findByTenantIdAndPageLinkNextPage(pageLink.getLimit(), tenantId.getId(), pageLink.getTextSearch(), pageLink.getIdOffset()); + } + if (log.isTraceEnabled()) { + log.trace("Search result: [{}]", Arrays.toString(entities.toArray())); + } else { + log.debug("Search result: [{}]", entities.size()); + } + return DaoUtil.convertDataList(entities); + } + + @Override + public List findAllTenantPluginsByTenantId(UUID tenantId, TextPageLink pageLink) { + log.debug("Try to find all tenant plugins by tenantId [{}] and pageLink [{}]", tenantId, pageLink); + List entities; + if (pageLink.getIdOffset() == null) { + entities = pluginMetaDataRepository + .findAllTenantPluginsByTenantIdFirstPage(pageLink.getLimit(), tenantId, pageLink.getTextSearch()); + } else { + entities = pluginMetaDataRepository + .findAllTenantPluginsByTenantIdNextPage(pageLink.getLimit(), tenantId, pageLink.getTextSearch(), pageLink.getIdOffset()); + } + if (log.isTraceEnabled()) { + log.trace("Search result: [{}]", Arrays.toString(entities.toArray())); + } else { + log.debug("Search result: [{}]", entities.size()); + } + return DaoUtil.convertDataList(entities); + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/PluginMetaDataRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/PluginMetaDataRepository.java new file mode 100644 index 0000000000..315042b6c9 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/PluginMetaDataRepository.java @@ -0,0 +1,55 @@ +/** + * 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.sql.plugin; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; +import org.thingsboard.server.common.data.plugin.PluginMetaData; +import org.thingsboard.server.dao.model.sql.PluginMetaDataEntity; +import org.thingsboard.server.dao.model.sql.RuleMetaDataEntity; + +import java.util.List; +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 5/1/2017. + */ +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public interface PluginMetaDataRepository extends CrudRepository { + + PluginMetaDataEntity findByApiToken(String apiToken); + + @Query(nativeQuery = true, value = "SELECT * FROM PLUGIN WHERE TENANT_ID = ?2 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "ORDER BY ID LIMIT ?1") + List findByTenantIdAndPageLinkFirstPage(int limit, UUID tenantId, String textSearch); + + @Query(nativeQuery = true, value = "SELECT * FROM PLUGIN WHERE TENANT_ID = ?2 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "AND ID > ?4 ORDER BY ID LIMIT ?1") + List findByTenantIdAndPageLinkNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); + + @Query(nativeQuery = true, value = "SELECT * FROM PLUGIN WHERE (TENANT_ID = ?2 OR TENANT_ID IS NULL) " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "ORDER BY ID LIMIT ?1") + List findAllTenantPluginsByTenantIdFirstPage(int limit, UUID tenantId, String textSearch); + + @Query(nativeQuery = true, value = "SELECT * FROM PLUGIN WHERE (TENANT_ID = ?2 OR TENANT_ID IS NULL) " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "AND ID > ?4 ORDER BY ID LIMIT ?1") + List findAllTenantPluginsByTenantIdNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java new file mode 100644 index 0000000000..b2a5d121c6 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java @@ -0,0 +1,126 @@ +/** + * 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.sql.rule; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Component; +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.DaoUtil; +import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.model.sql.RuleMetaDataEntity; +import org.thingsboard.server.dao.rule.RuleDao; +import org.thingsboard.server.dao.sql.JpaAbstractDao; + +import java.util.Arrays; +import java.util.List; +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 4/30/2017. + */ +@Slf4j +@Component +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public class JpaBaseRuleDao extends JpaAbstractDao implements RuleDao { + + @Autowired + private RuleMetaDataRepository ruleMetaDataRepository; + + @Override + protected Class getEntityClass() { + return RuleMetaDataEntity.class; + } + @Override + protected String getColumnFamilyName() { + return ModelConstants.RULE_COLUMN_FAMILY_NAME; + } + + @Override + protected CrudRepository getCrudRepository() { + return ruleMetaDataRepository; + } + + @Override + protected boolean isSearchTextDao() { + return true; + } + + @Override + public RuleMetaData findById(RuleId ruleId) { + return findById(ruleId.getId()); + } + + @Override + public List findRulesByPlugin(String pluginToken) { + log.debug("Search rules by api token [{}]", pluginToken); + return DaoUtil.convertDataList(ruleMetaDataRepository.findByPluginToken(pluginToken)); + } + + @Override + public List findByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink) { + log.debug("Try to find rules by tenantId [{}] and pageLink [{}]", tenantId, pageLink); + List entities; + if (pageLink.getIdOffset() == null) { + entities = ruleMetaDataRepository + .findByTenantIdAndPageLinkFirstPage(pageLink.getLimit(), tenantId.getId(), pageLink.getTextSearch()); + } else { + entities = ruleMetaDataRepository + .findByTenantIdAndPageLinkNextPage(pageLink.getLimit(), tenantId.getId(), pageLink.getTextSearch(), pageLink.getIdOffset()); + } + if (log.isTraceEnabled()) { + log.trace("Search result: [{}]", Arrays.toString(entities.toArray())); + } else { + log.debug("Search result: [{}]", entities.size()); + } + return DaoUtil.convertDataList(entities); + } + + @Override + public List findAllTenantRulesByTenantId(UUID tenantId, TextPageLink pageLink) { + log.debug("Try to find all tenant rules by tenantId [{}] and pageLink [{}]", tenantId, pageLink); + List entities; + if (pageLink.getIdOffset() == null) { + entities = ruleMetaDataRepository + .findAllTenantRulesByTenantIdFirstPage(pageLink.getLimit(), tenantId, pageLink.getTextSearch()); + } else { + entities = ruleMetaDataRepository + .findAllTenantRulesByTenantIdNextPage(pageLink.getLimit(), tenantId, pageLink.getTextSearch(), pageLink.getIdOffset()); + } + if (log.isTraceEnabled()) { + log.trace("Search result: [{}]", Arrays.toString(entities.toArray())); + } else { + log.debug("Search result: [{}]", entities.size()); + } + return DaoUtil.convertDataList(entities); + } + + @Override + public void deleteById(UUID id) { + log.debug("Delete rule meta-data entity by id [{}]", id); + ruleMetaDataRepository.delete(id); + } + + @Override + public void deleteById(RuleId ruleId) { + deleteById(ruleId.getId()); + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleMetaDataRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleMetaDataRepository.java new file mode 100644 index 0000000000..1a3b1439ce --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleMetaDataRepository.java @@ -0,0 +1,56 @@ +/** + * 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.sql.rule; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.dao.model.ToData; +import org.thingsboard.server.dao.model.sql.RuleMetaDataEntity; + +import java.util.Collection; +import java.util.List; +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 4/30/2017. + */ +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public interface RuleMetaDataRepository extends CrudRepository { + + List findByPluginToken(String pluginToken); + + @Query(nativeQuery = true, value = "SELECT * FROM RULE WHERE TENANT_ID = ?2 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "ORDER BY ID LIMIT ?1") + List findByTenantIdAndPageLinkFirstPage(int limit, UUID tenantId, String textSearch); + + @Query(nativeQuery = true, value = "SELECT * FROM RULE WHERE TENANT_ID = ?2 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "AND ID > ?4 ORDER BY ID LIMIT ?1") + List findByTenantIdAndPageLinkNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); + + @Query(nativeQuery = true, value = "SELECT * FROM RULE WHERE (TENANT_ID = ?2 OR TENANT_ID IS NULL) " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "ORDER BY ID LIMIT ?1") + List findAllTenantRulesByTenantIdFirstPage(int limit, UUID tenantId, String textSearch); + + @Query(nativeQuery = true, value = "SELECT * FROM RULE WHERE (TENANT_ID = ?2 OR TENANT_ID IS NULL) " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "AND ID > ?4 ORDER BY ID LIMIT ?1") + List findAllTenantRulesByTenantIdNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java index 7cdb72796b..0f34109ad0 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java @@ -1,3 +1,18 @@ +/** + * 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.sql.tenant; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java index ec533f47a0..6c94072305 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java @@ -1,3 +1,18 @@ +/** + * 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.sql.tenant; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java index cffccdb291..3008f59016 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java @@ -1,12 +1,12 @@ /** * 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 - *

+ * + * 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. diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java index cc4df06b94..de32f06f1d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java @@ -1,12 +1,12 @@ /** * 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 - *

+ * + * 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. diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java index 9cc89b23f6..2146a8ff11 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java @@ -1,3 +1,18 @@ +/** + * 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.sql.widget; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetTypeRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetTypeRepository.java index 5b336178d1..6161d12284 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetTypeRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetTypeRepository.java @@ -1,3 +1,18 @@ +/** + * 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.sql.widget; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDaoTest.java new file mode 100644 index 0000000000..f968b68e6e --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDaoTest.java @@ -0,0 +1,104 @@ +/** + * 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.sql.plugin; + +import com.datastax.driver.core.utils.UUIDs; +import com.github.springtestdbunit.annotation.DatabaseSetup; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +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.common.data.rule.RuleMetaData; +import org.thingsboard.server.dao.AbstractJpaDaoTest; +import org.thingsboard.server.dao.plugin.PluginDao; + +import java.util.List; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; + +/** + * Created by Valerii Sosliuk on 5/1/2017. + */ +public class JpaBasePluginDaoTest extends AbstractJpaDaoTest { + + @Autowired + private PluginDao pluginDao; + + @Test + @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + public void testFindByTenantIdAndPageLink() { + UUID tenantId1 = UUIDs.timeBased(); + UUID tenantId2 = UUIDs.timeBased(); + createPluginsTwoTenants(tenantId1, tenantId2, "plugin_"); + assertEquals(60, pluginDao.find().size()); + List rules1 = pluginDao.findByTenantIdAndPageLink( + new TenantId(tenantId1), new TextPageLink(20, "plugin_")); + assertEquals(20, rules1.size()); + + List rules2 = pluginDao.findByTenantIdAndPageLink(new TenantId(tenantId1), + new TextPageLink(20, "plugin_", rules1.get(19).getId().getId(), null)); + assertEquals(10, rules2.size()); + + List rules3 = pluginDao.findByTenantIdAndPageLink(new TenantId(tenantId1), + new TextPageLink(20, "plugin_", rules2.get(9).getId().getId(), null)); + assertEquals(0, rules3.size()); + } + + @Test + @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + public void testFindAllTenantRulesByTenantId() { + UUID tenantId1 = UUIDs.timeBased(); + UUID tenantId2 = UUIDs.timeBased(); + createTenantsAndSystemPlugins(tenantId1, tenantId2, "name_"); + List rules1 = pluginDao.findAllTenantPluginsByTenantId( + tenantId1, new TextPageLink(40, "name_")); + assertEquals(40, rules1.size()); + + List rules2 = pluginDao.findAllTenantPluginsByTenantId(tenantId1, + new TextPageLink(40, "name_", rules1.get(39).getId().getId(), null)); + assertEquals(20, rules2.size()); + + List rules3 = pluginDao.findAllTenantPluginsByTenantId(tenantId1, + new TextPageLink(40, "name_", rules2.get(19).getId().getId(), null)); + assertEquals(0, rules3.size()); + } + + private void createTenantsAndSystemPlugins(UUID tenantId1, UUID tenantId2, String namePrefix) { + for (int i = 0; i < 30; i++) { + createPlugin(tenantId1, namePrefix, i); + createPlugin(tenantId2, namePrefix, i); + createPlugin(null, namePrefix, i); + } + } + + private void createPluginsTwoTenants(UUID tenantId1, UUID tenantId2, String namePrefix) { + for (int i = 0; i < 30; i++) { + createPlugin(tenantId1, namePrefix, i); + createPlugin(tenantId2, namePrefix, i); + } + } + + private void createPlugin(UUID tenantId, String namePrefix, int i) { + PluginMetaData plugin = new PluginMetaData(); + plugin.setId(new PluginId(UUIDs.timeBased())); + plugin.setTenantId(new TenantId(tenantId)); + plugin.setName(namePrefix + i); + pluginDao.save(plugin); + } +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDaoTest.java new file mode 100644 index 0000000000..9e2141db8e --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDaoTest.java @@ -0,0 +1,110 @@ +/** + * 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.sql.rule; + +import com.datastax.driver.core.utils.UUIDs; +import com.github.springtestdbunit.annotation.DatabaseSetup; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +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.AbstractJpaDaoTest; +import org.thingsboard.server.dao.rule.RuleDao; + +import java.util.List; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +/** + * Created by Valerii Sosliuk on 4/30/2017. + */ +public class JpaBaseRuleDaoTest extends AbstractJpaDaoTest { + + @Autowired + private RuleDao jpaBaseRuleDao; + + @Test + @DatabaseSetup("classpath:dbunit/rule.xml") + public void testFindRulesByPlugin() { + assertEquals(3, jpaBaseRuleDao.findRulesByPlugin("token_1").size()); + } + + @Test + @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + public void testFindByTenantIdAndPageLink() { + UUID tenantId1 = UUIDs.timeBased(); + UUID tenantId2 = UUIDs.timeBased(); + createRulesTwoTenants(tenantId1, tenantId2, "name_", "token"); + List rules1 = jpaBaseRuleDao.findByTenantIdAndPageLink( + new TenantId(tenantId1), new TextPageLink(20, "name_")); + assertEquals(20, rules1.size()); + + List rules2 = jpaBaseRuleDao.findByTenantIdAndPageLink(new TenantId(tenantId1), + new TextPageLink(20, "name_", rules1.get(19).getId().getId(), null)); + assertEquals(10, rules2.size()); + + List rules3 = jpaBaseRuleDao.findByTenantIdAndPageLink(new TenantId(tenantId1), + new TextPageLink(20, "name_", rules2.get(9).getId().getId(), null)); + assertEquals(0, rules3.size()); + } + + @Test + @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + public void testFindAllTenantRulesByTenantId() { + UUID tenantId1 = UUIDs.timeBased(); + UUID tenantId2 = UUIDs.timeBased(); + createTenantsAndSystemRules(tenantId1, tenantId2, "name_", "token"); + List rules1 = jpaBaseRuleDao.findAllTenantRulesByTenantId( + tenantId1, new TextPageLink(40, "name_")); + assertEquals(40, rules1.size()); + + List rules2 = jpaBaseRuleDao.findAllTenantRulesByTenantId(tenantId1, + new TextPageLink(40, "name_", rules1.get(39).getId().getId(), null)); + assertEquals(20, rules2.size()); + + List rules3 = jpaBaseRuleDao.findAllTenantRulesByTenantId(tenantId1, + new TextPageLink(40, "name_", rules2.get(19).getId().getId(), null)); + assertEquals(0, rules3.size()); + } + + private void createRulesTwoTenants(UUID tenantId1, UUID tenantId2, String namePrefix, String pluginToken) { + for (int i = 0; i < 30; i++) { + createRule(tenantId1, namePrefix, pluginToken, i); + createRule(tenantId2, namePrefix, pluginToken, i); + } + } + + private void createTenantsAndSystemRules(UUID tenantId1, UUID tenantId2, String namePrefix, String pluginToken) { + for (int i = 0; i < 30; i++) { + createRule(tenantId1, namePrefix, pluginToken, i); + createRule(tenantId2, namePrefix, pluginToken, i); + createRule(null, namePrefix, pluginToken, i); + } + } + + private void createRule(UUID tenantId, String namePrefix, String pluginToken, int i) { + RuleMetaData ruleMetaData = new RuleMetaData(); + ruleMetaData.setId(new RuleId(UUIDs.timeBased())); + ruleMetaData.setTenantId(new TenantId(tenantId)); + ruleMetaData.setName(namePrefix + i); + ruleMetaData.setPluginToken(pluginToken); + jpaBaseRuleDao.save(ruleMetaData); + } +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java index 2515618829..4b3555a10f 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java @@ -1,3 +1,18 @@ +/** + * 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.sql.tenant; import com.datastax.driver.core.utils.UUIDs; diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java index c41a7c5495..c38ccbd892 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java @@ -1,3 +1,18 @@ +/** + * 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.sql.widget; import com.datastax.driver.core.utils.UUIDs; diff --git a/dao/src/test/resources/dbunit/rule.xml b/dao/src/test/resources/dbunit/rule.xml new file mode 100644 index 0000000000..dfe1054785 --- /dev/null +++ b/dao/src/test/resources/dbunit/rule.xml @@ -0,0 +1,34 @@ + + + + + + \ No newline at end of file From bfd0118881db0da5a671f3e9035c62e57ddd319d Mon Sep 17 00:00:00 2001 From: mp-loki Date: Sat, 6 May 2017 00:07:21 -0400 Subject: [PATCH 19/69] JpaAbstractSearchTimeDao JpaBaseEventDao --- .../dao/event/CassandraBaseEventDao.java | 2 +- .../server/dao/model/nosql/EventEntity.java | 8 +- .../server/dao/model/sql/EventEntity.java | 49 ++++-- .../dao/sql/JpaAbstractSearchTextDao.java | 14 ++ .../dao/sql/JpaAbstractSearchTimeDao.java | 62 ++++++++ .../server/dao/sql/event/EventRepository.java | 24 +++ .../server/dao/sql/event/JpaBaseEventDao.java | 137 +++++++++++++++++ .../dao/sql/plugin/JpaBasePluginDao.java | 8 +- .../server/dao/sql/rule/JpaBaseRuleDao.java | 8 +- .../server/dao/sql/tenant/JpaTenantDao.java | 8 +- .../dao/sql/widget/JpaWidgetsBundleDao.java | 7 +- .../dao/sql/event/JpaBaseEventDaoTest.java | 145 ++++++++++++++++++ dao/src/test/resources/dbunit/events.xml | 18 +++ 13 files changed, 445 insertions(+), 45 deletions(-) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTextDao.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTimeDao.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java create mode 100644 dao/src/test/resources/dbunit/events.xml diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java index 3598d2a176..5d4b91cb8a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java @@ -142,7 +142,7 @@ public class CassandraBaseEventDao extends CassandraAbstractSearchTimeDao { @Transient @@ -63,7 +63,7 @@ public class EventEntity implements BaseEntity { @ClusteringColumn(value = 1) @Column(name = EVENT_UID_PROPERTY) - private String eventUId; + private String eventUid; @Column(name = EVENT_BODY_PROPERTY, codec = JsonCodec.class) private JsonNode body; @@ -80,7 +80,7 @@ public class EventEntity implements BaseEntity { this.entityId = event.getEntityId().getId(); } this.eventType = event.getType(); - this.eventUId = event.getUid(); + this.eventUid = event.getUid(); this.body = event.getBody(); } @@ -118,7 +118,7 @@ public class EventEntity implements BaseEntity { } event.setBody(body); event.setType(eventType); - event.setUid(eventUId); + event.setUid(eventUid); return event; } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java index 92808ba2b5..9bfa663213 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java @@ -22,46 +22,51 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; 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.model.ModelConstants; +import static org.thingsboard.server.dao.model.ModelConstants.*; + +import java.io.IOException; import java.util.UUID; @Data +@Slf4j @NoArgsConstructor -//@Entity -@Table(name = ModelConstants.DEVICE_COLUMN_FAMILY_NAME) +@Entity +@Table(name = EVENT_COLUMN_FAMILY_NAME) public class EventEntity implements BaseEntity { @Transient private static final long serialVersionUID = -5717830061727466727L; - @Column(name = ModelConstants.ID_PROPERTY) + @Id + @Column(name = ID_PROPERTY, columnDefinition = "BINARY(16)") private UUID id; - @Id - @Column(name = ModelConstants.EVENT_TENANT_ID_PROPERTY) + @Column(name = EVENT_TENANT_ID_PROPERTY, columnDefinition = "BINARY(16)") private UUID tenantId; - @Column(name = ModelConstants.EVENT_ENTITY_TYPE_PROPERTY) + @Column(name = EVENT_ENTITY_TYPE_PROPERTY) private EntityType entityType; - @Column(name = ModelConstants.EVENT_ENTITY_ID_PROPERTY) + @Column(name = EVENT_ENTITY_ID_PROPERTY, columnDefinition = "BINARY(16)") private UUID entityId; - @Column(name = ModelConstants.EVENT_TYPE_PROPERTY) + @Column(name = EVENT_TYPE_PROPERTY) private String eventType; - @Column(name = ModelConstants.EVENT_UID_PROPERTY) - private String eventUId; + @Column(name = EVENT_UID_PROPERTY) + private String eventUid; - @Column(name = ModelConstants.EVENT_BODY_PROPERTY) - private JsonNode body; + @Column(name = EVENT_BODY_PROPERTY) + private String body; public EventEntity(Event event) { if (event.getId() != null) { @@ -75,8 +80,10 @@ public class EventEntity implements BaseEntity { this.entityId = event.getEntityId().getId(); } this.eventType = event.getType(); - this.eventUId = event.getUid(); - this.body = event.getBody(); + this.eventUid = event.getUid(); + if (event.getBody() != null) { + this.body = event.getBody().toString(); + } } @Override @@ -111,9 +118,17 @@ public class EventEntity implements BaseEntity { event.setEntityId(new PluginId(entityId)); break; } - event.setBody(body); + ObjectMapper mapper = new ObjectMapper(); + if (body != null) { + try { + JsonNode jsonNode = mapper.readTree(body); + event.setBody(jsonNode); + } catch (IOException e) { + log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", body, e.getMessage()), e); + } + } event.setType(eventType); - event.setUid(eventUId); + event.setUid(eventUid); return event; } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTextDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTextDao.java new file mode 100644 index 0000000000..02d0e07871 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTextDao.java @@ -0,0 +1,14 @@ +package org.thingsboard.server.dao.sql; + +import org.thingsboard.server.dao.model.BaseEntity; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +public abstract class JpaAbstractSearchTextDao , D> extends JpaAbstractDao { + + @Override + protected boolean isSearchTextDao() { + return true; + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTimeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTimeDao.java new file mode 100644 index 0000000000..f0e5cb2e65 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTimeDao.java @@ -0,0 +1,62 @@ +package org.thingsboard.server.dao.sql; + +import com.datastax.driver.core.utils.UUIDs; +import org.springframework.data.jpa.domain.Specification; +import org.thingsboard.server.common.data.page.TimePageLink; +import org.thingsboard.server.dao.model.BaseEntity; +import static org.thingsboard.server.dao.model.ModelConstants.*; + +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Predicate; +import javax.persistence.criteria.Root; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 5/4/2017. + */ +public abstract class JpaAbstractSearchTimeDao, D> extends JpaAbstractDao { + + protected Specification getTimeSearchPageSpec(TimePageLink pageLink) { + return new Specification() { + @Override + public Predicate toPredicate(Root root, CriteriaQuery criteriaQuery, CriteriaBuilder criteriaBuilder) { + Predicate lowerBound = null; + Predicate upperBound = null; + List predicates = new ArrayList<>(); + if (pageLink.isAscOrder()) { + if (pageLink.getIdOffset() != null) { + lowerBound = criteriaBuilder.greaterThan(root.get(ID_PROPERTY), pageLink.getIdOffset()); + predicates.add(lowerBound); + } else if (pageLink.getStartTime() != null) { + UUID startOf = UUIDs.startOf(pageLink.getStartTime()); + lowerBound = criteriaBuilder.greaterThanOrEqualTo(root.get(ID_PROPERTY), startOf); + predicates.add(lowerBound); + } + if (pageLink.getEndTime() != null) { + UUID endOf = UUIDs.endOf(pageLink.getEndTime()); + upperBound = criteriaBuilder.lessThanOrEqualTo(root.get(ID_PROPERTY), endOf); + predicates.add(upperBound); + } + } else { + if (pageLink.getIdOffset() != null) { + lowerBound = criteriaBuilder.lessThan(root.get(ID_PROPERTY), pageLink.getIdOffset()); + predicates.add(lowerBound); + } else if (pageLink.getEndTime() != null) { + UUID endOf = UUIDs.endOf(pageLink.getEndTime()); + lowerBound = criteriaBuilder.lessThanOrEqualTo(root.get(ID_PROPERTY), endOf); + predicates.add(lowerBound); + } + if (pageLink.getStartTime() != null) { + UUID startOf = UUIDs.startOf(pageLink.getStartTime()); + upperBound = criteriaBuilder.greaterThanOrEqualTo(root.get(ID_PROPERTY), startOf); + predicates.add(upperBound); + } + } + return criteriaBuilder.and(predicates.toArray(new Predicate[0])); + } + }; + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java new file mode 100644 index 0000000000..32a5b3bad5 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java @@ -0,0 +1,24 @@ +package org.thingsboard.server.dao.sql.event; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +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.common.data.Event; +import org.thingsboard.server.dao.model.sql.EventEntity; + +import java.util.List; +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 5/3/2017. + */ +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public interface EventRepository extends CrudRepository, JpaSpecificationExecutor { + + EventEntity findByTenantIdAndEntityTypeAndEntityIdAndEventTypeAndEventUid( + UUID tenantId, EntityType entityType, UUID id, String eventType, String eventUid); + +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java new file mode 100644 index 0000000000..3972c8e4d6 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java @@ -0,0 +1,137 @@ +package org.thingsboard.server.dao.sql.event; + +import com.datastax.driver.core.utils.UUIDs; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.data.jpa.domain.Specification; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Component; +import org.thingsboard.server.common.data.Event; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.page.TimePageLink; +import org.thingsboard.server.dao.DaoUtil; +import org.thingsboard.server.dao.event.EventDao; +import org.thingsboard.server.dao.model.sql.EventEntity; +import org.thingsboard.server.dao.sql.JpaAbstractSearchTimeDao; + +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Predicate; +import javax.persistence.criteria.Root; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +import static org.springframework.data.jpa.domain.Specifications.where; +import static org.thingsboard.server.dao.model.ModelConstants.EVENT_COLUMN_FAMILY_NAME; +import static org.thingsboard.server.dao.model.ModelConstants.ID_PROPERTY; +import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; + +/** + * Created by Valerii Sosliuk on 5/3/2017. + */ +@Slf4j +@Component +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public class JpaBaseEventDao extends JpaAbstractSearchTimeDao implements EventDao { + + private final UUID systemTenantId = NULL_UUID; + + @Autowired + private EventRepository eventRepository; + + @Override + protected Class getEntityClass() { + return EventEntity.class; + } + + @Override + protected String getColumnFamilyName() { + return EVENT_COLUMN_FAMILY_NAME; + } + + @Override + protected CrudRepository getCrudRepository() { + return eventRepository; + } + + @Override + public Event save(Event event) { + if (StringUtils.isEmpty(event.getUid())) { + event.setUid(event.getId().toString()); + } + return save(new EventEntity(event), false).orElse(null); + } + + @Override + public Optional saveIfNotExists(Event event) { + return save(new EventEntity(event), true); + } + + @Override + public Event findEvent(UUID tenantId, EntityId entityId, String eventType, String eventUid) { + return DaoUtil.getData(eventRepository.findByTenantIdAndEntityTypeAndEntityIdAndEventTypeAndEventUid( + tenantId, entityId.getEntityType(), entityId.getId(), eventType, eventUid)); + } + + @Override + public List findEvents(UUID tenantId, EntityId entityId, TimePageLink pageLink) { + return findEvents(tenantId, entityId, null, pageLink); + } + @Override + public List findEvents(UUID tenantId, EntityId entityId, String eventType, TimePageLink pageLink) { + Specification timeSearchSpec = getTimeSearchPageSpec(pageLink); + Specification fieldsSpec = getEntityFieldsSpec(tenantId, entityId, eventType); + Sort.Direction sortDirection = pageLink.isAscOrder() ? Sort.Direction.ASC : Sort.Direction.DESC; + Pageable pageable = new PageRequest(0, pageLink.getLimit(), sortDirection, ID_PROPERTY); + return DaoUtil.convertDataList(eventRepository.findAll(where(timeSearchSpec).and(fieldsSpec), pageable).getContent()); + } + + public Optional save(EventEntity entity, boolean ifNotExists) { + log.debug("Save event [{}] ", entity); + if (entity.getTenantId() == null) { + log.trace("Save system event with predefined id {}", systemTenantId); + entity.setTenantId(systemTenantId); + } + if (entity.getId() == null) { + entity.setId(UUIDs.timeBased()); + } + if (StringUtils.isEmpty(entity.getEventUid())) { + entity.setEventUid(entity.getId().toString()); + } + if (ifNotExists && findById(entity.getId()) != null) { + return Optional.empty(); + } + return Optional.of(DaoUtil.getData(eventRepository.save(entity))); + } + + private Specification getEntityFieldsSpec(UUID tenantId, EntityId entityId, String eventType) { + return new Specification() { + @Override + public Predicate toPredicate(Root root, CriteriaQuery criteriaQuery, CriteriaBuilder criteriaBuilder) { + List predicates = new ArrayList(); + if (tenantId != null) { + Predicate tenantIdPredicate = criteriaBuilder.equal(root.get("tenantId"), tenantId); + predicates.add(tenantIdPredicate); + } + if (entityId != null) { + Predicate entityTypePredicate = criteriaBuilder.equal(root.get("entityType"), entityId.getEntityType()); + Predicate entityIdPredicate = criteriaBuilder.equal(root.get("entityId"), entityId.getId()); + predicates.add(entityTypePredicate); + predicates.add(entityIdPredicate); + } + if (eventType != null) { + Predicate eventTypePredicate = criteriaBuilder.equal(root.get("eventType"), eventType); + predicates.add(eventTypePredicate); + } + return criteriaBuilder.and(predicates.toArray(new Predicate[0])); + } + }; + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java index 5134ae6994..44e43d5e03 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java @@ -29,6 +29,7 @@ import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.sql.PluginMetaDataEntity; import org.thingsboard.server.dao.plugin.PluginDao; import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import java.util.Arrays; import java.util.List; @@ -40,7 +41,7 @@ import java.util.UUID; @Slf4j @Component @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) -public class JpaBasePluginDao extends JpaAbstractDao implements PluginDao { +public class JpaBasePluginDao extends JpaAbstractSearchTextDao implements PluginDao { @Autowired private PluginMetaDataRepository pluginMetaDataRepository; @@ -60,11 +61,6 @@ public class JpaBasePluginDao extends JpaAbstractDao implements RuleDao { +public class JpaBaseRuleDao extends JpaAbstractSearchTextDao implements RuleDao { @Autowired private RuleMetaDataRepository ruleMetaDataRepository; @@ -59,11 +60,6 @@ public class JpaBaseRuleDao extends JpaAbstractDao implements TenantDao { +public class JpaTenantDao extends JpaAbstractSearchTextDao implements TenantDao { @Autowired private TenantRepository tenantRepository; @@ -56,11 +57,6 @@ public class JpaTenantDao extends JpaAbstractDao implement return tenantRepository; } - @Override - protected boolean isSearchTextDao() { - return true; - } - @Override public List findTenantsByRegion(String region, TextPageLink pageLink) { if (pageLink.getIdOffset() == null) { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java index ff40dd29af..4288e5ab74 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java @@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.widget.WidgetsBundle; import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.WidgetsBundleEntity; import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import org.thingsboard.server.dao.widget.WidgetsBundleDao; import java.util.List; @@ -36,7 +37,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.WIDGETS_BUNDLE_COL */ @Component @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) -public class JpaWidgetsBundleDao extends JpaAbstractDao implements WidgetsBundleDao { +public class JpaWidgetsBundleDao extends JpaAbstractSearchTextDao implements WidgetsBundleDao { @Autowired private WidgetsBundleRepository widgetsBundleRepository; @@ -61,10 +62,6 @@ public class JpaWidgetsBundleDao extends JpaAbstractDao findSystemWidgetsBundles(TextPageLink pageLink) { diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java new file mode 100644 index 0000000000..cdebaddb51 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java @@ -0,0 +1,145 @@ +package org.thingsboard.server.dao.sql.event; + +import ch.qos.logback.core.net.SyslogOutputStream; +import com.datastax.driver.core.utils.UUIDs; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.springtestdbunit.annotation.DatabaseSetup; +import lombok.extern.slf4j.Slf4j; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.thingsboard.server.common.data.Event; +import org.thingsboard.server.common.data.id.DeviceId; +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.AbstractJpaDaoTest; +import org.thingsboard.server.dao.event.EventDao; + +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +import static org.junit.Assert.*; +import static org.thingsboard.server.common.data.DataConstants.STATS; + +/** + * Created by Valerii Sosliuk on 5/5/2017. + */ +@Slf4j +public class JpaBaseEventDaoTest extends AbstractJpaDaoTest { + + public static final long HOUR_MILLISECONDS = (long) 3.6e+6; + @Autowired + private EventDao eventDao; + + @Test + @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + public void testSaveIfNotExists() { + UUID eventId = UUIDs.timeBased(); + UUID tenantId = UUIDs.timeBased(); + UUID entityId = UUIDs.timeBased(); + Event event = getEvent(eventId, tenantId, entityId); + Optional optEvent1 = eventDao.saveIfNotExists(event); + assertTrue("Optional is expected to be non-empty", optEvent1.isPresent()); + assertEquals(optEvent1.get(), event); + Optional optEvent2 = eventDao.saveIfNotExists(event); + assertFalse("Optional is expected to be empty", optEvent2.isPresent()); + } + + @Test + @DatabaseSetup("classpath:dbunit/events.xml") + public void findEvent() { + UUID tenantId = UUID.fromString("be41c7a0-31f5-11e7-9cfd-2786e6aa2046"); + UUID entityId = UUID.fromString("be41c7a1-31f5-11e7-9cfd-2786e6aa2046"); + String eventType = STATS; + String eventUid = "be41c7a3-31f5-11e7-9cfd-2786e6aa2046"; + Event event = eventDao.findEvent(tenantId, new DeviceId(entityId), eventType, eventUid); + assertNotNull("Event expected to be not null", event); + assertEquals("be41c7a2-31f5-11e7-9cfd-2786e6aa2046", event.getId().getId().toString()); + } + + @Test + @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + public void findEventsByEntityIdAndPageLink() { + UUID tenantId = UUIDs.timeBased(); + UUID entityId1 = UUIDs.timeBased(); + UUID entityId2 = UUIDs.timeBased(); + long startTime = System.currentTimeMillis(); + long endTime = createEventsTwoEntities(tenantId, entityId1, entityId2, startTime, 20); + List allEvents = eventDao.find(); + + assertEquals(20, allEvents.size()); + + TimePageLink pageLink1 = new TimePageLink(30, null, null, true); + List events1 = eventDao.findEvents(tenantId, new DeviceId(entityId1), pageLink1); + assertEquals(10, events1.size()); + + TimePageLink pageLink2 = new TimePageLink(30, startTime, null, true); + List events2 = eventDao.findEvents(tenantId, new DeviceId(entityId1), pageLink2); + assertEquals(10, events2.size()); + + TimePageLink pageLink3 = new TimePageLink(30, startTime, endTime, true); + List events3 = eventDao.findEvents(tenantId, new DeviceId(entityId1), pageLink3); + assertEquals(10, events3.size()); + + TimePageLink pageLink4 = new TimePageLink(5, startTime, endTime, true); + List events4 = eventDao.findEvents(tenantId, new DeviceId(entityId1), pageLink4); + assertEquals(5, events4.size()); + + UUID idOffset = events4.get(4).getId().getId(); + TimePageLink pageLink5 = new TimePageLink(10, startTime, endTime, true, idOffset); + List events5 = eventDao.findEvents(tenantId, new DeviceId(entityId1), pageLink5); + assertEquals(5, events5.size()); + + } + + private long createEventsTwoEntities(UUID tenantId, UUID entityId1, UUID entityId2, long startTime, int count) { + // Generate #count events for two entities with timestamps from an hour ago till now + + // Distribute events uniformly + long step = HOUR_MILLISECONDS / count; + long timestamp = startTime; + for (int i = 0; i < count / 2; i++) { + //UUID eventId1 = UUIDs.startOf(timestamp); + UUID eventId1 = UUIDs.timeBased(); + Event event1 = getEvent(eventId1, tenantId, entityId1); + eventDao.save(event1); + timestamp += step; + //UUID eventId2 = UUIDs.startOf(timestamp); + UUID eventId2 = UUIDs.timeBased(); + Event event2 = getEvent(eventId2, tenantId, entityId2); + eventDao.save(event2); + timestamp += step; + } + return System.currentTimeMillis(); + } + + @Test + @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + public void findEventsByEntityIdAndEventTypeAndPageLink() { + + } + + private Event getEvent(UUID eventId, UUID tenantId, UUID entityId) { + Event event = new Event(); + event.setId(new EventId(eventId)); + event.setTenantId(new TenantId(tenantId)); + EntityId deviceId = new DeviceId(entityId); + event.setEntityId(deviceId); + event.setUid(entityId.toString()); + event.setType(STATS); + ObjectMapper mapper = new ObjectMapper(); + try { + JsonNode jsonNode = mapper.readTree("{\"key\":\"value\"}"); + event.setBody(jsonNode); + } catch (IOException e) { + log.error(e.getMessage(), e); + } + return event; + } +} diff --git a/dao/src/test/resources/dbunit/events.xml b/dao/src/test/resources/dbunit/events.xml new file mode 100644 index 0000000000..8f8875882b --- /dev/null +++ b/dao/src/test/resources/dbunit/events.xml @@ -0,0 +1,18 @@ + + + + \ No newline at end of file From 63988199ab4bda963435132acee7f89d2a0bee77 Mon Sep 17 00:00:00 2001 From: mp-loki Date: Sat, 6 May 2017 21:26:20 -0400 Subject: [PATCH 20/69] Configured tests to run against postgresql. JpaDeviceCredentialsDao and JpaDeviceDao implemented --- dao/pom.xml | 4 + .../server/dao/model/ModelConstants.java | 1 + .../model/sql/DeviceCredentialsEntity.java | 45 +----- .../server/dao/model/sql/DeviceEntity.java | 66 +++----- .../server/dao/model/sql/EventEntity.java | 6 +- .../dao/model/sql/PluginMetaDataEntity.java | 4 +- .../dao/model/sql/RuleMetaDataEntity.java | 4 +- .../server/dao/model/sql/TenantEntity.java | 2 +- .../dao/model/sql/UserCredentialsEntity.java | 4 +- .../server/dao/model/sql/UserEntity.java | 8 +- .../dao/model/sql/WidgetTypeEntity.java | 4 +- .../dao/model/sql/WidgetsBundleEntity.java | 4 +- .../server/dao/sql/JpaAbstractDao.java | 5 + .../device/DeviceCredentialsRepository.java | 19 +++ .../dao/sql/device/DeviceRepository.java | 47 ++++++ .../sql/device/JpaDeviceCredentialsDao.java | 52 +++++++ .../server/dao/sql/device/JpaDeviceDao.java | 91 +++++++++++ .../server/dao/sql/user/UserRepository.java | 8 +- .../server/dao/AbstractJpaDaoTest.java | 4 +- .../server/dao/JpaDbunitTestConfig.java | 39 +++++ .../device/JpaDeviceCredentialsDaoTest.java | 41 +++++ .../dao/sql/device/JpaDeviceDaoTest.java | 146 ++++++++++++++++++ .../dao/sql/event/JpaBaseEventDaoTest.java | 3 - .../dao/sql/plugin/JpaBasePluginDaoTest.java | 1 - .../server/dao/sql/user/JpaUserDaoTest.java | 2 - .../dao/sql/widget/JpaWidgetTypeDaoTest.java | 1 - .../sql/widget/JpaWidgetsBundleDaoTest.java | 17 +- .../resources/dbunit/device_credentials.xml | 16 ++ dao/src/test/resources/dbunit/events.xml | 12 +- dao/src/test/resources/dbunit/rule.xml | 16 +- .../resources/dbunit/user_credentials.xml | 8 +- dao/src/test/resources/dbunit/users.xml | 26 ++-- dao/src/test/resources/dbunit/widget_type.xml | 16 +- .../test/resources/dbunit/widgets_bundle.xml | 29 ++-- dao/src/test/resources/jpa-test.properties | 16 +- pom.xml | 6 + 36 files changed, 590 insertions(+), 183 deletions(-) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceCredentialsRepository.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDaoTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceDaoTest.java create mode 100644 dao/src/test/resources/dbunit/device_credentials.xml diff --git a/dao/pom.xml b/dao/pom.xml index fddc440eea..d95521ddd0 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -56,6 +56,10 @@ ch.qos.logback logback-classic + + org.postgresql + postgresql + org.springframework spring-test diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java index 584beed2ed..b721780343 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java @@ -45,6 +45,7 @@ public class ModelConstants { * Cassandra user constants. */ public static final String USER_COLUMN_FAMILY_NAME = "user"; + public static final String USER_PG_HIBERNATE_COLUMN_FAMILY_NAME = "tb_user"; public static final String USER_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY; public static final String USER_CUSTOMER_ID_PROPERTY = CUSTOMER_ID_PROPERTY; public static final String USER_EMAIL_PROPERTY = "email"; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java index 56ebc43154..b55b9b36b6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java @@ -21,6 +21,8 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; + +import lombok.Data; import org.thingsboard.server.common.data.id.DeviceCredentialsId; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.security.DeviceCredentials; @@ -30,7 +32,8 @@ import org.thingsboard.server.dao.model.ModelConstants; import java.util.UUID; -//@Entity +@Data +@Entity @Table(name = ModelConstants.DEVICE_CREDENTIALS_COLUMN_FAMILY_NAME) public final class DeviceCredentialsEntity implements BaseEntity { @@ -68,46 +71,6 @@ public final class DeviceCredentialsEntity implements BaseEntity { @@ -55,7 +61,7 @@ public final class DeviceEntity implements SearchTextEntity { private String searchText; @Column(name = ModelConstants.DEVICE_ADDITIONAL_INFO_PROPERTY) - private JsonNode additionalInfo; + private String additionalInfo; public DeviceEntity() { super(); @@ -72,49 +78,11 @@ public final class DeviceEntity implements SearchTextEntity { this.customerId = device.getCustomerId().getId(); } this.name = device.getName(); - this.additionalInfo = device.getAdditionalInfo(); - } - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public UUID getTenantId() { - return tenantId; - } - - public void setTenantId(UUID tenantId) { - this.tenantId = tenantId; - } - - public UUID getCustomerId() { - return customerId; - } - - public void setCustomerId(UUID customerId) { - this.customerId = customerId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public JsonNode getAdditionalInfo() { - return additionalInfo; + if (additionalInfo != null) { + this.additionalInfo = device.getAdditionalInfo().toString(); + } } - public void setAdditionalInfo(JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - @Override public String getSearchTextSource() { return name; @@ -206,8 +174,16 @@ public final class DeviceEntity implements SearchTextEntity { device.setCustomerId(new CustomerId(customerId)); } device.setName(name); - device.setAdditionalInfo(additionalInfo); + if (additionalInfo != null) { + ObjectMapper mapper = new ObjectMapper(); + JsonNode jsonNode = null; + try { + jsonNode = mapper.readTree(additionalInfo); + device.setAdditionalInfo(jsonNode); + } catch (IOException e) { + log.error(e.getMessage(), e); + } + } return device; } - } \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java index 9bfa663213..a0cce5ca22 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java @@ -47,16 +47,16 @@ public class EventEntity implements BaseEntity { private static final long serialVersionUID = -5717830061727466727L; @Id - @Column(name = ID_PROPERTY, columnDefinition = "BINARY(16)") + @Column(name = ID_PROPERTY) private UUID id; - @Column(name = EVENT_TENANT_ID_PROPERTY, columnDefinition = "BINARY(16)") + @Column(name = EVENT_TENANT_ID_PROPERTY) private UUID tenantId; @Column(name = EVENT_ENTITY_TYPE_PROPERTY) private EntityType entityType; - @Column(name = EVENT_ENTITY_ID_PROPERTY, columnDefinition = "BINARY(16)") + @Column(name = EVENT_ENTITY_ID_PROPERTY) private UUID entityId; @Column(name = EVENT_TYPE_PROPERTY) diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java index 46f1e32974..1e5d1b09a1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java @@ -44,13 +44,13 @@ public class PluginMetaDataEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = -6164321050824823149L; @Id - @Column(name = ModelConstants.ID_PROPERTY, columnDefinition = "BINARY(16)") + @Column(name = ModelConstants.ID_PROPERTY) private UUID id; @Column(name = ModelConstants.PLUGIN_API_TOKEN_PROPERTY) private String apiToken; - @Column(name = ModelConstants.PLUGIN_TENANT_ID_PROPERTY, columnDefinition = "BINARY(16)") + @Column(name = ModelConstants.PLUGIN_TENANT_ID_PROPERTY) private UUID tenantId; @Column(name = ModelConstants.PLUGIN_NAME_PROPERTY) diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java index 54b74b43cc..54359a35aa 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java @@ -48,9 +48,9 @@ public class RuleMetaDataEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = -1506905644259463884L; @Id - @Column(name = ModelConstants.ID_PROPERTY, columnDefinition = "BINARY(16)") + @Column(name = ModelConstants.ID_PROPERTY) private UUID id; - @Column(name = ModelConstants.RULE_TENANT_ID_PROPERTY, columnDefinition = "BINARY(16)") + @Column(name = ModelConstants.RULE_TENANT_ID_PROPERTY) private UUID tenantId; @Column(name = ModelConstants.RULE_NAME_PROPERTY) private String name; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java index aa388d23d0..6a2e8a066b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java @@ -45,7 +45,7 @@ public final class TenantEntity implements SearchTextEntity { private static final long serialVersionUID = -4330655990232136337L; @Id - @Column(name = ModelConstants.ID_PROPERTY, columnDefinition = "BINARY(16)") + @Column(name = ModelConstants.ID_PROPERTY) private UUID id; @Column(name = ModelConstants.TENANT_TITLE_PROPERTY) diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java index b750ecea00..8e228d5056 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java @@ -41,10 +41,10 @@ public final class UserCredentialsEntity implements BaseEntity private static final long serialVersionUID = -3989724854149114846L; @Id - @Column(name = ModelConstants.ID_PROPERTY, columnDefinition = "BINARY(16)") + @Column(name = ModelConstants.ID_PROPERTY) private UUID id; - @Column(name = ModelConstants.USER_CREDENTIALS_USER_ID_PROPERTY, columnDefinition = "BINARY(16)", unique = true) + @Column(name = ModelConstants.USER_CREDENTIALS_USER_ID_PROPERTY, unique = true) private UUID userId; @Column(name = ModelConstants.USER_CREDENTIALS_ENABLED_PROPERTY) diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java index 9df32e3eda..c85b2aa9d9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java @@ -38,19 +38,19 @@ import java.util.UUID; @Slf4j @Data @Entity -@Table(name = ModelConstants.USER_COLUMN_FAMILY_NAME) +@Table(name = ModelConstants.USER_PG_HIBERNATE_COLUMN_FAMILY_NAME) public class UserEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = -271106508790582977L; @Id - @Column(name = ModelConstants.ID_PROPERTY, columnDefinition = "BINARY(16)") + @Column(name = ModelConstants.ID_PROPERTY) private UUID id; - @Column(name = ModelConstants.USER_TENANT_ID_PROPERTY, columnDefinition = "BINARY(16)") + @Column(name = ModelConstants.USER_TENANT_ID_PROPERTY) private UUID tenantId; - @Column(name = ModelConstants.USER_CUSTOMER_ID_PROPERTY, columnDefinition = "BINARY(16)") + @Column(name = ModelConstants.USER_CUSTOMER_ID_PROPERTY) private UUID customerId; @Column(name = ModelConstants.USER_AUTHORITY_PROPERTY) diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java index 00ff20546d..4f31e70201 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java @@ -46,11 +46,11 @@ public final class WidgetTypeEntity implements BaseEntity { private static final long serialVersionUID = -5436279069884988630L; @Id - @Column(name = ModelConstants.ID_PROPERTY, columnDefinition = "BINARY(16)") + @Column(name = ModelConstants.ID_PROPERTY) private UUID id; @PartitionKey(value = 1) - @Column(name = ModelConstants.WIDGET_TYPE_TENANT_ID_PROPERTY, columnDefinition = "BINARY(16)") + @Column(name = ModelConstants.WIDGET_TYPE_TENANT_ID_PROPERTY) private UUID tenantId; @PartitionKey(value = 2) diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java index 92f2e414da..3e72606885 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java @@ -42,10 +42,10 @@ public final class WidgetsBundleEntity implements SearchTextEntity, D> implements Dao< } @Override + @Transactional(propagation = REQUIRES_NEW) public D save(D domain) { E entity; try { @@ -80,6 +84,7 @@ public abstract class JpaAbstractDao, D> implements Dao< } @Override + @Transactional(propagation = REQUIRES_NEW) public boolean removeById(UUID key) { getCrudRepository().delete(key); log.debug("Remove request: {}", key); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceCredentialsRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceCredentialsRepository.java new file mode 100644 index 0000000000..cc0f6003fb --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceCredentialsRepository.java @@ -0,0 +1,19 @@ +package org.thingsboard.server.dao.sql.device; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Component; +import org.thingsboard.server.dao.model.sql.DeviceCredentialsEntity; + +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public interface DeviceCredentialsRepository extends CrudRepository { + + DeviceCredentialsEntity findByDeviceId(UUID deviceId); + + DeviceCredentialsEntity findByCredentialsId(String credentialsId); +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java new file mode 100644 index 0000000000..486305b405 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java @@ -0,0 +1,47 @@ +package org.thingsboard.server.dao.sql.device; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; +import org.springframework.scheduling.annotation.Async; +import org.springframework.util.concurrent.ListenableFuture; +import org.thingsboard.server.dao.model.sql.DeviceEntity; + +import java.util.List; +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public interface DeviceRepository extends CrudRepository { + + @Query(nativeQuery = true, value = "SELECT * FROM DEVICE WHERE TENANT_ID = ?2 " + + "AND CUSTOMER_ID = ?3 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?4, '%')) " + + "ORDER BY ID LIMIT ?1") + List findByTenantIdAndCustomerIdFirstPage(int limit, UUID tenantId, UUID customerId, String searchText); + + @Query(nativeQuery = true, value = "SELECT * FROM DEVICE WHERE TENANT_ID = ?2 " + + "AND CUSTOMER_ID = ?3 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?4, '%')) " + + "AND ID > ?5 ORDER BY ID LIMIT ?1") + List findByTenantIdAndCustomerIdNextPage(int limit, UUID tenantId, UUID customerId, String searchText, UUID idOffset); + + @Query(nativeQuery = true, value = "SELECT * FROM DEVICE WHERE TENANT_ID = ?2 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "ORDER BY ID LIMIT ?1") + List findByTenantIdFirstPage(int limit, UUID tenantId, String textSearch); + + @Query(nativeQuery = true, value = "SELECT * FROM DEVICE WHERE TENANT_ID = ?2 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "AND ID > ?4 ORDER BY ID LIMIT ?1") + List findByTenantIdNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); + + DeviceEntity findByTenantIdAndName(UUID tenantId, String name); + + List findDevicesByTenantIdAndCustomerIdAndIdIn(UUID tenantId, UUID customerId, List deviceIds); + + List findDevicesByTenantId(UUID tenantId); + List findDevicesByTenantIdAndIdIn(UUID tenantId, List deviceIds); +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java new file mode 100644 index 0000000000..5538d96946 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java @@ -0,0 +1,52 @@ +package org.thingsboard.server.dao.sql.device; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +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.device.DeviceCredentialsDao; +import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.model.sql.DeviceCredentialsEntity; +import org.thingsboard.server.dao.sql.JpaAbstractDao; + +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +@Component +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public class JpaDeviceCredentialsDao extends JpaAbstractDao implements DeviceCredentialsDao { + + @Autowired + private DeviceCredentialsRepository deviceCredentialsRepository; + + @Override + protected Class getEntityClass() { + return DeviceCredentialsEntity.class; + } + + @Override + protected String getColumnFamilyName() { + { + return ModelConstants.DEVICE_CREDENTIALS_COLUMN_FAMILY_NAME; + } + } + + @Override + protected CrudRepository getCrudRepository() { + return deviceCredentialsRepository; + } + + @Override + public DeviceCredentials findByDeviceId(UUID deviceId) { + return DaoUtil.getData(deviceCredentialsRepository.findByDeviceId(deviceId)); + } + + @Override + public DeviceCredentials findByCredentialsId(String credentialsId) { + return DaoUtil.getData(deviceCredentialsRepository.findByCredentialsId(credentialsId)); + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java new file mode 100644 index 0000000000..eefedd0591 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java @@ -0,0 +1,91 @@ +package org.thingsboard.server.dao.sql.device; + +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Component; +import org.thingsboard.server.common.data.Device; +import org.thingsboard.server.common.data.page.TextPageLink; +import org.thingsboard.server.dao.DaoUtil; +import org.thingsboard.server.dao.device.DeviceDao; +import org.thingsboard.server.dao.model.sql.DeviceEntity; +import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; +import java.util.concurrent.Executors; + +import static org.thingsboard.server.dao.model.ModelConstants.DEVICE_COLUMN_FAMILY_NAME; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +@Component +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public class JpaDeviceDao extends JpaAbstractSearchTextDao implements DeviceDao { + + @Autowired + DeviceRepository deviceRepository; + + @Override + protected Class getEntityClass() { + return DeviceEntity.class; + } + + @Override + protected String getColumnFamilyName() { + return DEVICE_COLUMN_FAMILY_NAME; + } + + @Override + protected CrudRepository getCrudRepository() { + return deviceRepository; + } + + @Override + public List findDevicesByTenantId(UUID tenantId, TextPageLink pageLink) { + if (pageLink.getIdOffset() == null) { + return DaoUtil.convertDataList(deviceRepository.findByTenantIdFirstPage( + pageLink.getLimit(), tenantId, pageLink.getTextSearch())); + } else { + return DaoUtil.convertDataList(deviceRepository.findByTenantIdNextPage( + pageLink.getLimit(), tenantId, pageLink.getTextSearch(), pageLink.getIdOffset())); + } + } + + @Override + public ListenableFuture> findDevicesByTenantIdAndIdsAsync(UUID tenantId, List deviceIds) { + System.out.println(deviceRepository.findDevicesByTenantIdAndIdIn(tenantId, deviceIds).size()); + ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); + return service.submit(() -> DaoUtil.convertDataList(deviceRepository.findDevicesByTenantIdAndIdIn(tenantId, deviceIds))); + } + + @Override + public List findDevicesByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink) { + if (pageLink.getIdOffset() == null) { + return DaoUtil.convertDataList(deviceRepository.findByTenantIdAndCustomerIdFirstPage(pageLink.getLimit(), + tenantId, customerId, pageLink.getTextSearch())); + } else { + return DaoUtil.convertDataList(deviceRepository.findByTenantIdAndCustomerIdNextPage(pageLink.getLimit(), + tenantId, customerId, pageLink.getTextSearch(), pageLink.getIdOffset())); + } + } + + @Override + public ListenableFuture> findDevicesByTenantIdCustomerIdAndIdsAsync(UUID tenantId, UUID customerId, List deviceIds) { + ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); + return service.submit(() -> DaoUtil.convertDataList( + deviceRepository.findDevicesByTenantIdAndCustomerIdAndIdIn(tenantId, customerId, deviceIds))); + } + + @Override + // Probably findDevice, not findDevices? + public Optional findDevicesByTenantIdAndName(UUID tenantId, String name) { + Device device = DaoUtil.getData(deviceRepository.findByTenantIdAndName(tenantId, name)); + return Optional.ofNullable(device); + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java index de32f06f1d..585bf38335 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java @@ -31,22 +31,22 @@ public interface UserRepository extends CrudRepository { UserEntity findByEmail(String email); - @Query(nativeQuery = true, value = "SELECT * FROM USER WHERE TENANT_ID = ?2 " + + @Query(nativeQuery = true, value = "SELECT * FROM TB_USER WHERE TENANT_ID = ?2 " + "AND CUSTOMER_ID IS NULL AND AUTHORITY = 1 " + "ORDER BY ID LIMIT ?1") List findTenantAdminsFirstPage(int limit, UUID tenantId); - @Query(nativeQuery = true, value = "SELECT * FROM USER WHERE TENANT_ID = ?2 " + + @Query(nativeQuery = true, value = "SELECT * FROM TB_USER WHERE TENANT_ID = ?2 " + "AND CUSTOMER_ID IS NULL AND AUTHORITY = 1 " + "AND ID > ?3 ORDER BY ID LIMIT ?1") List findTenantAdminsNextPage(int limit, UUID tenantId, UUID idOffset); - @Query(nativeQuery = true, value = "SELECT * FROM USER WHERE TENANT_ID = ?2 " + + @Query(nativeQuery = true, value = "SELECT * FROM TB_USER WHERE TENANT_ID = ?2 " + "AND CUSTOMER_ID = ?3 AND AUTHORITY = 2 " + "ORDER BY ID LIMIT ?1") List findCustomerUsersFirstPage(int limit, UUID tenantId, UUID customerId); - @Query(nativeQuery = true, value = "SELECT * FROM USER WHERE TENANT_ID = ?2 " + + @Query(nativeQuery = true, value = "SELECT * FROM TB_USER WHERE TENANT_ID = ?2 " + "AND CUSTOMER_ID = ?3 AND AUTHORITY = 2 " + "AND ID > ?4 ORDER BY ID LIMIT ?1") List findCustomerUsersNextPage(int limit, UUID tenantId, UUID customerId, UUID idOffset); diff --git a/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java index e610245f96..f6b6b7353b 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java @@ -16,6 +16,7 @@ package org.thingsboard.server.dao; import com.github.springtestdbunit.DbUnitTestExecutionListener; +import com.github.springtestdbunit.annotation.DbUnitConfiguration; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -29,11 +30,12 @@ import org.springframework.test.context.support.DirtiesContextTestExecutionListe * Created by Valerii Sosliuk on 4/22/2017. */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = {JpaDaoConfig.class}) +@ContextConfiguration(classes = {JpaDaoConfig.class, JpaDbunitTestConfig.class}) @TestPropertySource("classpath:jpa-test.properties") @TestExecutionListeners({ DependencyInjectionTestExecutionListener.class, DirtiesContextTestExecutionListener.class, DbUnitTestExecutionListener.class }) +@DbUnitConfiguration(databaseConnection = "dbUnitDatabaseConnection") public class AbstractJpaDaoTest extends AbstractTransactionalJUnit4SpringContextTests { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java b/dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java new file mode 100644 index 0000000000..0c064d4697 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java @@ -0,0 +1,39 @@ +package org.thingsboard.server.dao; + +import com.github.springtestdbunit.bean.DatabaseConfigBean; +import com.github.springtestdbunit.bean.DatabaseDataSourceConnectionFactoryBean; +import org.dbunit.DatabaseUnitException; +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 javax.sql.DataSource; +import java.io.IOException; +import java.sql.SQLException; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +@Configuration +public class JpaDbunitTestConfig { + + @Autowired + private DataSource dataSource; + + @Bean + public DatabaseConfigBean databaseConfigBean() { + DatabaseConfigBean databaseConfigBean = new DatabaseConfigBean(); + databaseConfigBean.setDatatypeFactory(new PostgresqlDataTypeFactory()); + return databaseConfigBean; + } + + @Bean(name = "dbUnitDatabaseConnection") + public DatabaseDataSourceConnectionFactoryBean dbUnitDatabaseConnection() throws SQLException, DatabaseUnitException, IOException { + DatabaseDataSourceConnectionFactoryBean databaseDataSourceConnectionFactoryBean = new DatabaseDataSourceConnectionFactoryBean(); + databaseDataSourceConnectionFactoryBean.setDatabaseConfig(databaseConfigBean()); + databaseDataSourceConnectionFactoryBean.setDataSource(dataSource); + databaseDataSourceConnectionFactoryBean.setSchema("public"); + return databaseDataSourceConnectionFactoryBean; + } +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDaoTest.java new file mode 100644 index 0000000000..dce6113e3e --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDaoTest.java @@ -0,0 +1,41 @@ +package org.thingsboard.server.dao.sql.device; + +import com.github.springtestdbunit.annotation.DatabaseSetup; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.thingsboard.server.common.data.security.DeviceCredentials; +import org.thingsboard.server.dao.AbstractJpaDaoTest; +import org.thingsboard.server.dao.device.DeviceCredentialsDao; + +import java.util.UUID; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +public class JpaDeviceCredentialsDaoTest extends AbstractJpaDaoTest { + + @Autowired + DeviceCredentialsDao deviceCredentialsDao; + + @Test + @DatabaseSetup("classpath:dbunit/device_credentials.xml") + public void testFindByDeviceId() { + UUID deviceId = UUID.fromString("958e3a30-3215-11e7-93ae-92361f002671"); + DeviceCredentials deviceCredentials = deviceCredentialsDao.findByDeviceId(deviceId); + assertNotNull(deviceCredentials); + assertEquals("958e3314-3215-11e7-93ae-92361f002671", deviceCredentials.getId().getId().toString()); + assertEquals("ID_1", deviceCredentials.getCredentialsId()); + } + + @Test + @DatabaseSetup("classpath:dbunit/device_credentials.xml") + public void findByCredentialsId() { + String credentialsId = "ID_2"; + DeviceCredentials deviceCredentials = deviceCredentialsDao.findByCredentialsId(credentialsId); + assertNotNull(deviceCredentials); + assertEquals("958e3c74-3215-11e7-93ae-92361f002671", deviceCredentials.getId().getId().toString()); + } +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceDaoTest.java new file mode 100644 index 0000000000..4f1b31598a --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceDaoTest.java @@ -0,0 +1,146 @@ +package org.thingsboard.server.dao.sql.device; + +import com.datastax.driver.core.utils.UUIDs; +import com.github.springtestdbunit.annotation.DatabaseOperation; +import com.github.springtestdbunit.annotation.DatabaseSetup; +import com.github.springtestdbunit.annotation.DatabaseTearDown; +import com.google.common.util.concurrent.*; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import org.thingsboard.server.common.data.Device; +import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.page.TextPageLink; +import org.thingsboard.server.dao.AbstractJpaDaoTest; +import org.thingsboard.server.dao.device.DeviceDao; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Executors; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +@Transactional +public class JpaDeviceDaoTest extends AbstractJpaDaoTest { + + @Autowired + private DeviceDao deviceDao; + + @Test + @DatabaseSetup(value = "classpath:dbunit/empty_dataset.xml",type = DatabaseOperation.DELETE_ALL) + @DatabaseTearDown(value = "classpath:dbunit/empty_dataset.xml",type = DatabaseOperation.DELETE_ALL) + public void testFindDevicesByTenantId() { + UUID tenantId1 = UUIDs.timeBased(); + UUID tenantId2 = UUIDs.timeBased(); + UUID customerId1 = UUIDs.timeBased(); + UUID customerId2 = UUIDs.timeBased(); + createDevices(tenantId1, tenantId2, customerId1, customerId2, 40); + + TextPageLink pageLink1 = new TextPageLink(15, "SEARCH_TEXT"); + List devices1 = deviceDao.findDevicesByTenantId(tenantId1, pageLink1); + assertEquals(15, devices1.size()); + + TextPageLink pageLink2 = new TextPageLink(15, "SEARCH_TEXT", devices1.get(14).getId().getId(), null); + List devices2 = deviceDao.findDevicesByTenantId(tenantId1, pageLink2); + assertEquals(5, devices2.size()); + } + + @Test + @DatabaseSetup(value = "classpath:dbunit/empty_dataset.xml",type = DatabaseOperation.DELETE_ALL) + @DatabaseTearDown(value = "classpath:dbunit/empty_dataset.xml",type = DatabaseOperation.DELETE_ALL) + public void testFindAsync() throws ExecutionException, InterruptedException { + UUID tenantId = UUIDs.timeBased(); + UUID customerId = UUIDs.timeBased(); + Device device = getDevice(tenantId, customerId); + deviceDao.save(device); + + UUID uuid = device.getId().getId(); + Device entity = deviceDao.findById(uuid); + assertNotNull(entity); + assertEquals(uuid, entity.getId().getId()); + + ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); + ListenableFuture future = service.submit(() -> deviceDao.findById(uuid)); + Device asyncDevice = future.get(); + assertNotNull("Async device expected to be not null", asyncDevice); + } + + @Test + @DatabaseSetup(value = "classpath:dbunit/empty_dataset.xml",type = DatabaseOperation.DELETE_ALL) + @DatabaseTearDown(value = "classpath:dbunit/empty_dataset.xml",type = DatabaseOperation.DELETE_ALL) + public void testFindDevicesByTenantIdAndIdsAsync() throws ExecutionException, InterruptedException { + UUID tenantId1 = UUIDs.timeBased(); + UUID customerId1 = UUIDs.timeBased(); + UUID tenantId2 = UUIDs.timeBased(); + UUID customerId2 = UUIDs.timeBased(); + + List deviceIds = new ArrayList<>(); + + for(int i = 0; i < 5; i++) { + UUID deviceId1 = UUIDs.timeBased(); + UUID deviceId2 = UUIDs.timeBased(); + deviceDao.save(getDevice(tenantId1, customerId1, deviceId1)); + deviceDao.save(getDevice(tenantId2, customerId2, deviceId2)); + deviceIds.add(deviceId1); + deviceIds.add(deviceId2); + } + + ListenableFuture> devicesFuture = deviceDao.findDevicesByTenantIdAndIdsAsync(tenantId1, deviceIds); + List devices = devicesFuture.get(); + assertEquals(5, devices.size()); + } + + @Test + @DatabaseSetup(value = "classpath:dbunit/empty_dataset.xml",type = DatabaseOperation.DELETE_ALL) + @DatabaseTearDown(value = "classpath:dbunit/empty_dataset.xml",type = DatabaseOperation.DELETE_ALL) + public void testFindDevicesByTenantIdAndCustomerIdAndIdsAsync() throws ExecutionException, InterruptedException { + UUID tenantId1 = UUIDs.timeBased(); + UUID customerId1 = UUIDs.timeBased(); + UUID tenantId2 = UUIDs.timeBased(); + UUID customerId2 = UUIDs.timeBased(); + + List deviceIds = new ArrayList<>(); + + for(int i = 0; i < 20; i++) { + UUID deviceId1 = UUIDs.timeBased(); + UUID deviceId2 = UUIDs.timeBased(); + deviceDao.save(getDevice(tenantId1, customerId1, deviceId1)); + deviceDao.save(getDevice(tenantId2, customerId2, deviceId2)); + deviceIds.add(deviceId1); + deviceIds.add(deviceId2); + } + + ListenableFuture> devicesFuture = deviceDao.findDevicesByTenantIdCustomerIdAndIdsAsync(tenantId1, customerId1, deviceIds); + List devices = devicesFuture.get(); + assertEquals(20, devices.size()); + } + + private void createDevices(UUID tenantId1, UUID tenantId2, UUID customerId1, UUID customerId2, int count) { + for (int i = 0; i < count / 2; i++) { + deviceDao.save(getDevice(tenantId1, customerId1)); + deviceDao.save(getDevice(tenantId2, customerId2)); + } + } + + private Device getDevice(UUID tenantId, UUID customerID) { + return getDevice(tenantId, customerID, UUIDs.timeBased()); + } + + private Device getDevice(UUID tenantId, UUID customerID, UUID deviceId) { + Device device = new Device(); + device.setId(new DeviceId(deviceId)); + device.setTenantId(new TenantId(tenantId)); + device.setCustomerId(new CustomerId(customerID)); + device.setName("SEARCH_TEXT"); + return device; + } +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java index cdebaddb51..30667faba6 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java @@ -1,6 +1,5 @@ package org.thingsboard.server.dao.sql.event; -import ch.qos.logback.core.net.SyslogOutputStream; import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -18,8 +17,6 @@ import org.thingsboard.server.dao.AbstractJpaDaoTest; import org.thingsboard.server.dao.event.EventDao; import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; import java.util.Optional; import java.util.UUID; diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDaoTest.java index f968b68e6e..31a6c58376 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDaoTest.java @@ -23,7 +23,6 @@ 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.common.data.rule.RuleMetaData; import org.thingsboard.server.dao.AbstractJpaDaoTest; import org.thingsboard.server.dao.plugin.PluginDao; diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java index fe540fa017..9d719ba4bd 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java @@ -71,7 +71,6 @@ public class JpaUserDaoTest extends AbstractJpaDaoTest { UUID tenantId = UUIDs.timeBased(); UUID customerId = UUIDs.timeBased(); create30Adminsand60Users(tenantId, customerId); - assertEquals(90, userDao.find().size()); List tenantAdmins1 = userDao.findTenantAdmins(tenantId, new TextPageLink(20)); assertEquals(20, tenantAdmins1.size()); List tenantAdmins2 = userDao.findTenantAdmins(tenantId, @@ -88,7 +87,6 @@ public class JpaUserDaoTest extends AbstractJpaDaoTest { UUID tenantId = UUIDs.timeBased(); UUID customerId = UUIDs.timeBased(); create30Adminsand60Users(tenantId, customerId); - assertEquals(90, userDao.find().size()); List customerUsers1 = userDao.findCustomerUsers(tenantId, customerId, new TextPageLink(40)); assertEquals(40, customerUsers1.size()); List customerUsers2 = userDao.findCustomerUsers(tenantId, customerId, diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java index c38ccbd892..87ce37a1a6 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDaoTest.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.dao.sql.widget; -import com.datastax.driver.core.utils.UUIDs; import com.github.springtestdbunit.annotation.DatabaseSetup; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java index eafcfd3820..7c1df06203 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java @@ -16,7 +16,9 @@ package org.thingsboard.server.dao.sql.widget; import com.datastax.driver.core.utils.UUIDs; +import com.github.springtestdbunit.annotation.DatabaseOperation; import com.github.springtestdbunit.annotation.DatabaseSetup; +import com.github.springtestdbunit.annotation.DatabaseTearDown; import org.junit.Ignore; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -41,13 +43,15 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest { private WidgetsBundleDao widgetsBundleDao; @Test - @DatabaseSetup("classpath:dbunit/widgets_bundle.xml") + @DatabaseSetup(value = "classpath:dbunit/widgets_bundle.xml",type= DatabaseOperation.CLEAN_INSERT) + @DatabaseTearDown(value = "classpath:dbunit/widgets_bundle.xml", type= DatabaseOperation.DELETE_ALL) public void testFindAll() { assertEquals(7, widgetsBundleDao.find().size()); } @Test - @DatabaseSetup("classpath:dbunit/widgets_bundle.xml") + @DatabaseSetup(value = "classpath:dbunit/widgets_bundle.xml",type= DatabaseOperation.CLEAN_INSERT) + @DatabaseTearDown(value = "classpath:dbunit/widgets_bundle.xml", type= DatabaseOperation.DELETE_ALL) public void testFindWidgetsBundleByTenantIdAndAlias() { WidgetsBundle widgetsBundle = widgetsBundleDao.findWidgetsBundleByTenantIdAndAlias( UUID.fromString("250aca8e-2825-11e7-93ae-92361f002671"), "WB3"); @@ -55,7 +59,8 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest { } @Test - @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + @DatabaseSetup(value = "classpath:dbunit/widgets_bundle.xml", type= DatabaseOperation.DELETE_ALL) + // @DatabaseTearDown(value = "classpath:dbunit/empty_dataset.xml", type= DatabaseOperation.DELETE_ALL) public void testFindSystemWidgetsBundles() { createSystemWidgetBundles(30, "WB_"); assertEquals(30, widgetsBundleDao.find().size()); @@ -70,7 +75,7 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest { } @Test - @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + @DatabaseSetup(value = "classpath:dbunit/widgets_bundle.xml", type= DatabaseOperation.DELETE_ALL) public void testFindWidgetsBundlesByTenantId() { UUID tenantId1 = UUIDs.timeBased(); UUID tenantId2 = UUIDs.timeBased(); @@ -97,7 +102,7 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest { } @Test - @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + @DatabaseSetup(value = "classpath:dbunit/widgets_bundle.xml", type= DatabaseOperation.DELETE_ALL) public void testFindAllWidgetsBundlesByTenantId() { UUID tenantId1 = UUIDs.timeBased(); UUID tenantId2 = UUIDs.timeBased(); @@ -129,9 +134,9 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest { assertEquals(0, widgetsBundles4.size()); } - @Test @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + @DatabaseTearDown(value = "classpath:dbunit/empty_dataset.xml", type= DatabaseOperation.DELETE_ALL) public void testNonSearchTextNotFound() { UUID tenantId = UUIDs.timeBased(); createWidgetBundles(5, tenantId, "ABC_"); diff --git a/dao/src/test/resources/dbunit/device_credentials.xml b/dao/src/test/resources/dbunit/device_credentials.xml new file mode 100644 index 0000000000..aee6b1ec19 --- /dev/null +++ b/dao/src/test/resources/dbunit/device_credentials.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/dao/src/test/resources/dbunit/events.xml b/dao/src/test/resources/dbunit/events.xml index 8f8875882b..2c02c19564 100644 --- a/dao/src/test/resources/dbunit/events.xml +++ b/dao/src/test/resources/dbunit/events.xml @@ -1,16 +1,16 @@ - - - - - - \ No newline at end of file diff --git a/dao/src/test/resources/jpa-test.properties b/dao/src/test/resources/jpa-test.properties index 7fff922c93..f887e08db0 100644 --- a/dao/src/test/resources/jpa-test.properties +++ b/dao/src/test/resources/jpa-test.properties @@ -1,7 +1,17 @@ cassandra.enabled=false sql.enabled=true -sql.datasource.url=jdbc:h2:mem:thingsboard -sql.datasource.username=sa -sql.datasource.password= +#sql.datasource.url=jdbc:h2:mem:thingsboard +#sql.datasource.username=sa +#sql.datasource.password= +#spring.jpa.hibernate.ddl-auto=create-drop +spring.jpa.show-sql=false +spring.jpa.hibernate.ddl-auto=create-drop + +spring.database.driverClassName=org.postgresql.Driver +spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect +spring.datasource.url=jdbc:postgresql://localhost:5432/thingsboard-test +spring.datasource.username=thingsboard +spring.datasource.password=thingsboard +spring.jpa.generate-ddl=true diff --git a/pom.xml b/pom.xml index 909936f074..0d813f0bfc 100755 --- a/pom.xml +++ b/pom.xml @@ -74,6 +74,7 @@ 1.4.194 2.5.3 1.2.1 + 9.4.1211 @@ -419,6 +420,11 @@ spring-boot-starter-data-jpa ${spring-boot.version} + + org.postgresql + postgresql + ${postgresql.driver.version} + org.springframework spring-context From 9def2e21d555a3bc58965f670294abfe5bef4120 Mon Sep 17 00:00:00 2001 From: mp-loki Date: Sun, 7 May 2017 00:07:20 -0400 Subject: [PATCH 21/69] Entity DAOs --- .../dao/model/sql/AdminSettingsEntity.java | 45 ++++--- .../model/sql/ComponentDescriptorEntity.java | 76 +++-------- .../server/dao/model/sql/CustomerEntity.java | 121 ++++-------------- .../server/dao/model/sql/DashboardEntity.java | 63 ++++----- .../dao/model/sql/DashboardInfoEntity.java | 37 +----- .../ComponentDescriptorRepository.java | 45 +++++++ .../JpaBaseComponentDescriptorDao.java | 98 ++++++++++++++ .../dao/sql/customer/CustomerRepository.java | 30 +++++ .../dao/sql/customer/JpaCustomerDao.java | 52 ++++++++ .../dashboard/DashboardInfoRepository.java | 36 ++++++ .../sql/dashboard/DashboardRepository.java | 14 ++ .../dao/sql/dashboard/JpaDashboardDao.java | 40 ++++++ .../sql/dashboard/JpaDashboardInfoDao.java | 65 ++++++++++ .../sql/settings/AdminSettingsRepository.java | 15 +++ .../dao/sql/settings/JpaAdminSettingsDao.java | 42 ++++++ .../JpaBaseComponentDescriptorDaoTest.java | 71 ++++++++++ .../dao/sql/customer/JpaCustomerDaoTest.java | 52 ++++++++ .../dashboard/JpaDashboardInfoDaoTest.java | 78 +++++++++++ .../dao/sql/device/JpaDeviceDaoTest.java | 18 +-- dao/src/test/resources/jpa-test.properties | 4 - 20 files changed, 737 insertions(+), 265 deletions(-) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardRepository.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/settings/AdminSettingsRepository.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDaoTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDaoTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDaoTest.java diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java index b090d7da84..25393fb971 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java @@ -22,15 +22,21 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.common.data.AdminSettings; import org.thingsboard.server.common.data.id.AdminSettingsId; import org.thingsboard.server.dao.model.BaseEntity; +import java.io.IOException; import java.util.UUID; import static org.thingsboard.server.dao.model.ModelConstants.*; -//@Entity +@Data +@Slf4j +@Entity @Table(name = ADMIN_SETTINGS_COLUMN_FAMILY_NAME) public final class AdminSettingsEntity implements BaseEntity { @@ -45,7 +51,7 @@ public final class AdminSettingsEntity implements BaseEntity { private String key; @Column(name = ADMIN_SETTINGS_JSON_VALUE_PROPERTY) - private JsonNode jsonValue; + private String jsonValue; public AdminSettingsEntity() { super(); @@ -56,33 +62,21 @@ public final class AdminSettingsEntity implements BaseEntity { this.id = adminSettings.getId().getId(); } this.key = adminSettings.getKey(); - this.jsonValue = adminSettings.getJsonValue(); + if (jsonValue != null) { + this.jsonValue = adminSettings.getJsonValue().toString(); + } } - + + @Override public UUID getId() { return id; } + @Override public void setId(UUID id) { this.id = id; } - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public JsonNode getJsonValue() { - return jsonValue; - } - - public void setJsonValue(JsonNode jsonValue) { - this.jsonValue = jsonValue; - } - @Override public int hashCode() { final int prime = 31; @@ -138,7 +132,16 @@ public final class AdminSettingsEntity implements BaseEntity { AdminSettings adminSettings = new AdminSettings(new AdminSettingsId(id)); adminSettings.setCreatedTime(UUIDs.unixTimestamp(id)); adminSettings.setKey(key); - adminSettings.setJsonValue(jsonValue); + if (jsonValue != null) { + ObjectMapper mapper = new ObjectMapper(); + JsonNode jsonNode = null; + try { + jsonNode = mapper.readTree(jsonValue); + adminSettings.setJsonValue(jsonNode); + } catch (IOException e) { + log.error(e.getMessage(), e); + } + } return adminSettings; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java index f32a89ec23..37fab4f487 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java @@ -21,6 +21,9 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.common.data.id.ComponentDescriptorId; import org.thingsboard.server.common.data.plugin.ComponentDescriptor; import org.thingsboard.server.common.data.plugin.ComponentScope; @@ -28,12 +31,12 @@ import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.SearchTextEntity; +import java.io.IOException; import java.util.UUID; -/** - * @author Andrew Shvayka - */ -//@Entity +@Data +@Slf4j +@Entity @Table(name = ModelConstants.COMPONENT_DESCRIPTOR_COLUMN_FAMILY_NAME) public class ComponentDescriptorEntity implements SearchTextEntity { @@ -57,7 +60,7 @@ public class ComponentDescriptorEntity implements SearchTextEntity { @@ -75,7 +81,7 @@ public final class CustomerEntity implements SearchTextEntity { private String email; @Column(name = ModelConstants.CUSTOMER_ADDITIONAL_INFO_PROPERTY) - private JsonNode additionalInfo; + private String additionalInfo; public CustomerEntity() { super(); @@ -95,105 +101,21 @@ public final class CustomerEntity implements SearchTextEntity { this.zip = customer.getZip(); this.phone = customer.getPhone(); this.email = customer.getEmail(); - this.additionalInfo = customer.getAdditionalInfo(); + if (additionalInfo != null) { + this.additionalInfo = customer.getAdditionalInfo().toString(); + } } - + + @Override public UUID getId() { return id; } + @Override public void setId(UUID id) { this.id = id; } - public UUID getTenantId() { - return tenantId; - } - - public void setTenantId(UUID tenantId) { - this.tenantId = tenantId; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getCountry() { - return country; - } - - public void setCountry(String country) { - this.country = country; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getAddress2() { - return address2; - } - - public void setAddress2(String address2) { - this.address2 = address2; - } - - public String getZip() { - return zip; - } - - public void setZip(String zip) { - this.zip = zip; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public JsonNode getAdditionalInfo() { - return additionalInfo; - } - - public void setAdditionalInfo(JsonNode additionalInfo) { - this.additionalInfo = additionalInfo; - } - @Override public String getSearchTextSource() { return title; @@ -204,10 +126,6 @@ public final class CustomerEntity implements SearchTextEntity { this.searchText = searchText; } - public String getSearchText() { - return searchText; - } - @Override public int hashCode() { final int prime = 31; @@ -344,8 +262,15 @@ public final class CustomerEntity implements SearchTextEntity { customer.setZip(zip); customer.setPhone(phone); customer.setEmail(email); - customer.setAdditionalInfo(additionalInfo); + if (additionalInfo != null) { + ObjectMapper mapper = new ObjectMapper(); + try { + JsonNode jsonNode = mapper.readTree(additionalInfo); + customer.setAdditionalInfo(jsonNode); + } catch (IOException e) { + log.error(e.getMessage(), e); + } + } return customer; } - } \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java index 77e12e2381..1ad0f84633 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java @@ -22,6 +22,9 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; import org.thingsboard.server.common.data.Dashboard; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DashboardId; @@ -29,9 +32,12 @@ import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.SearchTextEntity; +import java.io.IOException; import java.util.UUID; -//@Entity +@Data +@Slf4j +@Entity @Table(name = ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME) public final class DashboardEntity implements SearchTextEntity { @@ -55,7 +61,7 @@ public final class DashboardEntity implements SearchTextEntity { private String searchText; @Column(name = ModelConstants.DASHBOARD_CONFIGURATION_PROPERTY) - private JsonNode configuration; + private String configuration; public DashboardEntity() { super(); @@ -72,47 +78,18 @@ public final class DashboardEntity implements SearchTextEntity { this.customerId = dashboard.getCustomerId().getId(); } this.title = dashboard.getTitle(); - this.configuration = dashboard.getConfiguration(); + if (configuration != null) { + this.configuration = dashboard.getConfiguration().toString(); + } } - + + @Override public UUID getId() { return id; } + @Override public void setId(UUID id) { - this.id = id; - } - - public UUID getTenantId() { - return tenantId; - } - - public void setTenantId(UUID tenantId) { - this.tenantId = tenantId; - } - - public UUID getCustomerId() { - return customerId; - } - - public void setCustomerId(UUID customerId) { - this.customerId = customerId; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public JsonNode getConfiguration() { - return configuration; - } - - public void setConfiguration(JsonNode configuration) { - this.configuration = configuration; } @Override @@ -214,8 +191,16 @@ public final class DashboardEntity implements SearchTextEntity { dashboard.setCustomerId(new CustomerId(customerId)); } dashboard.setTitle(title); - dashboard.setConfiguration(configuration); + if (configuration != null) { + ObjectMapper mapper = new ObjectMapper(); + JsonNode jsonNode = null; + try { + jsonNode = mapper.readTree(configuration); + dashboard.setConfiguration(jsonNode); + } catch (IOException e) { + log.error(e.getMessage(), e); + } + } return dashboard; } - } \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java index f0a50f1ffb..e5f1400d08 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java @@ -21,6 +21,8 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; + +import lombok.Data; import org.thingsboard.server.common.data.DashboardInfo; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DashboardId; @@ -30,7 +32,8 @@ import org.thingsboard.server.dao.model.SearchTextEntity; import java.util.UUID; -//@Entity +@Data +@Entity @Table(name = ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME) public class DashboardInfoEntity implements SearchTextEntity { @@ -70,38 +73,6 @@ public class DashboardInfoEntity implements SearchTextEntity { this.title = dashboardInfo.getTitle(); } - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public UUID getTenantId() { - return tenantId; - } - - public void setTenantId(UUID tenantId) { - this.tenantId = tenantId; - } - - public UUID getCustomerId() { - return customerId; - } - - public void setCustomerId(UUID customerId) { - this.customerId = customerId; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - @Override public String getSearchTextSource() { return title; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java new file mode 100644 index 0000000000..a8443703ce --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java @@ -0,0 +1,45 @@ +package org.thingsboard.server.dao.sql.component; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Component; +import org.thingsboard.server.common.data.plugin.ComponentScope; +import org.thingsboard.server.common.data.plugin.ComponentType; +import org.thingsboard.server.dao.model.ToData; +import org.thingsboard.server.dao.model.sql.ComponentDescriptorEntity; + +import java.util.Collection; +import java.util.List; +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public interface ComponentDescriptorRepository extends CrudRepository { + + ComponentDescriptorEntity findByClazz(String clazz); + + @Query(nativeQuery = true, value = "SELECT * FROM COMPONENT_DESCRIPTOR WHERE TYPE = ?2 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "ORDER BY ID LIMIT ?1") + List findByTypeFirstPage(int limit, int type, String textSearch); + + @Query(nativeQuery = true, value = "SELECT * FROM COMPONENT_DESCRIPTOR WHERE TYPE = ?2 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "AND ID > ?4 ORDER BY ID LIMIT ?1") + List findByTypeNextPage(int limit, int type, String textSearch, UUID idOffset); + + @Query(nativeQuery = true, value = "SELECT * FROM COMPONENT_DESCRIPTOR WHERE TYPE = ?2 " + + "AND SCOPE = ?3 AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?4, '%')) " + + "ORDER BY ID LIMIT ?1") + List findByScopeAndTypeFirstPage(int limit, int type, int scope, String textSearch); + + @Query(nativeQuery = true, value = "SELECT * FROM COMPONENT_DESCRIPTOR WHERE TYPE = ?2 " + + "AND SCOPE = ?3 AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?4, '%')) " + + "AND ID > ?5 ORDER BY ID LIMIT ?1") + List findByScopeAndTypeNextPage(int limit, int type, int scope, String textSearch, UUID idOffset); + + void deleteByClazz(String clazz); +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java new file mode 100644 index 0000000000..e6ab86a9d1 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java @@ -0,0 +1,98 @@ +package org.thingsboard.server.dao.sql.component; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Component; +import org.thingsboard.server.common.data.id.ComponentDescriptorId; +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.DaoUtil; +import org.thingsboard.server.dao.component.ComponentDescriptorDao; +import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.model.sql.ComponentDescriptorEntity; +import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +@Component +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public class JpaBaseComponentDescriptorDao extends JpaAbstractSearchTextDao + implements ComponentDescriptorDao { + + @Autowired + private ComponentDescriptorRepository componentDescriptorRepository; + + @Override + protected Class getEntityClass() { + return ComponentDescriptorEntity.class; + } + + @Override + protected String getColumnFamilyName() { + return ModelConstants.COMPONENT_DESCRIPTOR_COLUMN_FAMILY_NAME; + } + + @Override + protected CrudRepository getCrudRepository() { + return componentDescriptorRepository; + } + + @Override + public Optional saveIfNotExist(ComponentDescriptor component) { + boolean exists = componentDescriptorRepository.findOne(component.getId().getId()) != null; + if (exists) { + return Optional.empty(); + } + return Optional.of(save(component)); + } + + @Override + public ComponentDescriptor findById(ComponentDescriptorId componentId) { + return findById(componentId.getId()); + } + + @Override + public ComponentDescriptor findByClazz(String clazz) { + return DaoUtil.getData(componentDescriptorRepository.findByClazz(clazz)); + } + + @Override + public List findByTypeAndPageLink(ComponentType type, TextPageLink pageLink) { + if (pageLink.getIdOffset() == null) { + return DaoUtil.convertDataList(componentDescriptorRepository.findByTypeFirstPage(pageLink.getLimit(), + type.ordinal(), pageLink.getTextSearch())); + } else { + return DaoUtil.convertDataList(componentDescriptorRepository.findByTypeNextPage(pageLink.getLimit(), + type.ordinal(), pageLink.getTextSearch(), pageLink.getIdOffset())); + } + } + + @Override + public List findByScopeAndTypeAndPageLink(ComponentScope scope, ComponentType type, TextPageLink pageLink) { + if (pageLink.getIdOffset() == null) { + return DaoUtil.convertDataList(componentDescriptorRepository.findByScopeAndTypeFirstPage(pageLink.getLimit(), + type.ordinal(), scope.ordinal(), pageLink.getTextSearch())); + } else { + return DaoUtil.convertDataList(componentDescriptorRepository.findByScopeAndTypeNextPage(pageLink.getLimit(), + type.ordinal(), scope.ordinal(), pageLink.getTextSearch(), pageLink.getIdOffset())); + } + } + + @Override + public void deleteById(ComponentDescriptorId componentId) { + removeById(componentId.getId()); + } + + @Override + public void deleteByClazz(String clazz) { + componentDescriptorRepository.deleteByClazz(clazz); + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java new file mode 100644 index 0000000000..9616aa1b83 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java @@ -0,0 +1,30 @@ +package org.thingsboard.server.dao.sql.customer; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; +import org.thingsboard.server.common.data.Customer; +import org.thingsboard.server.dao.model.sql.CustomerEntity; + +import java.util.List; +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public interface CustomerRepository extends CrudRepository { + + @Query(nativeQuery = true, value = "SELECT * FROM CUSTOMER WHERE TENANT_ID = ?2 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "ORDER BY ID LIMIT ?1") + List findByTenantIdFirstPage(int limit, UUID tenantId, String textSearch); + + @Query(nativeQuery = true, value = "SELECT * FROM CUSTOMER WHERE TENANT_ID = ?2 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "AND ID > ?4 ORDER BY ID LIMIT ?1") + List findByTenantIdNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); + + @Query(nativeQuery = true, value = "SELECT * FROM CUSTOMER WHERE TENANT_ID = ?1") + List findByTenantId(UUID tenantId); +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java new file mode 100644 index 0000000000..3d60adecac --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java @@ -0,0 +1,52 @@ +package org.thingsboard.server.dao.sql.customer; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.repository.CrudRepository; +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.customer.CustomerDao; +import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.model.sql.CustomerEntity; +import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; + +import java.util.List; +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +@Component +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public class JpaCustomerDao extends JpaAbstractSearchTextDao implements CustomerDao{ + + @Autowired + private CustomerRepository customerRepository; + + @Override + protected Class getEntityClass() { + return CustomerEntity.class; + } + + @Override + protected String getColumnFamilyName() { + return ModelConstants.CUSTOMER_COLUMN_FAMILY_NAME; + } + + @Override + protected CrudRepository getCrudRepository() { + return customerRepository; + } + + @Override + public List findCustomersByTenantId(UUID tenantId, TextPageLink pageLink) { + if (pageLink.getIdOffset() == null) { + return DaoUtil.convertDataList(customerRepository.findByTenantIdFirstPage(pageLink.getLimit(), tenantId, pageLink.getTextSearch())); + } else { + return DaoUtil.convertDataList(customerRepository.findByTenantIdNextPage(pageLink.getLimit(), tenantId, + pageLink.getTextSearch(), pageLink.getIdOffset())); + } + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java new file mode 100644 index 0000000000..de9a491b14 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java @@ -0,0 +1,36 @@ +package org.thingsboard.server.dao.sql.dashboard; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; +import org.thingsboard.server.dao.model.sql.DashboardInfoEntity; + +import java.util.List; +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public interface DashboardInfoRepository extends CrudRepository { + + @Query(nativeQuery = true, value = "SELECT * FROM DASHBOARD WHERE TENANT_ID = ?2 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "ORDER BY ID LIMIT ?1") + List findByTenantIdFirstPage(int limit, UUID tenantId, String textSearch); + + @Query(nativeQuery = true, value = "SELECT * FROM DASHBOARD WHERE TENANT_ID = ?2 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "AND ID > ?4 ORDER BY ID LIMIT ?1") + List findByTenantIdNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); + + @Query(nativeQuery = true, value = "SELECT * FROM DASHBOARD WHERE TENANT_ID = ?2 " + + "AND CUSTOMER_ID = ?3 AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?4, '%')) " + + "ORDER BY ID LIMIT ?1") + List findByTenantIdAndCustomerIdFirstPage(int limit, UUID tenantId, UUID customerId, String textSearch); + + @Query(nativeQuery = true, value = "SELECT * FROM DASHBOARD WHERE TENANT_ID = ?2 " + + "AND CUSTOMER_ID = ?3 AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?4, '%')) " + + "AND ID > ?5 ORDER BY ID LIMIT ?1") + List findByTenantIdAndCustomerIdNextPage(int limit, UUID tenantId, UUID customerId, String textSearch, UUID idOffset); +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardRepository.java new file mode 100644 index 0000000000..40b164022e --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardRepository.java @@ -0,0 +1,14 @@ +package org.thingsboard.server.dao.sql.dashboard; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.repository.CrudRepository; +import org.thingsboard.server.dao.model.sql.DashboardEntity; + +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public interface DashboardRepository extends CrudRepository { +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java new file mode 100644 index 0000000000..6bc51bbb03 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java @@ -0,0 +1,40 @@ +package org.thingsboard.server.dao.sql.dashboard; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Component; +import org.thingsboard.server.common.data.Dashboard; +import org.thingsboard.server.dao.dashboard.DashboardDao; +import org.thingsboard.server.dao.model.sql.DashboardEntity; +import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; + +import java.util.UUID; + +import static org.thingsboard.server.dao.model.ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +@Component +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public class JpaDashboardDao extends JpaAbstractSearchTextDao implements DashboardDao { + + @Autowired + DashboardRepository dashboardRepository; + + @Override + protected Class getEntityClass() { + return DashboardEntity.class; + } + + @Override + protected String getColumnFamilyName() { + return DASHBOARD_COLUMN_FAMILY_NAME; + } + + @Override + protected CrudRepository getCrudRepository() { + return dashboardRepository; + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java new file mode 100644 index 0000000000..bfeaec04a2 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java @@ -0,0 +1,65 @@ +package org.thingsboard.server.dao.sql.dashboard; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.repository.CrudRepository; +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.dashboard.DashboardInfoDao; +import org.thingsboard.server.dao.model.sql.DashboardInfoEntity; +import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; + +import java.util.List; +import java.util.UUID; + +import static org.thingsboard.server.dao.model.ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +@Component +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public class JpaDashboardInfoDao extends JpaAbstractSearchTextDao implements DashboardInfoDao { + + @Autowired + private DashboardInfoRepository dashboardInfoRepository; + + @Override + protected Class getEntityClass() { + return DashboardInfoEntity.class; + } + + @Override + protected String getColumnFamilyName() { + return DASHBOARD_COLUMN_FAMILY_NAME; + } + + @Override + protected CrudRepository getCrudRepository() { + return dashboardInfoRepository; + } + + @Override + public List findDashboardsByTenantId(UUID tenantId, TextPageLink pageLink) { + if (pageLink.getIdOffset() == null) { + return DaoUtil.convertDataList(dashboardInfoRepository.findByTenantIdFirstPage( + pageLink.getLimit(), tenantId, pageLink.getTextSearch())); + } else { + return DaoUtil.convertDataList(dashboardInfoRepository.findByTenantIdNextPage( + pageLink.getLimit(), tenantId, pageLink.getTextSearch(), pageLink.getIdOffset())); + } + } + + @Override + public List findDashboardsByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink) { + if (pageLink.getIdOffset() == null) { + return DaoUtil.convertDataList(dashboardInfoRepository.findByTenantIdAndCustomerIdFirstPage( + pageLink.getLimit(), tenantId, customerId, pageLink.getTextSearch())); + } else { + return DaoUtil.convertDataList(dashboardInfoRepository.findByTenantIdAndCustomerIdNextPage( + pageLink.getLimit(), tenantId, customerId, pageLink.getTextSearch(), pageLink.getIdOffset())); + } + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/AdminSettingsRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/AdminSettingsRepository.java new file mode 100644 index 0000000000..ce54d003df --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/AdminSettingsRepository.java @@ -0,0 +1,15 @@ +package org.thingsboard.server.dao.sql.settings; + +import org.springframework.data.repository.CrudRepository; +import org.thingsboard.server.dao.model.ToData; +import org.thingsboard.server.dao.model.sql.AdminSettingsEntity; + +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +public interface AdminSettingsRepository extends CrudRepository { + + AdminSettingsEntity findByKey(String key); +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java new file mode 100644 index 0000000000..98f4467ceb --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java @@ -0,0 +1,42 @@ +package org.thingsboard.server.dao.sql.settings; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.repository.CrudRepository; +import org.thingsboard.server.common.data.AdminSettings; +import org.thingsboard.server.dao.DaoUtil; +import org.thingsboard.server.dao.model.sql.AdminSettingsEntity; +import org.thingsboard.server.dao.settings.AdminSettingsDao; +import org.thingsboard.server.dao.sql.JpaAbstractDao; + +import java.util.UUID; + +import static org.thingsboard.server.dao.model.ModelConstants.ADMIN_SETTINGS_COLUMN_FAMILY_NAME; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +public class JpaAdminSettingsDao extends JpaAbstractDao implements AdminSettingsDao{ + + @Autowired + private AdminSettingsRepository adminSettingsRepository; + + @Override + protected Class getEntityClass() { + return AdminSettingsEntity.class; + } + + @Override + protected String getColumnFamilyName() { + return ADMIN_SETTINGS_COLUMN_FAMILY_NAME; + } + + @Override + protected CrudRepository getCrudRepository() { + return adminSettingsRepository; + } + + @Override + public AdminSettings findByKey(String key) { + return DaoUtil.getData(adminSettingsRepository.findByKey(key)); + } +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDaoTest.java new file mode 100644 index 0000000000..08a90c261f --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDaoTest.java @@ -0,0 +1,71 @@ +package org.thingsboard.server.dao.sql.component; + +import com.datastax.driver.core.utils.UUIDs; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.thingsboard.server.common.data.Customer; +import org.thingsboard.server.common.data.id.ComponentDescriptorId; +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.AbstractJpaDaoTest; +import org.thingsboard.server.dao.component.ComponentDescriptorDao; + +import java.util.List; + +import static org.junit.Assert.assertEquals; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +public class JpaBaseComponentDescriptorDaoTest extends AbstractJpaDaoTest { + + @Autowired + private ComponentDescriptorDao componentDescriptorDao; + + @Test + public void findByType() { + for (int i = 0; i < 20; i++) { + createComponentDescriptor(ComponentType.PLUGIN, ComponentScope.SYSTEM, i); + createComponentDescriptor(ComponentType.ACTION, ComponentScope.TENANT, i + 20); + } + + TextPageLink pageLink1 = new TextPageLink(15, "COMPONENT_"); + List components1 = componentDescriptorDao.findByTypeAndPageLink(ComponentType.PLUGIN, pageLink1); + assertEquals(15, components1.size()); + + TextPageLink pageLink2 = new TextPageLink(15, "COMPONENT_", components1.get(14).getId().getId(), null); + List components2 = componentDescriptorDao.findByTypeAndPageLink(ComponentType.PLUGIN, pageLink2); + assertEquals(5, components2.size()); + } + + @Test + public void findByTypeAndSocpe() { + for (int i = 0; i < 20; i++) { + createComponentDescriptor(ComponentType.PLUGIN, ComponentScope.SYSTEM, i); + createComponentDescriptor(ComponentType.ACTION, ComponentScope.TENANT, i + 20); + createComponentDescriptor(ComponentType.FILTER, ComponentScope.SYSTEM, i + 40); + } + + TextPageLink pageLink1 = new TextPageLink(15, "COMPONENT_"); + List components1 = componentDescriptorDao.findByScopeAndTypeAndPageLink( + ComponentScope.SYSTEM, ComponentType.FILTER, pageLink1); + assertEquals(15, components1.size()); + + TextPageLink pageLink2 = new TextPageLink(15, "COMPONENT_", components1.get(14).getId().getId(), null); + List components2 = componentDescriptorDao.findByScopeAndTypeAndPageLink( + ComponentScope.SYSTEM, ComponentType.FILTER, pageLink2); + assertEquals(5, components2.size()); + } + + private void createComponentDescriptor(ComponentType type, ComponentScope scope, int index) { + ComponentDescriptor component = new ComponentDescriptor(); + component.setId(new ComponentDescriptorId(UUIDs.timeBased())); + component.setType(type); + component.setScope(scope); + component.setName("COMPONENT_" + index); + componentDescriptorDao.save(component); + } + +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDaoTest.java new file mode 100644 index 0000000000..f300611efa --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDaoTest.java @@ -0,0 +1,52 @@ +package org.thingsboard.server.dao.sql.customer; + +import com.datastax.driver.core.utils.UUIDs; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.thingsboard.server.common.data.Customer; +import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.page.TextPageLink; +import org.thingsboard.server.dao.AbstractJpaDaoTest; +import org.thingsboard.server.dao.customer.CustomerDao; + +import java.util.List; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +public class JpaCustomerDaoTest extends AbstractJpaDaoTest { + + @Autowired + private CustomerDao customerDao; + + @Test + public void testFindByTenantId() { + UUID tenantId1 = UUIDs.timeBased(); + UUID tenantId2 = UUIDs.timeBased(); + + for (int i = 0; i < 20; i++) { + createCustomer(tenantId1, i); + createCustomer(tenantId2, i * 2); + } + + TextPageLink pageLink1 = new TextPageLink(15, "CUSTOMER"); + List customers1 = customerDao.findCustomersByTenantId(tenantId1, pageLink1); + assertEquals(15, customers1.size()); + + TextPageLink pageLink2 = new TextPageLink(15, "CUSTOMER", customers1.get(14).getId().getId(), null); + List customers2 = customerDao.findCustomersByTenantId(tenantId1, pageLink2); + assertEquals(5, customers2.size()); + } + + private void createCustomer(UUID tenantId, int index) { + Customer customer = new Customer(); + customer.setId(new CustomerId(UUIDs.timeBased())); + customer.setTenantId(new TenantId(tenantId)); + customer.setTitle("CUSTOMER_" + index); + customerDao.save(customer); + } +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDaoTest.java new file mode 100644 index 0000000000..1360ea4bce --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDaoTest.java @@ -0,0 +1,78 @@ +package org.thingsboard.server.dao.sql.dashboard; + +import com.datastax.driver.core.utils.UUIDs; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.thingsboard.server.common.data.DashboardInfo; +import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.DashboardId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.page.TextPageLink; +import org.thingsboard.server.dao.AbstractJpaDaoTest; +import org.thingsboard.server.dao.dashboard.DashboardInfoDao; + +import java.util.List; +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 5/6/2017. + */ +public class JpaDashboardInfoDaoTest extends AbstractJpaDaoTest { + + @Autowired + private DashboardInfoDao dashboardInfoDao; + + @Test + public void testFindDashboardsByTenantId() { + UUID tenantId1 = UUIDs.timeBased(); + UUID customerId1 = UUIDs.timeBased(); + UUID tenantId2 = UUIDs.timeBased(); + UUID customerId2 = UUIDs.timeBased(); + + for (int i = 0; i < 20; i++) { + createDashboard(tenantId1, customerId1, i); + createDashboard(tenantId2, customerId2, i * 2); + } + + TextPageLink pageLink1 = new TextPageLink(15, "DASHBOARD"); + List dashboardInfos1 = dashboardInfoDao.findDashboardsByTenantId(tenantId1, pageLink1); + assertEquals(15, dashboardInfos1.size()); + + TextPageLink pageLink2 = new TextPageLink(15, "DASHBOARD", dashboardInfos1.get(14).getId().getId(), null); + List dashboardInfos2 = dashboardInfoDao.findDashboardsByTenantId(tenantId1, pageLink2); + assertEquals(5, dashboardInfos2.size()); + } + + @Test + public void testFindDashboardsByTenantAndCustomerId() { + UUID tenantId1 = UUIDs.timeBased(); + UUID customerId1 = UUIDs.timeBased(); + UUID tenantId2 = UUIDs.timeBased(); + UUID customerId2 = UUIDs.timeBased(); + + for (int i = 0; i < 20; i++) { + createDashboard(tenantId1, customerId1, i); + createDashboard(tenantId2, customerId2, i * 2); + } + + TextPageLink pageLink1 = new TextPageLink(15, "DASHBOARD"); + List dashboardInfos1 = dashboardInfoDao.findDashboardsByTenantIdAndCustomerId(tenantId1, customerId1, pageLink1); + assertEquals(15, dashboardInfos1.size()); + + TextPageLink pageLink2 = new TextPageLink(15, "DASHBOARD", dashboardInfos1.get(14).getId().getId(), null); + List dashboardInfos2 = dashboardInfoDao.findDashboardsByTenantIdAndCustomerId(tenantId1, customerId1, pageLink2); + assertEquals(5, dashboardInfos2.size()); + } + + private void assertEquals(int i, int size) { + } + + private void createDashboard(UUID tenantId, UUID customerId, int index) { + DashboardInfo dashboardInfo = new DashboardInfo(); + dashboardInfo.setId(new DashboardId(UUIDs.timeBased())); + dashboardInfo.setTenantId(new TenantId(tenantId)); + dashboardInfo.setCustomerId(new CustomerId(customerId)); + dashboardInfo.setTitle("DASHBOARD_" + index); + dashboardInfoDao.save(dashboardInfo); + } +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceDaoTest.java index 4f1b31598a..58507af7c4 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceDaoTest.java @@ -1,13 +1,11 @@ package org.thingsboard.server.dao.sql.device; import com.datastax.driver.core.utils.UUIDs; -import com.github.springtestdbunit.annotation.DatabaseOperation; -import com.github.springtestdbunit.annotation.DatabaseSetup; -import com.github.springtestdbunit.annotation.DatabaseTearDown; -import com.google.common.util.concurrent.*; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DeviceId; @@ -17,7 +15,6 @@ import org.thingsboard.server.dao.AbstractJpaDaoTest; import org.thingsboard.server.dao.device.DeviceDao; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.UUID; import java.util.concurrent.ExecutionException; @@ -29,15 +26,12 @@ import static org.junit.Assert.assertNotNull; /** * Created by Valerii Sosliuk on 5/6/2017. */ -@Transactional public class JpaDeviceDaoTest extends AbstractJpaDaoTest { @Autowired private DeviceDao deviceDao; @Test - @DatabaseSetup(value = "classpath:dbunit/empty_dataset.xml",type = DatabaseOperation.DELETE_ALL) - @DatabaseTearDown(value = "classpath:dbunit/empty_dataset.xml",type = DatabaseOperation.DELETE_ALL) public void testFindDevicesByTenantId() { UUID tenantId1 = UUIDs.timeBased(); UUID tenantId2 = UUIDs.timeBased(); @@ -55,8 +49,6 @@ public class JpaDeviceDaoTest extends AbstractJpaDaoTest { } @Test - @DatabaseSetup(value = "classpath:dbunit/empty_dataset.xml",type = DatabaseOperation.DELETE_ALL) - @DatabaseTearDown(value = "classpath:dbunit/empty_dataset.xml",type = DatabaseOperation.DELETE_ALL) public void testFindAsync() throws ExecutionException, InterruptedException { UUID tenantId = UUIDs.timeBased(); UUID customerId = UUIDs.timeBased(); @@ -75,8 +67,6 @@ public class JpaDeviceDaoTest extends AbstractJpaDaoTest { } @Test - @DatabaseSetup(value = "classpath:dbunit/empty_dataset.xml",type = DatabaseOperation.DELETE_ALL) - @DatabaseTearDown(value = "classpath:dbunit/empty_dataset.xml",type = DatabaseOperation.DELETE_ALL) public void testFindDevicesByTenantIdAndIdsAsync() throws ExecutionException, InterruptedException { UUID tenantId1 = UUIDs.timeBased(); UUID customerId1 = UUIDs.timeBased(); @@ -100,8 +90,6 @@ public class JpaDeviceDaoTest extends AbstractJpaDaoTest { } @Test - @DatabaseSetup(value = "classpath:dbunit/empty_dataset.xml",type = DatabaseOperation.DELETE_ALL) - @DatabaseTearDown(value = "classpath:dbunit/empty_dataset.xml",type = DatabaseOperation.DELETE_ALL) public void testFindDevicesByTenantIdAndCustomerIdAndIdsAsync() throws ExecutionException, InterruptedException { UUID tenantId1 = UUIDs.timeBased(); UUID customerId1 = UUIDs.timeBased(); diff --git a/dao/src/test/resources/jpa-test.properties b/dao/src/test/resources/jpa-test.properties index f887e08db0..54025ab561 100644 --- a/dao/src/test/resources/jpa-test.properties +++ b/dao/src/test/resources/jpa-test.properties @@ -1,10 +1,6 @@ cassandra.enabled=false sql.enabled=true -#sql.datasource.url=jdbc:h2:mem:thingsboard -#sql.datasource.username=sa -#sql.datasource.password= -#spring.jpa.hibernate.ddl-auto=create-drop spring.jpa.show-sql=false spring.jpa.hibernate.ddl-auto=create-drop From 279769295b8b8702b8e833ef8ce100d0a6a7bac8 Mon Sep 17 00:00:00 2001 From: mp-loki Date: Sun, 7 May 2017 00:13:53 -0400 Subject: [PATCH 22/69] Licenses updated --- .../server/dao/sql/JpaAbstractSearchTextDao.java | 15 +++++++++++++++ .../server/dao/sql/JpaAbstractSearchTimeDao.java | 15 +++++++++++++++ .../component/ComponentDescriptorRepository.java | 15 +++++++++++++++ .../component/JpaBaseComponentDescriptorDao.java | 15 +++++++++++++++ .../dao/sql/customer/CustomerRepository.java | 15 +++++++++++++++ .../server/dao/sql/customer/JpaCustomerDao.java | 15 +++++++++++++++ .../sql/dashboard/DashboardInfoRepository.java | 15 +++++++++++++++ .../dao/sql/dashboard/DashboardRepository.java | 15 +++++++++++++++ .../server/dao/sql/dashboard/JpaDashboardDao.java | 15 +++++++++++++++ .../dao/sql/dashboard/JpaDashboardInfoDao.java | 15 +++++++++++++++ .../sql/device/DeviceCredentialsRepository.java | 15 +++++++++++++++ .../server/dao/sql/device/DeviceRepository.java | 15 +++++++++++++++ .../dao/sql/device/JpaDeviceCredentialsDao.java | 15 +++++++++++++++ .../server/dao/sql/device/JpaDeviceDao.java | 15 +++++++++++++++ .../server/dao/sql/event/EventRepository.java | 15 +++++++++++++++ .../server/dao/sql/event/JpaBaseEventDao.java | 15 +++++++++++++++ .../dao/sql/settings/AdminSettingsRepository.java | 15 +++++++++++++++ .../dao/sql/settings/JpaAdminSettingsDao.java | 15 +++++++++++++++ .../server/dao/JpaDbunitTestConfig.java | 15 +++++++++++++++ .../JpaBaseComponentDescriptorDaoTest.java | 15 +++++++++++++++ .../dao/sql/customer/JpaCustomerDaoTest.java | 15 +++++++++++++++ .../sql/dashboard/JpaDashboardInfoDaoTest.java | 15 +++++++++++++++ .../sql/device/JpaDeviceCredentialsDaoTest.java | 15 +++++++++++++++ .../server/dao/sql/device/JpaDeviceDaoTest.java | 15 +++++++++++++++ .../server/dao/sql/event/JpaBaseEventDaoTest.java | 15 +++++++++++++++ 25 files changed, 375 insertions(+) diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTextDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTextDao.java index 02d0e07871..a6e72c6a94 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTextDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTextDao.java @@ -1,3 +1,18 @@ +/** + * 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.sql; import org.thingsboard.server.dao.model.BaseEntity; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTimeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTimeDao.java index f0e5cb2e65..594de17c68 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTimeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTimeDao.java @@ -1,3 +1,18 @@ +/** + * 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.sql; import com.datastax.driver.core.utils.UUIDs; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java index a8443703ce..9bd8c1f252 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java @@ -1,3 +1,18 @@ +/** + * 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.sql.component; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java index e6ab86a9d1..440cce02f6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java @@ -1,3 +1,18 @@ +/** + * 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.sql.component; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java index 9616aa1b83..5687ebbc99 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java @@ -1,3 +1,18 @@ +/** + * 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.sql.customer; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java index 3d60adecac..07d7fc9c1b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java @@ -1,3 +1,18 @@ +/** + * 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.sql.customer; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java index de9a491b14..868ec5e3a0 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java @@ -1,3 +1,18 @@ +/** + * 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.sql.dashboard; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardRepository.java index 40b164022e..11fae3a51a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardRepository.java @@ -1,3 +1,18 @@ +/** + * 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.sql.dashboard; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java index 6bc51bbb03..5d0c7bb86f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java @@ -1,3 +1,18 @@ +/** + * 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.sql.dashboard; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java index bfeaec04a2..698cb31684 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java @@ -1,3 +1,18 @@ +/** + * 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.sql.dashboard; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceCredentialsRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceCredentialsRepository.java index cc0f6003fb..229e6d5422 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceCredentialsRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceCredentialsRepository.java @@ -1,3 +1,18 @@ +/** + * 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.sql.device; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java index 486305b405..ea3e92e7a8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java @@ -1,3 +1,18 @@ +/** + * 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.sql.device; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java index 5538d96946..331ebdb703 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java @@ -1,3 +1,18 @@ +/** + * 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.sql.device; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java index eefedd0591..730eb8bd13 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java @@ -1,3 +1,18 @@ +/** + * 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.sql.device; import com.google.common.util.concurrent.ListenableFuture; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java index 32a5b3bad5..7067a55839 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java @@ -1,3 +1,18 @@ +/** + * 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.sql.event; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java index 3972c8e4d6..9dd6070e1c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java @@ -1,3 +1,18 @@ +/** + * 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.sql.event; import com.datastax.driver.core.utils.UUIDs; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/AdminSettingsRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/AdminSettingsRepository.java index ce54d003df..5862c359b6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/AdminSettingsRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/AdminSettingsRepository.java @@ -1,3 +1,18 @@ +/** + * 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.sql.settings; import org.springframework.data.repository.CrudRepository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java index 98f4467ceb..7373cd8140 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java @@ -1,3 +1,18 @@ +/** + * 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.sql.settings; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java b/dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java index 0c064d4697..dda8d638e0 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java +++ b/dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java @@ -1,3 +1,18 @@ +/** + * 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 com.github.springtestdbunit.bean.DatabaseConfigBean; diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDaoTest.java index 08a90c261f..ce115c59e3 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDaoTest.java @@ -1,3 +1,18 @@ +/** + * 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.sql.component; import com.datastax.driver.core.utils.UUIDs; diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDaoTest.java index f300611efa..5ee112abf3 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDaoTest.java @@ -1,3 +1,18 @@ +/** + * 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.sql.customer; import com.datastax.driver.core.utils.UUIDs; diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDaoTest.java index 1360ea4bce..39bb084c33 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDaoTest.java @@ -1,3 +1,18 @@ +/** + * 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.sql.dashboard; import com.datastax.driver.core.utils.UUIDs; diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDaoTest.java index dce6113e3e..d13d9db0b8 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDaoTest.java @@ -1,3 +1,18 @@ +/** + * 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.sql.device; import com.github.springtestdbunit.annotation.DatabaseSetup; diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceDaoTest.java index 58507af7c4..182e4fe5c7 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/device/JpaDeviceDaoTest.java @@ -1,3 +1,18 @@ +/** + * 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.sql.device; import com.datastax.driver.core.utils.UUIDs; diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java index 30667faba6..79deaeead1 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java @@ -1,3 +1,18 @@ +/** + * 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.sql.event; import com.datastax.driver.core.utils.UUIDs; From e80cb31a150ed47d9193962091e810c785c675b2 Mon Sep 17 00:00:00 2001 From: mp-loki Date: Sat, 13 May 2017 16:36:05 -0400 Subject: [PATCH 23/69] JsonNode values saved to postgres as jsonb type --- dao/pom.xml | 5 - .../dao/model/sql/AdminSettingsEntity.java | 25 ++-- .../model/sql/ComponentDescriptorEntity.java | 25 ++-- .../server/dao/model/sql/CustomerEntity.java | 21 +--- .../server/dao/model/sql/DashboardEntity.java | 27 ++--- .../server/dao/model/sql/DeviceEntity.java | 27 ++--- .../server/dao/model/sql/EventEntity.java | 24 ++-- .../dao/model/sql/PluginMetaDataEntity.java | 45 +++---- .../dao/model/sql/RuleMetaDataEntity.java | 78 ++++-------- .../server/dao/model/sql/TenantEntity.java | 25 ++-- .../server/dao/model/sql/UserEntity.java | 24 ++-- .../dao/model/sql/WidgetTypeEntity.java | 34 ++---- .../server/dao/sql/JpaAbstractDao.java | 3 - .../JpaBaseComponentDescriptorDao.java | 5 - .../dao/sql/customer/CustomerRepository.java | 2 - .../dao/sql/customer/JpaCustomerDao.java | 5 - .../dao/sql/dashboard/JpaDashboardDao.java | 5 - .../sql/dashboard/JpaDashboardInfoDao.java | 5 - .../sql/device/JpaDeviceCredentialsDao.java | 7 -- .../server/dao/sql/device/JpaDeviceDao.java | 5 - .../server/dao/sql/event/JpaBaseEventDao.java | 5 - .../dao/sql/plugin/JpaBasePluginDao.java | 5 - .../server/dao/sql/rule/JpaBaseRuleDao.java | 4 - .../dao/sql/settings/JpaAdminSettingsDao.java | 5 - .../server/dao/sql/tenant/JpaTenantDao.java | 5 - .../dao/sql/user/JpaUserCredentialsDao.java | 5 - .../server/dao/sql/user/JpaUserDao.java | 5 - .../dao/sql/widget/JpaWidgetTypeDao.java | 5 - .../dao/sql/widget/JpaWidgetsBundleDao.java | 5 - .../server/dao/util/JacksonUtil.java | 60 +++++++++ .../dao/util/JsonBinarySqlTypeDescriptor.java | 114 ++++++++++++++++++ .../server/dao/util/JsonBinaryType.java | 44 +++++++ .../server/dao/util/JsonTypeDescriptor.java | 95 +++++++++++++++ .../dao/sql/plugin/JpaBasePluginDaoTest.java | 5 +- .../dao/sql/rule/JpaBaseRuleDaoTest.java | 46 +++++-- .../server/dao/sql/user/JpaUserDaoTest.java | 3 +- .../sql/widget/JpaWidgetsBundleDaoTest.java | 4 +- dao/src/test/resources/dbunit/users.xml | 5 - 38 files changed, 478 insertions(+), 339 deletions(-) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/util/JacksonUtil.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/util/JsonBinarySqlTypeDescriptor.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/util/JsonBinaryType.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/util/JsonTypeDescriptor.java diff --git a/dao/pom.xml b/dao/pom.xml index d95521ddd0..ced5c381f4 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -173,11 +173,6 @@ spring-test test - - org.springframework - spring-test - compile - com.h2database h2 diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java index 25393fb971..27f988a780 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java @@ -25,9 +25,12 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.hibernate.annotations.Type; +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.JsonBinaryType; import java.io.IOException; import java.util.UUID; @@ -35,8 +38,8 @@ import java.util.UUID; import static org.thingsboard.server.dao.model.ModelConstants.*; @Data -@Slf4j @Entity +@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) @Table(name = ADMIN_SETTINGS_COLUMN_FAMILY_NAME) public final class AdminSettingsEntity implements BaseEntity { @@ -50,8 +53,9 @@ public final class AdminSettingsEntity implements BaseEntity { @Column(name = ADMIN_SETTINGS_KEY_PROPERTY) private String key; - @Column(name = ADMIN_SETTINGS_JSON_VALUE_PROPERTY) - private String jsonValue; + @Type(type = "jsonb") + @Column(name = ADMIN_SETTINGS_JSON_VALUE_PROPERTY, columnDefinition = "jsonb") + private JsonNode jsonValue; public AdminSettingsEntity() { super(); @@ -62,9 +66,7 @@ public final class AdminSettingsEntity implements BaseEntity { this.id = adminSettings.getId().getId(); } this.key = adminSettings.getKey(); - if (jsonValue != null) { - this.jsonValue = adminSettings.getJsonValue().toString(); - } + this.jsonValue = adminSettings.getJsonValue(); } @Override @@ -132,16 +134,7 @@ public final class AdminSettingsEntity implements BaseEntity { AdminSettings adminSettings = new AdminSettings(new AdminSettingsId(id)); adminSettings.setCreatedTime(UUIDs.unixTimestamp(id)); adminSettings.setKey(key); - if (jsonValue != null) { - ObjectMapper mapper = new ObjectMapper(); - JsonNode jsonNode = null; - try { - jsonNode = mapper.readTree(jsonValue); - adminSettings.setJsonValue(jsonNode); - } catch (IOException e) { - log.error(e.getMessage(), e); - } - } + adminSettings.setJsonValue(jsonValue); return adminSettings; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java index 37fab4f487..02cad5d8e6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java @@ -24,19 +24,22 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.hibernate.annotations.Type; +import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.id.ComponentDescriptorId; 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.model.ModelConstants; import org.thingsboard.server.dao.model.SearchTextEntity; +import org.thingsboard.server.dao.util.JsonBinaryType; import java.io.IOException; import java.util.UUID; @Data -@Slf4j @Entity +@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) @Table(name = ModelConstants.COMPONENT_DESCRIPTOR_COLUMN_FAMILY_NAME) public class ComponentDescriptorEntity implements SearchTextEntity { @@ -59,8 +62,9 @@ public class ComponentDescriptorEntity implements SearchTextEntity { @@ -80,8 +80,9 @@ public final class CustomerEntity implements SearchTextEntity { @Column(name = ModelConstants.EMAIL_PROPERTY) private String email; - @Column(name = ModelConstants.CUSTOMER_ADDITIONAL_INFO_PROPERTY) - private String additionalInfo; + @Type(type = "jsonb") + @Column(name = ModelConstants.CUSTOMER_ADDITIONAL_INFO_PROPERTY, columnDefinition = "jsonb") + private JsonNode additionalInfo; public CustomerEntity() { super(); @@ -101,9 +102,7 @@ public final class CustomerEntity implements SearchTextEntity { this.zip = customer.getZip(); this.phone = customer.getPhone(); this.email = customer.getEmail(); - if (additionalInfo != null) { - this.additionalInfo = customer.getAdditionalInfo().toString(); - } + this.additionalInfo = customer.getAdditionalInfo(); } @Override @@ -262,15 +261,7 @@ public final class CustomerEntity implements SearchTextEntity { customer.setZip(zip); customer.setPhone(phone); customer.setEmail(email); - if (additionalInfo != null) { - ObjectMapper mapper = new ObjectMapper(); - try { - JsonNode jsonNode = mapper.readTree(additionalInfo); - customer.setAdditionalInfo(jsonNode); - } catch (IOException e) { - log.error(e.getMessage(), e); - } - } + customer.setAdditionalInfo(additionalInfo); return customer; } } \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java index 1ad0f84633..4cc46f466c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java @@ -25,19 +25,22 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.hibernate.annotations.Type; +import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.Dashboard; import org.thingsboard.server.common.data.id.CustomerId; 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.JsonBinaryType; import java.io.IOException; import java.util.UUID; @Data -@Slf4j @Entity +@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) @Table(name = ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME) public final class DashboardEntity implements SearchTextEntity { @@ -59,9 +62,10 @@ public final class DashboardEntity implements SearchTextEntity { @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) private String searchText; - - @Column(name = ModelConstants.DASHBOARD_CONFIGURATION_PROPERTY) - private String configuration; + + @Type(type = "jsonb") + @Column(name = ModelConstants.DASHBOARD_CONFIGURATION_PROPERTY, columnDefinition = "jsonb") + private JsonNode configuration; public DashboardEntity() { super(); @@ -78,9 +82,7 @@ public final class DashboardEntity implements SearchTextEntity { this.customerId = dashboard.getCustomerId().getId(); } this.title = dashboard.getTitle(); - if (configuration != null) { - this.configuration = dashboard.getConfiguration().toString(); - } + this.configuration = dashboard.getConfiguration(); } @Override @@ -191,16 +193,7 @@ public final class DashboardEntity implements SearchTextEntity { dashboard.setCustomerId(new CustomerId(customerId)); } dashboard.setTitle(title); - if (configuration != null) { - ObjectMapper mapper = new ObjectMapper(); - JsonNode jsonNode = null; - try { - jsonNode = mapper.readTree(configuration); - dashboard.setConfiguration(jsonNode); - } catch (IOException e) { - log.error(e.getMessage(), e); - } - } + dashboard.setConfiguration(configuration); return dashboard; } } \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java index 0b1ecdf40c..0504ccf903 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java @@ -25,19 +25,22 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.hibernate.annotations.Type; +import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.id.CustomerId; 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.JsonBinaryType; import java.io.IOException; import java.util.UUID; @Data -@Slf4j @Entity +@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) @Table(name = ModelConstants.DEVICE_COLUMN_FAMILY_NAME) public final class DeviceEntity implements SearchTextEntity { @@ -59,9 +62,10 @@ public final class DeviceEntity implements SearchTextEntity { @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) private String searchText; - - @Column(name = ModelConstants.DEVICE_ADDITIONAL_INFO_PROPERTY) - private String additionalInfo; + + @Type(type = "jsonb") + @Column(name = ModelConstants.DEVICE_ADDITIONAL_INFO_PROPERTY, columnDefinition = "jsonb") + private JsonNode additionalInfo; public DeviceEntity() { super(); @@ -78,9 +82,7 @@ public final class DeviceEntity implements SearchTextEntity { this.customerId = device.getCustomerId().getId(); } this.name = device.getName(); - if (additionalInfo != null) { - this.additionalInfo = device.getAdditionalInfo().toString(); - } + this.additionalInfo = device.getAdditionalInfo(); } @Override @@ -174,16 +176,7 @@ public final class DeviceEntity implements SearchTextEntity { device.setCustomerId(new CustomerId(customerId)); } device.setName(name); - if (additionalInfo != null) { - ObjectMapper mapper = new ObjectMapper(); - JsonNode jsonNode = null; - try { - jsonNode = mapper.readTree(additionalInfo); - device.setAdditionalInfo(jsonNode); - } catch (IOException e) { - log.error(e.getMessage(), e); - } - } + device.setAdditionalInfo(additionalInfo); return device; } } \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java index a0cce5ca22..65e51a0879 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java @@ -26,10 +26,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.hibernate.annotations.Type; +import org.hibernate.annotations.TypeDef; 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.JsonBinaryType; import static org.thingsboard.server.dao.model.ModelConstants.*; @@ -37,9 +40,9 @@ import java.io.IOException; import java.util.UUID; @Data -@Slf4j @NoArgsConstructor @Entity +@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) @Table(name = EVENT_COLUMN_FAMILY_NAME) public class EventEntity implements BaseEntity { @@ -65,8 +68,9 @@ public class EventEntity implements BaseEntity { @Column(name = EVENT_UID_PROPERTY) private String eventUid; - @Column(name = EVENT_BODY_PROPERTY) - private String body; + @Type(type = "jsonb") + @Column(name = EVENT_BODY_PROPERTY, columnDefinition = "jsonb") + private JsonNode body; public EventEntity(Event event) { if (event.getId() != null) { @@ -81,9 +85,7 @@ public class EventEntity implements BaseEntity { } this.eventType = event.getType(); this.eventUid = event.getUid(); - if (event.getBody() != null) { - this.body = event.getBody().toString(); - } + this.body = event.getBody(); } @Override @@ -118,15 +120,7 @@ public class EventEntity implements BaseEntity { event.setEntityId(new PluginId(entityId)); break; } - ObjectMapper mapper = new ObjectMapper(); - if (body != null) { - try { - JsonNode jsonNode = mapper.readTree(body); - event.setBody(jsonNode); - } catch (IOException e) { - log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", body, e.getMessage()), e); - } - } + event.setBody(body); event.setType(eventType); event.setUid(eventUid); return event; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java index 1e5d1b09a1..8d8974dcf8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java @@ -25,19 +25,23 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.hibernate.annotations.Type; +import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.id.PluginId; import org.thingsboard.server.common.data.id.TenantId; 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.JsonBinaryType; import java.io.IOException; import java.util.Objects; import java.util.UUID; -@Slf4j + @Data @Entity +@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) @Table(name = ModelConstants.PLUGIN_COLUMN_FAMILY_NAME) public class PluginMetaDataEntity implements SearchTextEntity { @@ -65,15 +69,17 @@ public class PluginMetaDataEntity implements SearchTextEntity { @Column(name = ModelConstants.PLUGIN_STATE_PROPERTY) private ComponentLifecycleState state; - @Column(name = ModelConstants.PLUGIN_CONFIGURATION_PROPERTY) - private String configuration; + @Type(type = "jsonb") + @Column(name = ModelConstants.PLUGIN_CONFIGURATION_PROPERTY, columnDefinition = "jsonb") + private JsonNode configuration; + + @Type(type = "jsonb") + @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY, columnDefinition = "jsonb") + private JsonNode additionalInfo; @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) private String searchText; - @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY) - private String additionalInfo; - public PluginMetaDataEntity() { } @@ -88,12 +94,8 @@ public class PluginMetaDataEntity implements SearchTextEntity { this.publicAccess = pluginMetaData.isPublicAccess(); this.state = pluginMetaData.getState(); this.searchText = pluginMetaData.getName(); - if (pluginMetaData.getConfiguration() != null) { - this.configuration = pluginMetaData.getConfiguration().toString(); - } - if (pluginMetaData.getAdditionalInfo() != null) { - this.additionalInfo = pluginMetaData.getAdditionalInfo().toString(); - } + this.configuration = pluginMetaData.getConfiguration(); + this.additionalInfo = pluginMetaData.getAdditionalInfo(); } @Override @@ -126,23 +128,8 @@ public class PluginMetaDataEntity implements SearchTextEntity { data.setPublicAccess(publicAccess); data.setState(state); data.setApiToken(apiToken); - ObjectMapper mapper = new ObjectMapper(); - if (configuration != null) { - try { - JsonNode jsonNode = mapper.readTree(configuration); - data.setConfiguration(jsonNode); - } catch (IOException e) { - log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", configuration, e.getMessage()), e); - } - } - if (additionalInfo != null) { - try { - JsonNode jsonNode = mapper.readTree(additionalInfo); - data.setAdditionalInfo(jsonNode); - } catch (IOException e) { - log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", additionalInfo, e.getMessage()), e); - } - } + data.setConfiguration(configuration); + data.setAdditionalInfo(additionalInfo); return data; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java index 54359a35aa..193501a981 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java @@ -27,6 +27,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.hibernate.annotations.Type; +import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.id.RuleId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.plugin.ComponentLifecycleState; @@ -34,14 +36,15 @@ 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.JsonBinaryType; import java.io.IOException; import java.util.Objects; import java.util.UUID; -@Slf4j @Data @Entity +@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) @Table(name = ModelConstants.RULE_COLUMN_FAMILY_NAME) public class RuleMetaDataEntity implements SearchTextEntity { @@ -62,14 +65,18 @@ public class RuleMetaDataEntity implements SearchTextEntity { private String searchText; @Column(name = ModelConstants.RULE_PLUGIN_TOKEN_PROPERTY) private String pluginToken; - @Column(name = ModelConstants.RULE_FILTERS) - private String filters; - @Column(name = ModelConstants.RULE_PROCESSOR) - private String processor; - @Column(name = ModelConstants.RULE_ACTION) - private String action; - @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY) - private String additionalInfo; + @Type(type = "jsonb") + @Column(name = ModelConstants.RULE_FILTERS, columnDefinition = "jsonb") + private JsonNode filters; + @Type(type = "jsonb") + @Column(name = ModelConstants.RULE_PROCESSOR, columnDefinition = "jsonb") + private JsonNode processor; + @Type(type = "jsonb") + @Column(name = ModelConstants.RULE_ACTION, columnDefinition = "jsonb") + private JsonNode action; + @Type(type = "jsonb") + @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY, columnDefinition = "jsonb") + private JsonNode additionalInfo; public RuleMetaDataEntity() { } @@ -84,18 +91,10 @@ public class RuleMetaDataEntity implements SearchTextEntity { this.state = rule.getState(); this.weight = rule.getWeight(); this.searchText = rule.getName(); - if (rule.getFilters() != null) { - this.filters = rule.getFilters().toString(); - } - if (rule.getProcessor() != null) { - this.processor = rule.getProcessor().toString(); - } - if (rule.getAction() != null) { - this.action = rule.getAction().toString(); - } - if (rule.getAdditionalInfo() != null) { - this.additionalInfo = rule.getAdditionalInfo().toString(); - } + this.filters = rule.getFilters(); + this.processor = rule.getProcessor(); + this.action = rule.getAction(); + this.additionalInfo = rule.getAdditionalInfo(); } @Override @@ -127,39 +126,10 @@ public class RuleMetaDataEntity implements SearchTextEntity { rule.setWeight(weight); rule.setCreatedTime(UUIDs.unixTimestamp(id)); rule.setPluginToken(pluginToken); - ObjectMapper mapper = new ObjectMapper(); - if (filters != null) { - try { - JsonNode jsonNode = mapper.readTree(filters); - rule.setFilters(jsonNode); - } catch (IOException e) { - log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", filters, e.getMessage()), e); - } - } - if (processor != null) { - try { - JsonNode jsonNode = mapper.readTree(processor); - rule.setProcessor(jsonNode); - } catch (IOException e) { - log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", processor, e.getMessage()), e); - } - } - if (action != null) { - try { - JsonNode jsonNode = mapper.readTree(action); - rule.setAction(jsonNode); - } catch (IOException e) { - log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", action, e.getMessage()), e); - } - } - if (additionalInfo != null) { - try { - JsonNode jsonNode = mapper.readTree(additionalInfo); - rule.setAdditionalInfo(jsonNode); - } catch (IOException e) { - log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", additionalInfo, e.getMessage()), e); - } - } + rule.setFilters(filters); + rule.setProcessor(processor); + rule.setAction(action); + rule.setAdditionalInfo(additionalInfo); return rule; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java index 6a2e8a066b..fcd5b19f63 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java @@ -26,18 +26,21 @@ import javax.persistence.Transient; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.hibernate.annotations.Type; +import org.hibernate.annotations.TypeDef; 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 com.fasterxml.jackson.databind.JsonNode; +import org.thingsboard.server.dao.util.JsonBinaryType; import java.io.IOException; import java.util.UUID; -@Slf4j @Data @Entity +@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) @Table(name = ModelConstants.TENANT_COLUMN_FAMILY_NAME) public final class TenantEntity implements SearchTextEntity { @@ -81,8 +84,9 @@ public final class TenantEntity implements SearchTextEntity { @Column(name = ModelConstants.EMAIL_PROPERTY) private String email; - @Column(name = ModelConstants.TENANT_ADDITIONAL_INFO_PROPERTY) - private String additionalInfo; + @Type(type="jsonb") + @Column(name = ModelConstants.TENANT_ADDITIONAL_INFO_PROPERTY, columnDefinition = "jsonb") + private JsonNode additionalInfo; public TenantEntity() { super(); @@ -102,12 +106,9 @@ public final class TenantEntity implements SearchTextEntity { this.zip = tenant.getZip(); this.phone = tenant.getPhone(); this.email = tenant.getEmail(); - if (tenant.getAdditionalInfo() != null) { - this.additionalInfo = tenant.getAdditionalInfo().toString(); - } + this.additionalInfo = tenant.getAdditionalInfo(); } - @Override public String getSearchTextSource() { return title; @@ -258,15 +259,7 @@ public final class TenantEntity implements SearchTextEntity { tenant.setZip(zip); tenant.setPhone(phone); tenant.setEmail(email); - ObjectMapper mapper = new ObjectMapper(); - if (additionalInfo != null) { - try { - JsonNode jsonNode = mapper.readTree(additionalInfo); - tenant.setAdditionalInfo(jsonNode); - } catch (IOException e) { - log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", additionalInfo, e.getMessage()), e); - } - } + tenant.setAdditionalInfo(additionalInfo); return tenant; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java index c85b2aa9d9..6572462df0 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java @@ -20,6 +20,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.hibernate.annotations.Type; +import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.TenantId; @@ -27,6 +29,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.JsonBinaryType; import javax.persistence.*; import java.io.IOException; @@ -35,9 +38,9 @@ import java.util.UUID; /** * Created by Valerii Sosliuk on 4/21/2017. */ -@Slf4j @Data @Entity +@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) @Table(name = ModelConstants.USER_PG_HIBERNATE_COLUMN_FAMILY_NAME) public class UserEntity implements SearchTextEntity { @Transient @@ -68,8 +71,9 @@ public class UserEntity implements SearchTextEntity { @Column(name = ModelConstants.USER_LAST_NAME_PROPERTY) private String lastName; - @Column(name = ModelConstants.USER_ADDITIONAL_INFO_PROPERTY) - private String additionalInfo; + @Type(type="jsonb") + @Column(name = ModelConstants.USER_ADDITIONAL_INFO_PROPERTY, columnDefinition = "jsonb") + private JsonNode additionalInfo; public UserEntity() { } @@ -88,9 +92,7 @@ public class UserEntity implements SearchTextEntity { this.email = user.getEmail(); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); - if (user.getAdditionalInfo() != null) { - this.additionalInfo = user.getAdditionalInfo().toString(); - } + this.additionalInfo = user.getAdditionalInfo(); } @Override @@ -150,15 +152,7 @@ public class UserEntity implements SearchTextEntity { user.setEmail(email); user.setFirstName(firstName); user.setLastName(lastName); - ObjectMapper mapper = new ObjectMapper(); - if (additionalInfo != null) { - try { - JsonNode jsonNode = mapper.readTree(additionalInfo); - user.setAdditionalInfo(jsonNode); - } catch (IOException e) { - log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", additionalInfo, e.getMessage()), e); - } - } + user.setAdditionalInfo(additionalInfo); return user; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java index 4f31e70201..28de47ffc6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java @@ -16,29 +16,24 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; - import com.datastax.driver.mapping.annotations.PartitionKey; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; -import lombok.extern.slf4j.Slf4j; +import org.hibernate.annotations.Type; +import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.id.TenantId; 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.JsonBinaryType; -import java.io.IOException; +import javax.persistence.*; import java.util.UUID; -@Slf4j @Data @Entity +@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) @Table(name = ModelConstants.WIDGET_TYPE_COLUMN_FAMILY_NAME) public final class WidgetTypeEntity implements BaseEntity { @@ -63,8 +58,9 @@ public final class WidgetTypeEntity implements BaseEntity { @Column(name = ModelConstants.WIDGET_TYPE_NAME_PROPERTY) private String name; - @Column(name = ModelConstants.WIDGET_TYPE_DESCRIPTOR_PROPERTY) - private String descriptor; + @Type(type="jsonb") + @Column(name = ModelConstants.WIDGET_TYPE_DESCRIPTOR_PROPERTY, columnDefinition = "jsonb") + private JsonNode descriptor; public WidgetTypeEntity() { super(); @@ -80,9 +76,7 @@ public final class WidgetTypeEntity implements BaseEntity { this.bundleAlias = widgetType.getBundleAlias(); this.alias = widgetType.getAlias(); this.name = widgetType.getName(); - if (widgetType.getDescriptor() != null) { - this.descriptor = widgetType.getDescriptor().toString(); - } + this.descriptor = widgetType.getDescriptor(); } @Override @@ -144,15 +138,7 @@ public final class WidgetTypeEntity implements BaseEntity { widgetType.setBundleAlias(bundleAlias); widgetType.setAlias(alias); widgetType.setName(name); - ObjectMapper mapper = new ObjectMapper(); - if (descriptor != null) { - try { - JsonNode jsonNode = mapper.readTree(descriptor); - widgetType.setDescriptor(jsonNode); - } catch (IOException e) { - log.warn(String.format("Error parsing JsonNode: %s. Reason: %s ", descriptor, e.getMessage()), e); - } - } + widgetType.setDescriptor(descriptor); return widgetType; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java index 0d04577221..8d0100d9ad 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java @@ -41,8 +41,6 @@ public abstract class JpaAbstractDao, D> implements Dao< protected abstract Class getEntityClass(); - protected abstract String getColumnFamilyName(); - protected abstract CrudRepository getCrudRepository(); protected boolean isSearchTextDao() { @@ -93,7 +91,6 @@ public abstract class JpaAbstractDao, D> implements Dao< @Override public List find() { - log.debug("Get all entities from column family {}", getColumnFamilyName()); List entities = Lists.newArrayList(getCrudRepository().findAll()); return DaoUtil.convertDataList(entities); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java index 440cce02f6..596d142dd9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java @@ -50,11 +50,6 @@ public class JpaBaseComponentDescriptorDao extends JpaAbstractSearchTextDao getCrudRepository() { return componentDescriptorRepository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java index 5687ebbc99..b26be064f6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java @@ -40,6 +40,4 @@ public interface CustomerRepository extends CrudRepository "AND ID > ?4 ORDER BY ID LIMIT ?1") List findByTenantIdNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); - @Query(nativeQuery = true, value = "SELECT * FROM CUSTOMER WHERE TENANT_ID = ?1") - List findByTenantId(UUID tenantId); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java index 07d7fc9c1b..3dfaccdec8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java @@ -45,11 +45,6 @@ public class JpaCustomerDao extends JpaAbstractSearchTextDao getCrudRepository() { return customerRepository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java index 5d0c7bb86f..5f14110af4 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java @@ -43,11 +43,6 @@ public class JpaDashboardDao extends JpaAbstractSearchTextDao getCrudRepository() { return dashboardRepository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java index 698cb31684..81f73092d5 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java @@ -46,11 +46,6 @@ public class JpaDashboardInfoDao extends JpaAbstractSearchTextDao getCrudRepository() { return deviceCredentialsRepository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java index 730eb8bd13..c9b9c75d89 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java @@ -51,11 +51,6 @@ public class JpaDeviceDao extends JpaAbstractSearchTextDao return DeviceEntity.class; } - @Override - protected String getColumnFamilyName() { - return DEVICE_COLUMN_FAMILY_NAME; - } - @Override protected CrudRepository getCrudRepository() { return deviceRepository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java index 9dd6070e1c..efe5908f43 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java @@ -66,11 +66,6 @@ public class JpaBaseEventDao extends JpaAbstractSearchTimeDao getCrudRepository() { return eventRepository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java index 44e43d5e03..b4ad114a41 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java @@ -51,11 +51,6 @@ public class JpaBasePluginDao extends JpaAbstractSearchTextDao getCrudRepository() { return pluginMetaDataRepository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java index b368b3bf9c..b5e6bf556d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java @@ -50,10 +50,6 @@ public class JpaBaseRuleDao extends JpaAbstractSearchTextDao getEntityClass() { return RuleMetaDataEntity.class; } - @Override - protected String getColumnFamilyName() { - return ModelConstants.RULE_COLUMN_FAMILY_NAME; - } @Override protected CrudRepository getCrudRepository() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java index 7373cd8140..b1e2326f41 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java @@ -40,11 +40,6 @@ public class JpaAdminSettingsDao extends JpaAbstractDao getCrudRepository() { return adminSettingsRepository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java index cbe173831d..f2feef25f5 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java @@ -47,11 +47,6 @@ public class JpaTenantDao extends JpaAbstractSearchTextDao return TenantEntity.class; } - @Override - protected String getColumnFamilyName() { - return TENANT_COLUMN_FAMILY_NAME; - } - @Override protected CrudRepository getCrudRepository() { return tenantRepository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserCredentialsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserCredentialsDao.java index fa119b679f..828909cca2 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserCredentialsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserCredentialsDao.java @@ -44,11 +44,6 @@ public class JpaUserCredentialsDao extends JpaAbstractDao getCrudRepository() { return userCredentialsRepository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java index 3008f59016..1a3c6eaf2d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java @@ -45,11 +45,6 @@ public class JpaUserDao extends JpaAbstractDao implements User return UserEntity.class; } - @Override - protected String getColumnFamilyName() { - return ModelConstants.USER_COLUMN_FAMILY_NAME; - } - @Override protected CrudRepository getCrudRepository() { return userRepository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java index 2146a8ff11..58f9346239 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java @@ -45,11 +45,6 @@ public class JpaWidgetTypeDao extends JpaAbstractDao getCrudRepository() { return widgetTypeRepository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java index 4288e5ab74..b2f0de6b1f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java @@ -47,11 +47,6 @@ public class JpaWidgetsBundleDao extends JpaAbstractSearchTextDao getCrudRepository() { return widgetsBundleRepository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/JacksonUtil.java b/dao/src/main/java/org/thingsboard/server/dao/util/JacksonUtil.java new file mode 100644 index 0000000000..5b1f5455ce --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/util/JacksonUtil.java @@ -0,0 +1,60 @@ +/** + * 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.util; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +import java.io.IOException; + +/** + * Created by Valerii Sosliuk on 5/12/2017. + */ +public class JacksonUtil { + + public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); + + public static T fromString(String string, Class clazz) { + try { + return OBJECT_MAPPER.readValue(string, clazz); + } catch (IOException e) { + throw new IllegalArgumentException("The given string value: " + + string + " cannot be transformed to Json object"); + } + } + + public static String toString(Object value) { + try { + return OBJECT_MAPPER.writeValueAsString(value); + } catch (JsonProcessingException e) { + throw new IllegalArgumentException("The given Json object value: " + + value + " cannot be transformed to a String"); + } + } + + public static JsonNode toJsonNode(String value) { + try { + return OBJECT_MAPPER.readTree(value); + } catch (IOException e) { + throw new IllegalArgumentException(e); + } + } + + public static T clone(T value) { + return fromString(toString(value), (Class) value.getClass()); + } +} \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/JsonBinarySqlTypeDescriptor.java b/dao/src/main/java/org/thingsboard/server/dao/util/JsonBinarySqlTypeDescriptor.java new file mode 100644 index 0000000000..77c768712e --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/util/JsonBinarySqlTypeDescriptor.java @@ -0,0 +1,114 @@ +/** + * 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.util; + +import com.fasterxml.jackson.databind.JsonNode; +import org.hibernate.type.descriptor.ValueBinder; +import org.hibernate.type.descriptor.ValueExtractor; +import org.hibernate.type.descriptor.WrapperOptions; +import org.hibernate.type.descriptor.java.JavaTypeDescriptor; +import org.hibernate.type.descriptor.sql.BasicBinder; +import org.hibernate.type.descriptor.sql.BasicExtractor; +import org.hibernate.type.descriptor.sql.SqlTypeDescriptor; + +import java.sql.*; + +/** + * Created by Valerii Sosliuk on 5/12/2017. + */ +public class JsonBinarySqlTypeDescriptor + implements SqlTypeDescriptor { + + public static final JsonBinarySqlTypeDescriptor INSTANCE = + new JsonBinarySqlTypeDescriptor(); + + @Override + public int getSqlType() { + return Types.OTHER; + } + + @Override + public boolean canBeRemapped() { + return true; + } + + @Override + public ValueExtractor getExtractor( + final JavaTypeDescriptor javaTypeDescriptor) { + return new BasicExtractor(javaTypeDescriptor, this) { + @Override + protected X doExtract( + ResultSet rs, + String name, + WrapperOptions options) throws SQLException { + return javaTypeDescriptor.wrap( + rs.getObject(name), options + ); + } + + @Override + protected X doExtract( + CallableStatement statement, + int index, + WrapperOptions options) throws SQLException { + return javaTypeDescriptor.wrap( + statement.getObject(index), options + ); + } + + @Override + protected X doExtract( + CallableStatement statement, + String name, + WrapperOptions options) throws SQLException { + return javaTypeDescriptor.wrap( + statement.getObject(name), options + ); + } + }; + } + + @Override + public ValueBinder getBinder( + final JavaTypeDescriptor javaTypeDescriptor) { + return new BasicBinder(javaTypeDescriptor, this) { + @Override + protected void doBind( + PreparedStatement st, + X value, + int index, + WrapperOptions options) throws SQLException { + st.setObject(index, + javaTypeDescriptor.unwrap( + value, JsonNode.class, options), getSqlType() + ); + } + + @Override + protected void doBind( + CallableStatement st, + X value, + String name, + WrapperOptions options) + throws SQLException { + st.setObject(name, + javaTypeDescriptor.unwrap( + value, JsonNode.class, options), getSqlType() + ); + } + }; + } +} \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/JsonBinaryType.java b/dao/src/main/java/org/thingsboard/server/dao/util/JsonBinaryType.java new file mode 100644 index 0000000000..96a49c9a39 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/util/JsonBinaryType.java @@ -0,0 +1,44 @@ +/** + * 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.util; + +import org.hibernate.type.AbstractSingleColumnStandardBasicType; +import org.hibernate.usertype.DynamicParameterizedType; + +import java.util.Properties; + +/** + * Created by Valerii Sosliuk on 5/12/2017. + */ +public class JsonBinaryType extends AbstractSingleColumnStandardBasicType + implements DynamicParameterizedType { + + public JsonBinaryType() { + super( + JsonBinarySqlTypeDescriptor.INSTANCE, + new JsonTypeDescriptor() + ); + } + + public String getName() { + return "jsonb"; + } + + @Override + public void setParameterValues(Properties parameters) { + ((JsonTypeDescriptor) getJavaTypeDescriptor()) + .setParameterValues(parameters); + }} \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/JsonTypeDescriptor.java b/dao/src/main/java/org/thingsboard/server/dao/util/JsonTypeDescriptor.java new file mode 100644 index 0000000000..aeca9297ad --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/util/JsonTypeDescriptor.java @@ -0,0 +1,95 @@ +/** + * 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.util; + +import org.hibernate.type.descriptor.WrapperOptions; +import org.hibernate.type.descriptor.java.AbstractTypeDescriptor; +import org.hibernate.type.descriptor.java.MutableMutabilityPlan; +import org.hibernate.usertype.DynamicParameterizedType; + +import java.util.Properties; + +/** + * Created by Valerii Sosliuk on 5/12/2017. + */ +public class JsonTypeDescriptor + extends AbstractTypeDescriptor + implements DynamicParameterizedType { + + private Class jsonObjectClass; + + @Override + public void setParameterValues(Properties parameters) { + jsonObjectClass = ( (ParameterType) parameters.get( PARAMETER_TYPE ) ) + .getReturnedClass(); + + } + + public JsonTypeDescriptor() { + super( Object.class, new MutableMutabilityPlan() { + @Override + protected Object deepCopyNotNull(Object value) { + return JacksonUtil.clone(value); + } + }); + } + + @Override + public boolean areEqual(Object one, Object another) { + if ( one == another ) { + return true; + } + if ( one == null || another == null ) { + return false; + } + return JacksonUtil.toJsonNode(JacksonUtil.toString(one)).equals( + JacksonUtil.toJsonNode(JacksonUtil.toString(another))); + } + + @Override + public String toString(Object value) { + return JacksonUtil.toString(value); + } + + @Override + public Object fromString(String string) { + return JacksonUtil.fromString(string, jsonObjectClass); + } + + @SuppressWarnings({ "unchecked" }) + @Override + public X unwrap(Object value, Class type, WrapperOptions options) { + if ( value == null ) { + return null; + } + if ( String.class.isAssignableFrom( type ) ) { + return (X) toString(value); + } + if ( Object.class.isAssignableFrom( type ) ) { + return (X) JacksonUtil.toJsonNode(toString(value)); + } + throw unknownUnwrap( type ); + } + + @Override + public Object wrap(X value, WrapperOptions options) { + if ( value == null ) { + return null; + } + return fromString(value.toString()); + } + +} \ No newline at end of file diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDaoTest.java index 31a6c58376..542f26fa16 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDaoTest.java @@ -16,7 +16,9 @@ package org.thingsboard.server.dao.sql.plugin; import com.datastax.driver.core.utils.UUIDs; +import com.github.springtestdbunit.annotation.DatabaseOperation; import com.github.springtestdbunit.annotation.DatabaseSetup; +import com.github.springtestdbunit.annotation.DatabaseTearDown; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.thingsboard.server.common.data.id.PluginId; @@ -45,7 +47,6 @@ public class JpaBasePluginDaoTest extends AbstractJpaDaoTest { UUID tenantId1 = UUIDs.timeBased(); UUID tenantId2 = UUIDs.timeBased(); createPluginsTwoTenants(tenantId1, tenantId2, "plugin_"); - assertEquals(60, pluginDao.find().size()); List rules1 = pluginDao.findByTenantIdAndPageLink( new TenantId(tenantId1), new TextPageLink(20, "plugin_")); assertEquals(20, rules1.size()); @@ -60,7 +61,7 @@ public class JpaBasePluginDaoTest extends AbstractJpaDaoTest { } @Test - @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + @DatabaseSetup(value = "classpath:dbunit/empty_dataset.xml") public void testFindAllTenantRulesByTenantId() { UUID tenantId1 = UUIDs.timeBased(); UUID tenantId2 = UUIDs.timeBased(); diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDaoTest.java index 9e2141db8e..7779652492 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDaoTest.java @@ -16,6 +16,7 @@ package org.thingsboard.server.dao.sql.rule; import com.datastax.driver.core.utils.UUIDs; +import com.fasterxml.jackson.databind.ObjectMapper; import com.github.springtestdbunit.annotation.DatabaseSetup; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -26,6 +27,7 @@ import org.thingsboard.server.common.data.rule.RuleMetaData; import org.thingsboard.server.dao.AbstractJpaDaoTest; import org.thingsboard.server.dao.rule.RuleDao; +import java.io.IOException; import java.util.List; import java.util.UUID; @@ -38,12 +40,38 @@ import static org.junit.Assert.assertNotNull; public class JpaBaseRuleDaoTest extends AbstractJpaDaoTest { @Autowired - private RuleDao jpaBaseRuleDao; + private RuleDao ruleDao; + + @Test + @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + public void testSave() throws IOException { + UUID id = UUIDs.timeBased(); + RuleMetaData ruleMetaData = new RuleMetaData(); + ruleMetaData.setId(new RuleId(id)); + ruleMetaData.setTenantId(new TenantId(UUIDs.timeBased())); + ruleMetaData.setName("test"); + String filters = "{\"filters\":\"value-1\"}"; + String processor = "{\"processor\":\"value-2\"}"; + String action = "{\"action\":\"value-3\"}"; + String additionalInfo = "{\"additionalInfo\":\"value-4\"}"; + ObjectMapper mapper = new ObjectMapper(); + ruleMetaData.setFilters(mapper.readTree(filters)); + ruleMetaData.setProcessor(mapper.readTree(processor)); + ruleMetaData.setAction(mapper.readTree(action)); + ruleMetaData.setAdditionalInfo(mapper.readTree(additionalInfo)); + ruleDao.save(ruleMetaData); + RuleMetaData savedRule = ruleDao.findById(id); + assertNotNull(savedRule); + assertEquals(filters, savedRule.getFilters().toString()); + assertEquals(processor, savedRule.getProcessor().toString()); + assertEquals(action, savedRule.getAction().toString()); + assertEquals(additionalInfo, savedRule.getAdditionalInfo().toString()); + } @Test @DatabaseSetup("classpath:dbunit/rule.xml") public void testFindRulesByPlugin() { - assertEquals(3, jpaBaseRuleDao.findRulesByPlugin("token_1").size()); + assertEquals(3, ruleDao.findRulesByPlugin("token_1").size()); } @Test @@ -52,15 +80,15 @@ public class JpaBaseRuleDaoTest extends AbstractJpaDaoTest { UUID tenantId1 = UUIDs.timeBased(); UUID tenantId2 = UUIDs.timeBased(); createRulesTwoTenants(tenantId1, tenantId2, "name_", "token"); - List rules1 = jpaBaseRuleDao.findByTenantIdAndPageLink( + List rules1 = ruleDao.findByTenantIdAndPageLink( new TenantId(tenantId1), new TextPageLink(20, "name_")); assertEquals(20, rules1.size()); - List rules2 = jpaBaseRuleDao.findByTenantIdAndPageLink(new TenantId(tenantId1), + List rules2 = ruleDao.findByTenantIdAndPageLink(new TenantId(tenantId1), new TextPageLink(20, "name_", rules1.get(19).getId().getId(), null)); assertEquals(10, rules2.size()); - List rules3 = jpaBaseRuleDao.findByTenantIdAndPageLink(new TenantId(tenantId1), + List rules3 = ruleDao.findByTenantIdAndPageLink(new TenantId(tenantId1), new TextPageLink(20, "name_", rules2.get(9).getId().getId(), null)); assertEquals(0, rules3.size()); } @@ -71,15 +99,15 @@ public class JpaBaseRuleDaoTest extends AbstractJpaDaoTest { UUID tenantId1 = UUIDs.timeBased(); UUID tenantId2 = UUIDs.timeBased(); createTenantsAndSystemRules(tenantId1, tenantId2, "name_", "token"); - List rules1 = jpaBaseRuleDao.findAllTenantRulesByTenantId( + List rules1 = ruleDao.findAllTenantRulesByTenantId( tenantId1, new TextPageLink(40, "name_")); assertEquals(40, rules1.size()); - List rules2 = jpaBaseRuleDao.findAllTenantRulesByTenantId(tenantId1, + List rules2 = ruleDao.findAllTenantRulesByTenantId(tenantId1, new TextPageLink(40, "name_", rules1.get(39).getId().getId(), null)); assertEquals(20, rules2.size()); - List rules3 = jpaBaseRuleDao.findAllTenantRulesByTenantId(tenantId1, + List rules3 = ruleDao.findAllTenantRulesByTenantId(tenantId1, new TextPageLink(40, "name_", rules2.get(19).getId().getId(), null)); assertEquals(0, rules3.size()); } @@ -105,6 +133,6 @@ public class JpaBaseRuleDaoTest extends AbstractJpaDaoTest { ruleMetaData.setTenantId(new TenantId(tenantId)); ruleMetaData.setName(namePrefix + i); ruleMetaData.setPluginToken(pluginToken); - jpaBaseRuleDao.save(ruleMetaData); + ruleDao.save(ruleMetaData); } } diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java index 9d719ba4bd..17463baf28 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java @@ -62,7 +62,6 @@ public class JpaUserDaoTest extends AbstractJpaDaoTest { assertEquals(Authority.SYS_ADMIN, user.getAuthority()); assertEquals("John", user.getFirstName()); assertEquals("Doe", user.getLastName()); - assertEquals("{\"key\":\"value-0\"}", user.getAdditionalInfo().toString()); } @Test @@ -114,7 +113,9 @@ public class JpaUserDaoTest extends AbstractJpaDaoTest { userDao.save(user); assertEquals(6, userDao.find().size()); User savedUser = userDao.findByEmail("user@thingsboard.org"); + //User savedUser = userDao.findById(UUID.fromString("cd481534-27cc-11e7-93ae-92361f002671")); assertNotNull(savedUser); + assertEquals(additionalInfo, savedUser.getAdditionalInfo().toString()); } private void create30Adminsand60Users(UUID tenantId, UUID customerId) { diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java index 7c1df06203..9733d4bb7f 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java @@ -137,12 +137,12 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest { @Test @DatabaseSetup("classpath:dbunit/empty_dataset.xml") @DatabaseTearDown(value = "classpath:dbunit/empty_dataset.xml", type= DatabaseOperation.DELETE_ALL) - public void testNonSearchTextNotFound() { + public void testSearchTextNotFound() { UUID tenantId = UUIDs.timeBased(); createWidgetBundles(5, tenantId, "ABC_"); createSystemWidgetBundles(5, "SYS_"); - TextPageLink textPageLink = new TextPageLink(30, "WB"); + TextPageLink textPageLink = new TextPageLink(30, "TEXT_NOT_FOUND"); List widgetsBundles4 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId, textPageLink); assertEquals(0, widgetsBundles4.size()); } diff --git a/dao/src/test/resources/dbunit/users.xml b/dao/src/test/resources/dbunit/users.xml index 9576b5c3be..4b704a0a2e 100644 --- a/dao/src/test/resources/dbunit/users.xml +++ b/dao/src/test/resources/dbunit/users.xml @@ -7,7 +7,6 @@ search_text="SYSADM SEARCH TEXT" first_name="John" last_name="Doe" - additional_info="{"key":"value-0"}" /> \ No newline at end of file From ed6de776e458e53b9085b554927f7f4cfd771233 Mon Sep 17 00:00:00 2001 From: mp-loki Date: Sun, 14 May 2017 20:16:01 -0400 Subject: [PATCH 24/69] removeById fixed --- .../server/dao/sql/JpaAbstractDao.java | 3 +- .../dao/sql/rule/JpaBaseRuleDaoTest.java | 30 +++++++++++++++---- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java index 8d0100d9ad..f32c9ce9b2 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java @@ -66,6 +66,7 @@ public abstract class JpaAbstractDao, D> implements Dao< } @Override + @Transactional(propagation = REQUIRES_NEW) public D findById(UUID key) { log.debug("Get entity by key {}", key); E entity = getCrudRepository().findOne(key); @@ -86,7 +87,7 @@ public abstract class JpaAbstractDao, D> implements Dao< public boolean removeById(UUID key) { getCrudRepository().delete(key); log.debug("Remove request: {}", key); - return getCrudRepository().equals(key); + return getCrudRepository().findOne(key) == null; } @Override diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDaoTest.java index 7779652492..d613faccf9 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDaoTest.java @@ -31,8 +31,7 @@ import java.io.IOException; import java.util.List; import java.util.UUID; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.*; /** * Created by Valerii Sosliuk on 4/30/2017. @@ -46,10 +45,7 @@ public class JpaBaseRuleDaoTest extends AbstractJpaDaoTest { @DatabaseSetup("classpath:dbunit/empty_dataset.xml") public void testSave() throws IOException { UUID id = UUIDs.timeBased(); - RuleMetaData ruleMetaData = new RuleMetaData(); - ruleMetaData.setId(new RuleId(id)); - ruleMetaData.setTenantId(new TenantId(UUIDs.timeBased())); - ruleMetaData.setName("test"); + RuleMetaData ruleMetaData = getRuleMetaData(id); String filters = "{\"filters\":\"value-1\"}"; String processor = "{\"processor\":\"value-2\"}"; String action = "{\"action\":\"value-3\"}"; @@ -68,6 +64,19 @@ public class JpaBaseRuleDaoTest extends AbstractJpaDaoTest { assertEquals(additionalInfo, savedRule.getAdditionalInfo().toString()); } + @Test + @DatabaseSetup("classpath:dbunit/empty_dataset.xml") + public void testDelete() throws IOException { + UUID id = UUIDs.timeBased(); + RuleMetaData ruleMetaData = getRuleMetaData(id); + ruleDao.save(ruleMetaData); + RuleMetaData savedRule = ruleDao.findById(id); + assertNotNull(savedRule); + assertTrue(ruleDao.removeById(id)); + RuleMetaData afterDelete = ruleDao.findById(id); + assertNull(afterDelete); + } + @Test @DatabaseSetup("classpath:dbunit/rule.xml") public void testFindRulesByPlugin() { @@ -135,4 +144,13 @@ public class JpaBaseRuleDaoTest extends AbstractJpaDaoTest { ruleMetaData.setPluginToken(pluginToken); ruleDao.save(ruleMetaData); } + + private RuleMetaData getRuleMetaData(UUID id) throws IOException { + RuleMetaData ruleMetaData = new RuleMetaData(); + ruleMetaData.setId(new RuleId(id)); + ruleMetaData.setTenantId(new TenantId(UUIDs.timeBased())); + ruleMetaData.setName("test"); + + return ruleMetaData; + } } From 8604afad38ca335bf0a16217876667b1bf631e82 Mon Sep 17 00:00:00 2001 From: mp-loki Date: Thu, 18 May 2017 22:49:00 -0400 Subject: [PATCH 25/69] Merge errors fixed --- .../server/actors/plugin/PluginProcessingContext.java | 2 +- .../server/controller/DashboardControllerTest.java | 3 ++- .../thingsboard/server/controller/DeviceControllerTest.java | 3 ++- .../plugin/telemetry/handlers/TelemetryRestMsgHandler.java | 5 ----- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java index 33dfa3f007..8654b3086e 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java @@ -29,7 +29,7 @@ import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.asset.Asset; -import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.id.*; import org.thingsboard.server.common.data.kv.AttributeKey; import org.thingsboard.server.common.data.kv.AttributeKvEntry; import org.thingsboard.server.common.data.kv.TsKvEntry; diff --git a/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java index 329b42d152..dda68a64ef 100644 --- a/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import com.datastax.driver.core.utils.UUIDs; import org.apache.commons.lang3.RandomStringUtils; import org.thingsboard.server.common.data.*; import org.thingsboard.server.common.data.id.CustomerId; @@ -154,7 +155,7 @@ public class DashboardControllerTest extends AbstractControllerTest { dashboard.setTitle("My dashboard"); Dashboard savedDashboard = doPost("/api/dashboard", dashboard, Dashboard.class); - doPost("/api/customer/" + UUIDs.timeBased().toString() + doPost("/api/customer/" + UUIDs.timeBased().toString() + "/dashboard/" + savedDashboard.getId().getId().toString()) .andExpect(status().isNotFound()); } diff --git a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java index 0f2fa12135..304385da91 100644 --- a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import com.datastax.driver.core.utils.UUIDs; import org.apache.commons.lang3.RandomStringUtils; import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.Device; @@ -171,7 +172,7 @@ public class DeviceControllerTest extends AbstractControllerTest { device.setName("My device"); Device savedDevice = doPost("/api/device", device, Device.class); - doPost("/api/customer/" + UUIDs.timeBased().toString() + doPost("/api/customer/" + UUIDs.timeBased().toString() + "/device/" + savedDevice.getId().getId().toString()) .andExpect(status().isNotFound()); } diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRestMsgHandler.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRestMsgHandler.java index 8864ae1f7d..5b32474b17 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRestMsgHandler.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/handlers/TelemetryRestMsgHandler.java @@ -139,11 +139,6 @@ public class TelemetryRestMsgHandler extends DefaultRestMsgHandler { } } } - if (vList == null) { - vList = new ArrayList<>(); - result.put(entry.getKey(), vList); - } - vList.add(new TsData(entry.getTs(), entry.getValueAsString())); } @Override From 60e44725c35eef691b1b9ad18fd06b4e7cfc204d Mon Sep 17 00:00:00 2001 From: mp-loki Date: Sun, 21 May 2017 23:51:29 -0400 Subject: [PATCH 26/69] JPA Alarm and Asset Dao added --- .../server/dao/alarm/AlarmDao.java | 5 - .../server/dao/alarm/BaseAlarmService.java | 4 +- ...armDaoImpl.java => CassandraAlarmDao.java} | 13 +- .../server/dao/asset/AssetDao.java | 2 +- .../server/dao/asset/AssetSearchQuery.java | 1 - .../server/dao/asset/BaseAssetService.java | 8 +- ...setDaoImpl.java => CassandraAssetDao.java} | 6 +- .../dao/customer/CustomerServiceImpl.java | 4 - .../dao/model/{ => nosql}/AlarmEntity.java | 3 +- .../dao/model/{ => nosql}/AssetEntity.java | 3 +- .../server/dao/model/sql/AlarmEntity.java | 131 ++++++++++++ .../server/dao/model/sql/AssetEntity.java | 188 ++++++++++++++++++ .../server/dao/model/sql/CustomerEntity.java | 9 +- .../server/dao/rule/BaseRuleService.java | 3 - .../server/dao/sql/JpaAbstractDao.java | 2 +- .../server/dao/sql/alarm/AlarmRepository.java | 35 ++++ .../server/dao/sql/alarm/JpaAlarmDao.java | 67 +++++++ .../server/dao/sql/asset/AssetRepository.java | 61 ++++++ .../server/dao/sql/asset/JpaAssetDao.java | 98 +++++++++ .../dao/sql/customer/CustomerRepository.java | 2 + .../dao/sql/customer/JpaCustomerDao.java | 4 +- .../server/dao/sql/alarm/JpaAlarmDaoTest.java | 86 ++++++++ .../server/dao/sql/asset/JpaAssetDaoTest.java | 173 ++++++++++++++++ .../dao/sql/customer/JpaCustomerDaoTest.java | 15 ++ .../dao/sql/event/JpaBaseEventDaoTest.java | 2 +- .../server/dao/sql/user/JpaUserDaoTest.java | 6 +- .../dbunit/{events.xml => event.xml} | 0 .../resources/dbunit/{users.xml => user.xml} | 0 28 files changed, 878 insertions(+), 53 deletions(-) rename dao/src/main/java/org/thingsboard/server/dao/alarm/{AlarmDaoImpl.java => CassandraAlarmDao.java} (83%) rename dao/src/main/java/org/thingsboard/server/dao/asset/{AssetDaoImpl.java => CassandraAssetDao.java} (93%) rename dao/src/main/java/org/thingsboard/server/dao/model/{ => nosql}/AlarmEntity.java (98%) rename dao/src/main/java/org/thingsboard/server/dao/model/{ => nosql}/AssetEntity.java (98%) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/sql/asset/JpaAssetDaoTest.java rename dao/src/test/resources/dbunit/{events.xml => event.xml} (100%) rename dao/src/test/resources/dbunit/{users.xml => user.xml} (100%) diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java index 8f32b4c987..a178c6e75f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java @@ -20,7 +20,6 @@ import org.thingsboard.server.common.data.alarm.Alarm; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.dao.Dao; -import org.thingsboard.server.dao.model.AlarmEntity; import java.util.UUID; @@ -31,8 +30,4 @@ public interface AlarmDao extends Dao { ListenableFuture findLatestByOriginatorAndType(TenantId tenantId, EntityId originator, String type); - ListenableFuture findAlarmByIdAsync(UUID key); - - Alarm save(Alarm alarm); - } 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 6d484ba07c..59ec547aa3 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 @@ -164,7 +164,7 @@ public class BaseAlarmService extends BaseEntityService implements AlarmService public ListenableFuture findAlarmById(AlarmId alarmId) { log.trace("Executing findAlarmById [{}]", alarmId); validateId(alarmId, "Incorrect alarmId " + alarmId); - return alarmDao.findAlarmByIdAsync(alarmId.getId()); + return alarmDao.findByIdAsync(alarmId.getId()); } @Override @@ -218,7 +218,7 @@ public class BaseAlarmService extends BaseEntityService implements AlarmService private ListenableFuture getAndUpdate(AlarmId alarmId, Function function) { validateId(alarmId, "Alarm id should be specified!"); - ListenableFuture entity = alarmDao.findAlarmByIdAsync(alarmId.getId()); + ListenableFuture entity = alarmDao.findByIdAsync(alarmId.getId()); return Futures.transform(entity, function); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/CassandraAlarmDao.java similarity index 83% rename from dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDaoImpl.java rename to dao/src/main/java/org/thingsboard/server/dao/alarm/CassandraAlarmDao.java index dcb01ba199..378f0ee0ac 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDaoImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/CassandraAlarmDao.java @@ -24,7 +24,7 @@ import org.thingsboard.server.common.data.alarm.Alarm; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.dao.CassandraAbstractModelDao; -import org.thingsboard.server.dao.model.AlarmEntity; +import org.thingsboard.server.dao.model.nosql.AlarmEntity; import org.thingsboard.server.dao.model.ModelConstants; import java.util.UUID; @@ -35,7 +35,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Component @Slf4j -public class AlarmDaoImpl extends CassandraAbstractModelDao implements AlarmDao { +public class CassandraAlarmDao extends CassandraAbstractModelDao implements AlarmDao { @Override protected Class getColumnFamilyClass() { @@ -65,13 +65,4 @@ public class AlarmDaoImpl extends CassandraAbstractModelDao query.orderBy(QueryBuilder.asc(ModelConstants.ALARM_TYPE_PROPERTY), QueryBuilder.desc(ModelConstants.ID_PROPERTY)); return findOneByStatementAsync(query); } - - @Override - public ListenableFuture findAlarmByIdAsync(UUID 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/AssetDao.java b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetDao.java index 220cbcb1ec..b002a986c1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetDao.java @@ -74,7 +74,7 @@ public interface AssetDao extends Dao { * @param assetIds the asset Ids * @return the list of asset objects */ - ListenableFuture> findAssetsByTenantIdCustomerIdAndIdsAsync(UUID tenantId, UUID customerId, List assetIds); + ListenableFuture> findAssetsByTenantIdAndCustomerIdAndIdsAsync(UUID tenantId, UUID customerId, List assetIds); /** * Find assets by tenantId and asset name. diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetSearchQuery.java b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetSearchQuery.java index f3c69b23bc..440f0d2d22 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetSearchQuery.java +++ b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetSearchQuery.java @@ -23,7 +23,6 @@ import org.thingsboard.server.dao.relation.EntityRelationsQuery; import org.thingsboard.server.dao.relation.EntityTypeFilter; import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.Collections; import java.util.List; 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 addf17bd39..c664e623a4 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 @@ -38,10 +38,6 @@ import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.dao.customer.CustomerDao; import org.thingsboard.server.dao.entity.BaseEntityService; import org.thingsboard.server.dao.exception.DataValidationException; -import org.thingsboard.server.dao.model.AssetEntity; -import org.thingsboard.server.dao.model.nosql.CustomerEntity; -import org.thingsboard.server.dao.model.nosql.TenantEntity; -import org.thingsboard.server.dao.relation.EntityRelationsQuery; import org.thingsboard.server.dao.relation.EntitySearchDirection; import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.PaginatedRemover; @@ -156,11 +152,11 @@ public class BaseAssetService extends BaseEntityService implements AssetService @Override public ListenableFuture> findAssetsByTenantIdCustomerIdAndIdsAsync(TenantId tenantId, CustomerId customerId, List assetIds) { - log.trace("Executing findAssetsByTenantIdCustomerIdAndIdsAsync, tenantId [{}], customerId [{}], assetIds [{}]", tenantId, customerId, assetIds); + log.trace("Executing findAssetsByTenantIdAndCustomerIdAndIdsAsync, tenantId [{}], customerId [{}], assetIds [{}]", tenantId, customerId, assetIds); validateId(tenantId, "Incorrect tenantId " + tenantId); validateId(customerId, "Incorrect customerId " + customerId); validateIds(assetIds, "Incorrect assetIds " + assetIds); - return assetDao.findAssetsByTenantIdCustomerIdAndIdsAsync(tenantId.getId(), customerId.getId(), toUUIDs(assetIds)); + return assetDao.findAssetsByTenantIdAndCustomerIdAndIdsAsync(tenantId.getId(), customerId.getId(), toUUIDs(assetIds)); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/asset/CassandraAssetDao.java similarity index 93% rename from dao/src/main/java/org/thingsboard/server/dao/asset/AssetDaoImpl.java rename to dao/src/main/java/org/thingsboard/server/dao/asset/CassandraAssetDao.java index 2f2cf13665..6dca69f291 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetDaoImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/asset/CassandraAssetDao.java @@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.asset.Asset; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.dao.CassandraAbstractSearchTextDao; import org.thingsboard.server.dao.DaoUtil; -import org.thingsboard.server.dao.model.AssetEntity; +import org.thingsboard.server.dao.model.nosql.AssetEntity; import java.util.*; @@ -32,7 +32,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Component @Slf4j -public class AssetDaoImpl extends CassandraAbstractSearchTextDao implements AssetDao { +public class CassandraAssetDao extends CassandraAbstractSearchTextDao implements AssetDao { @Override protected Class getColumnFamilyClass() { @@ -83,7 +83,7 @@ public class AssetDaoImpl extends CassandraAbstractSearchTextDao> findAssetsByTenantIdCustomerIdAndIdsAsync(UUID tenantId, UUID customerId, List assetIds) { + public ListenableFuture> findAssetsByTenantIdAndCustomerIdAndIdsAsync(UUID tenantId, UUID customerId, List assetIds) { log.debug("Try to find assets by tenantId [{}], customerId [{}] and asset Ids [{}]", tenantId, customerId, assetIds); Select select = select().from(getColumnFamilyName()); Select.Where query = select.where(); diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java index ba5c9a9e79..7fa4211e03 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java @@ -21,8 +21,6 @@ import java.util.List; import java.util.Optional; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -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.apache.commons.lang3.StringUtils; @@ -30,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.Tenant; -import org.thingsboard.server.common.data.asset.Asset; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.TextPageData; @@ -40,7 +37,6 @@ import org.thingsboard.server.dao.device.DeviceService; import org.thingsboard.server.dao.entity.BaseEntityService; import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.exception.IncorrectParameterException; -import org.thingsboard.server.dao.model.AssetEntity; import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.PaginatedRemover; import org.thingsboard.server.dao.service.Validator; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/AlarmEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/AlarmEntity.java similarity index 98% rename from dao/src/main/java/org/thingsboard/server/dao/model/AlarmEntity.java rename to dao/src/main/java/org/thingsboard/server/dao/model/nosql/AlarmEntity.java index 62cd08a218..078699d8f8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/AlarmEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/AlarmEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.model; +package org.thingsboard.server.dao.model.nosql; import com.datastax.driver.core.utils.UUIDs; import com.datastax.driver.mapping.annotations.*; @@ -25,6 +25,7 @@ import org.thingsboard.server.common.data.alarm.AlarmSeverity; import org.thingsboard.server.common.data.alarm.AlarmStatus; 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.type.AlarmSeverityCodec; import org.thingsboard.server.dao.model.type.AlarmStatusCodec; import org.thingsboard.server.dao.model.type.EntityTypeCodec; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/AssetEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/AssetEntity.java similarity index 98% rename from dao/src/main/java/org/thingsboard/server/dao/model/AssetEntity.java rename to dao/src/main/java/org/thingsboard/server/dao/model/nosql/AssetEntity.java index 0444d11af9..a6cc617d29 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/AssetEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/AssetEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.model; +package org.thingsboard.server.dao.model.nosql; import com.datastax.driver.core.utils.UUIDs; import com.datastax.driver.mapping.annotations.Column; @@ -25,6 +25,7 @@ import org.thingsboard.server.common.data.asset.Asset; import org.thingsboard.server.common.data.id.AssetId; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.dao.model.SearchTextEntity; import org.thingsboard.server.dao.model.type.JsonCodec; import java.util.UUID; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java new file mode 100644 index 0000000000..6806d6be29 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java @@ -0,0 +1,131 @@ +/** + * 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.model.sql; + +import com.datastax.driver.core.utils.UUIDs; +import com.fasterxml.jackson.databind.JsonNode; +import lombok.Data; +import org.hibernate.annotations.Type; +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.AlarmSeverity; +import org.thingsboard.server.common.data.alarm.AlarmStatus; +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 javax.persistence.*; +import java.util.UUID; + +import static org.thingsboard.server.dao.model.ModelConstants.*; + +@Data +@Entity +@Table(name = ALARM_COLUMN_FAMILY_NAME) +public final class AlarmEntity implements BaseEntity { + + @Transient + private static final long serialVersionUID = -339979717281685984L; + + @Id + @Column(name = ID_PROPERTY) + private UUID id; + + @Column(name = ALARM_TENANT_ID_PROPERTY) + private UUID tenantId; + + @Column(name = ALARM_ORIGINATOR_ID_PROPERTY) + private UUID originatorId; + + @Column(name = ALARM_ORIGINATOR_TYPE_PROPERTY) + private EntityType originatorType; + + @Column(name = ALARM_TYPE_PROPERTY) + private String type; + + @Column(name = ALARM_SEVERITY_PROPERTY) + private AlarmSeverity severity; + + @Column(name = ALARM_STATUS_PROPERTY) + private AlarmStatus status; + + @Column(name = ALARM_START_TS_PROPERTY) + private Long startTs; + + @Column(name = ALARM_END_TS_PROPERTY) + private Long endTs; + + @Column(name = ALARM_ACK_TS_PROPERTY) + private Long ackTs; + + @Column(name = ALARM_CLEAR_TS_PROPERTY) + private Long clearTs; + + @Type(type = "jsonb") + @Column(name = ModelConstants.ASSET_ADDITIONAL_INFO_PROPERTY, columnDefinition = "jsonb") + private JsonNode details; + + @Column(name = ALARM_PROPAGATE_PROPERTY) + private Boolean propagate; + + public AlarmEntity() { + super(); + } + + public AlarmEntity(Alarm alarm) { + if (alarm.getId() != null) { + this.id = alarm.getId().getId(); + } + if (alarm.getTenantId() != null) { + this.tenantId = alarm.getTenantId().getId(); + } + this.type = alarm.getType(); + this.originatorId = alarm.getOriginator().getId(); + this.originatorType = alarm.getOriginator().getEntityType(); + this.type = alarm.getType(); + this.severity = alarm.getSeverity(); + this.status = alarm.getStatus(); + this.propagate = alarm.isPropagate(); + this.startTs = alarm.getStartTs(); + this.endTs = alarm.getEndTs(); + this.ackTs = alarm.getAckTs(); + this.clearTs = alarm.getClearTs(); + this.details = alarm.getDetails(); + } + + @Override + public Alarm toData() { + Alarm alarm = new Alarm(new AlarmId(id)); + alarm.setCreatedTime(UUIDs.unixTimestamp(id)); + if (tenantId != null) { + alarm.setTenantId(new TenantId(tenantId)); + } + alarm.setOriginator(EntityIdFactory.getByTypeAndUuid(originatorType, originatorId)); + alarm.setType(type); + alarm.setSeverity(severity); + alarm.setStatus(status); + alarm.setPropagate(propagate); + alarm.setStartTs(startTs); + alarm.setEndTs(endTs); + alarm.setAckTs(ackTs); + alarm.setClearTs(clearTs); + alarm.setDetails(details); + return alarm; + } + +} \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java new file mode 100644 index 0000000000..dd7362278e --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java @@ -0,0 +1,188 @@ +/** + * 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.model.sql; + +import com.datastax.driver.core.utils.UUIDs; +import com.fasterxml.jackson.databind.JsonNode; +import lombok.Data; +import org.hibernate.annotations.Type; +import org.thingsboard.server.common.data.asset.Asset; +import org.thingsboard.server.common.data.id.AssetId; +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 javax.persistence.*; +import java.util.UUID; + +import static org.thingsboard.server.dao.model.ModelConstants.*; + +@Data +@Entity +@Table(name = ASSET_COLUMN_FAMILY_NAME) +public final class AssetEntity implements SearchTextEntity { + + @Transient + private static final long serialVersionUID = -4089175869616037592L; + + @Id + @Column(name = ID_PROPERTY) + private UUID id; + + @Column(name = ASSET_TENANT_ID_PROPERTY) + private UUID tenantId; + + @Column(name = ASSET_CUSTOMER_ID_PROPERTY) + private UUID customerId; + + @Column(name = ASSET_NAME_PROPERTY) + private String name; + + @Column(name = ASSET_TYPE_PROPERTY) + private String type; + + @Column(name = SEARCH_TEXT_PROPERTY) + private String searchText; + + @Type(type = "jsonb") + @Column(name = ModelConstants.ASSET_ADDITIONAL_INFO_PROPERTY, columnDefinition = "jsonb") + private JsonNode additionalInfo; + + public AssetEntity() { + super(); + } + + public AssetEntity(Asset asset) { + if (asset.getId() != null) { + this.id = asset.getId().getId(); + } + if (asset.getTenantId() != null) { + this.tenantId = asset.getTenantId().getId(); + } + if (asset.getCustomerId() != null) { + this.customerId = asset.getCustomerId().getId(); + } + this.name = asset.getName(); + this.type = asset.getType(); + this.additionalInfo = asset.getAdditionalInfo(); + } + + @Override + public String getSearchTextSource() { + return name; + } + + @Override + public void setSearchText(String searchText) { + this.searchText = searchText; + } + + public String getSearchText() { + return searchText; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((additionalInfo == null) ? 0 : additionalInfo.hashCode()); + result = prime * result + ((customerId == null) ? 0 : customerId.hashCode()); + result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((type == null) ? 0 : type.hashCode()); + result = prime * result + ((tenantId == null) ? 0 : tenantId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + AssetEntity other = (AssetEntity) obj; + if (additionalInfo == null) { + if (other.additionalInfo != null) + return false; + } else if (!additionalInfo.equals(other.additionalInfo)) + return false; + if (customerId == null) { + if (other.customerId != null) + return false; + } else if (!customerId.equals(other.customerId)) + return false; + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) + return false; + if (name == null) { + if (other.name != null) + return false; + } else if (!name.equals(other.name)) + return false; + if (type == null) { + if (other.type != null) + return false; + } else if (!type.equals(other.type)) + return false; + if (tenantId == null) { + if (other.tenantId != null) + return false; + } else if (!tenantId.equals(other.tenantId)) + return false; + return true; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("AssetEntity [id="); + builder.append(id); + builder.append(", tenantId="); + builder.append(tenantId); + builder.append(", customerId="); + builder.append(customerId); + builder.append(", name="); + builder.append(name); + builder.append(", type="); + builder.append(type); + builder.append(", additionalInfo="); + builder.append(additionalInfo); + builder.append("]"); + return builder.toString(); + } + + @Override + public Asset toData() { + Asset asset = new Asset(new AssetId(id)); + asset.setCreatedTime(UUIDs.unixTimestamp(id)); + if (tenantId != null) { + asset.setTenantId(new TenantId(tenantId)); + } + if (customerId != null) { + asset.setCustomerId(new CustomerId(customerId)); + } + asset.setName(name); + asset.setType(type); + asset.setAdditionalInfo(additionalInfo); + return asset; + } + +} \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java index 8105118833..b74aa62eb4 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java @@ -16,15 +16,8 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; -import lombok.extern.slf4j.Slf4j; import org.hibernate.annotations.Type; import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.id.CustomerId; @@ -32,7 +25,7 @@ import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.SearchTextEntity; -import java.io.IOException; +import javax.persistence.*; import java.util.UUID; @Data diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleService.java index 1bc0d92285..f7c4f6a8a7 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleService.java @@ -17,13 +17,11 @@ package org.thingsboard.server.dao.rule; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; -import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.thingsboard.server.common.data.asset.Asset; import org.thingsboard.server.common.data.id.RuleId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.TextPageData; @@ -38,7 +36,6 @@ import org.thingsboard.server.dao.entity.BaseEntityService; import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.exception.DatabaseException; import org.thingsboard.server.dao.exception.IncorrectParameterException; -import org.thingsboard.server.dao.model.AssetEntity; import org.thingsboard.server.dao.plugin.PluginService; import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.PaginatedRemover; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java index f32c9ce9b2..7073b491ac 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java @@ -76,7 +76,7 @@ public abstract class JpaAbstractDao, D> implements Dao< @Override public ListenableFuture findByIdAsync(UUID key) { log.debug("Get entity by key async {}", key); - // Should it be a field? + // Should ListeningExecutorService be a field? ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); ListenableFuture listenableFuture = service.submit(() -> DaoUtil.getData(getCrudRepository().findOne(key))); return listenableFuture; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java new file mode 100644 index 0000000000..f14a08f7eb --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java @@ -0,0 +1,35 @@ +/** + * 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.sql.alarm; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; +import org.thingsboard.server.common.data.alarm.Alarm; +import org.thingsboard.server.dao.model.sql.AlarmEntity; + +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 5/21/2017. + */ +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public interface AlarmRepository extends CrudRepository { + + @Query(nativeQuery = true, value = "SELECT * FROM ALARM WHERE TENANT_ID = ?1 AND ORIGINATOR_ID = ?2 " + + "AND ?3 = ?3 AND TYPE = ?4 ORDER BY ID DESC LIMIT 1") + AlarmEntity findLatestByOriginatorAndType(UUID tenantId, UUID originatorId, int entityType, String alarmType); +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java new file mode 100644 index 0000000000..f5d69cd3fd --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java @@ -0,0 +1,67 @@ +/** + * 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.sql.alarm; + +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; +import org.thingsboard.server.common.data.alarm.Alarm; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.dao.DaoUtil; +import org.thingsboard.server.dao.alarm.AlarmDao; +import org.thingsboard.server.dao.model.sql.AlarmEntity; +import org.thingsboard.server.dao.sql.JpaAbstractDao; + +import java.util.concurrent.Executors; + +import static org.springframework.transaction.annotation.Propagation.REQUIRES_NEW; + +/** + * Created by Valerii Sosliuk on 5/19/2017. + */ +@Component +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public class JpaAlarmDao extends JpaAbstractDao implements AlarmDao { + + @Autowired + private AlarmRepository alarmRepository; + + @Override + protected Class getEntityClass() { + return AlarmEntity.class; + } + + @Override + protected CrudRepository getCrudRepository() { + return alarmRepository; + } + + @Override + @Transactional(propagation = REQUIRES_NEW) + public ListenableFuture findLatestByOriginatorAndType(TenantId tenantId, EntityId originator, String type) { + ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); + ListenableFuture listenableFuture = service.submit(() -> DaoUtil.getData( + alarmRepository.findLatestByOriginatorAndType(tenantId.getId(), originator.getId(), + originator.getEntityType().ordinal(), type))); + return listenableFuture; + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java new file mode 100644 index 0000000000..cf38c02988 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java @@ -0,0 +1,61 @@ +/** + * 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.sql.asset; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; +import org.thingsboard.server.common.data.asset.Asset; +import org.thingsboard.server.dao.model.sql.AssetEntity; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +/** + * Created by Valerii Sosliuk on 5/21/2017. + */ +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public interface AssetRepository extends CrudRepository { +// + @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = ?2 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "ORDER BY ID LIMIT ?1") + List findByTenantIdFirstPage(int limit, UUID tenantId, String textSearch); + + @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = ?2 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + + "AND ID > ?4 ORDER BY ID LIMIT ?1") + List findByTenantIdNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); + + @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = ?2 " + + "AND CUSTOMER_ID = ?3 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?4, '%')) " + + "ORDER BY ID LIMIT ?1") + List findByTenantIdAndCustomerIdFirstPage(int limit, UUID tenantId, UUID customerId, String textSearch); + + @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = ?2 " + + "AND CUSTOMER_ID = ?3 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?4, '%')) " + + "AND ID > ?5 ORDER BY ID LIMIT ?1") + List findByTenantIdAndCustomerIdNextPage(int limit, UUID tenantId, UUID customerId, String textSearch, UUID idOffset); + + List findByTenantIdAndIdIn(UUID tenantId, List assetIds); + + List findByTenantIdAndCustomerIdAndIdIn(UUID tenantId, UUID customerId, List assetIds); + + AssetEntity findByTenantIdAndName(UUID tenantId, String name); +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java new file mode 100644 index 0000000000..2d301c2139 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java @@ -0,0 +1,98 @@ +/** + * 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.sql.asset; + +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Component; +import org.thingsboard.server.common.data.asset.Asset; +import org.thingsboard.server.common.data.page.TextPageLink; +import org.thingsboard.server.dao.DaoUtil; +import org.thingsboard.server.dao.asset.AssetDao; +import org.thingsboard.server.dao.model.sql.AssetEntity; +import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; +import java.util.concurrent.Executors; + +/** + * Created by Valerii Sosliuk on 5/19/2017. + */ +@Component +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public class JpaAssetDao extends JpaAbstractSearchTextDao implements AssetDao { + + @Autowired + private AssetRepository assetRepository; + + @Override + protected Class getEntityClass() { + return AssetEntity.class; + } + + @Override + protected CrudRepository getCrudRepository() { + return assetRepository; + } + + @Override + public List findAssetsByTenantId(UUID tenantId, TextPageLink pageLink) { + if (pageLink.getIdOffset() == null) { + return DaoUtil.convertDataList(assetRepository.findByTenantIdFirstPage(pageLink.getLimit(), tenantId, + pageLink.getTextSearch())); + } else { + return DaoUtil.convertDataList(assetRepository.findByTenantIdNextPage(pageLink.getLimit(), tenantId, + pageLink.getTextSearch(), pageLink.getIdOffset())); + } + } + + @Override + public ListenableFuture> findAssetsByTenantIdAndIdsAsync(UUID tenantId, List assetIds) { + ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); + return service.submit(() -> + DaoUtil.convertDataList(assetRepository.findByTenantIdAndIdIn(tenantId, assetIds))); + } + + @Override + public List findAssetsByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink) { + if (pageLink.getIdOffset() == null) { + return DaoUtil.convertDataList(assetRepository.findByTenantIdAndCustomerIdFirstPage(pageLink.getLimit(), tenantId, + customerId, pageLink.getTextSearch())); + } else { + return DaoUtil.convertDataList(assetRepository.findByTenantIdAndCustomerIdNextPage(pageLink.getLimit(), tenantId, + customerId, pageLink.getTextSearch(), pageLink.getIdOffset())); + } + } + + @Override + public ListenableFuture> findAssetsByTenantIdAndCustomerIdAndIdsAsync(UUID tenantId, UUID customerId, List assetIds) { + ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); + return service.submit(() -> + DaoUtil.convertDataList( assetRepository.findByTenantIdAndCustomerIdAndIdIn(tenantId, customerId, assetIds))); + } + + @Override + public Optional findAssetsByTenantIdAndName(UUID tenantId, String name) { + Asset asset = DaoUtil.getData(assetRepository.findByTenantIdAndName(tenantId, name)); + return Optional.ofNullable(asset); + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java index b26be064f6..83e2dba9be 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java @@ -40,4 +40,6 @@ public interface CustomerRepository extends CrudRepository "AND ID > ?4 ORDER BY ID LIMIT ?1") List findByTenantIdNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); + CustomerEntity findByTenantIdAndTitle(UUID tenantId, String title); + } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java index 9b6c4d1341..41fd310176 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java @@ -63,7 +63,7 @@ public class JpaCustomerDao extends JpaAbstractSearchTextDao findCustomersByTenantIdAndTitle(UUID tenantId, String title) { - // TODO: vsosliuk implement - return null; + Customer customer = DaoUtil.getData(customerRepository.findByTenantIdAndTitle(tenantId, title)); + return Optional.ofNullable(customer); } } diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java new file mode 100644 index 0000000000..94b6f51c33 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java @@ -0,0 +1,86 @@ +/** + * 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.sql.alarm; + +import com.datastax.driver.core.utils.UUIDs; +import com.github.springtestdbunit.annotation.DatabaseSetup; +import com.google.common.util.concurrent.ListenableFuture; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +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; +import org.thingsboard.server.common.data.id.DeviceId; +import org.thingsboard.server.common.data.id.EntityId; +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; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +/** + * Created by Valerii Sosliuk on 5/21/2017. + */ +public class JpaAlarmDaoTest extends AbstractJpaDaoTest { + + @Autowired + private AlarmDao alarmDao; + + @Autowired + private AlarmRepository alarmRepository; + + @Test + public void testFindLatestByOriginatorAndType() throws ExecutionException, InterruptedException { + System.out.println(System.currentTimeMillis()); + UUID tenantId = UUID.fromString("d4b68f40-3e96-11e7-a884-898080180d6b"); + UUID originator1Id = UUID.fromString("d4b68f41-3e96-11e7-a884-898080180d6b"); + UUID originator2Id = UUID.fromString("d4b68f42-3e96-11e7-a884-898080180d6b"); + UUID alarm1Id = UUID.fromString("d4b68f43-3e96-11e7-a884-898080180d6b"); + UUID alarm2Id = UUID.fromString("d4b68f44-3e96-11e7-a884-898080180d6b"); + UUID alarm3Id = UUID.fromString("d4b68f45-3e96-11e7-a884-898080180d6b"); + saveAlarm(alarm1Id, tenantId, originator1Id, "TEST_ALARM"); + 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.ordinal(), "TEST_ALARM"); + assertNotNull(alarmEntity); + ListenableFuture future = alarmDao + .findLatestByOriginatorAndType(new TenantId(tenantId), new DeviceId(originator1Id), "TEST_ALARM"); + Alarm alarm = future.get(); + assertNotNull(alarm); + assertEquals(alarm2Id, alarm.getId().getId()); + } + + private void saveAlarm(UUID id, UUID tenantId, UUID deviceId, String type) { + Alarm alarm = new Alarm(); + alarm.setId(new AlarmId(id)); + alarm.setTenantId(new TenantId(tenantId)); + alarm.setOriginator(new DeviceId(deviceId)); + alarm.setType(type); + alarm.setPropagate(true); + alarm.setStartTs(System.currentTimeMillis()); + alarm.setEndTs(System.currentTimeMillis()); + alarm.setStatus(AlarmStatus.ACTIVE_UNACK); + alarmDao.save(alarm); + } +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/asset/JpaAssetDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/asset/JpaAssetDaoTest.java new file mode 100644 index 0000000000..ebee17e4bc --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/asset/JpaAssetDaoTest.java @@ -0,0 +1,173 @@ +/** + * 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.sql.asset; + +import com.datastax.driver.core.utils.UUIDs; +import com.google.common.util.concurrent.ListenableFuture; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.thingsboard.server.common.data.asset.Asset; +import org.thingsboard.server.common.data.id.AssetId; +import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.common.data.page.TextPageLink; +import org.thingsboard.server.dao.AbstractJpaDaoTest; +import org.thingsboard.server.dao.asset.AssetDao; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.UUID; +import java.util.concurrent.ExecutionException; + +import static junit.framework.TestCase.assertFalse; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +/** + * Created by Valerii Sosliuk on 5/21/2017. + */ +public class JpaAssetDaoTest extends AbstractJpaDaoTest { + + @Autowired + private AssetDao assetDao; + + @Test + public void testFindAssetsByTenantId() { + UUID tenantId1 = UUIDs.timeBased(); + UUID tenantId2 = UUIDs.timeBased(); + UUID customerId1 = UUIDs.timeBased(); + UUID customerId2 = UUIDs.timeBased(); + for (int i = 0; i < 60; i++) { + UUID assetId = UUIDs.timeBased(); + UUID tenantId = i % 2 == 0 ? tenantId1 : tenantId2; + UUID customerId = i % 2 == 0 ? customerId1 : customerId2; + saveAsset(assetId, tenantId, customerId, "ASSET_" + i); + } + assertEquals(60, assetDao.find().size()); + + TextPageLink pageLink1 = new TextPageLink(20, "ASSET_"); + List assets1 = assetDao.findAssetsByTenantId(tenantId1, pageLink1); + assertEquals(20, assets1.size()); + + TextPageLink pageLink2 = new TextPageLink(20, "ASSET_", assets1.get(19).getId().getId(), null); + List assets2 = assetDao.findAssetsByTenantId(tenantId1, pageLink2); + assertEquals(10, assets2.size()); + + TextPageLink pageLink3 = new TextPageLink(20, "ASSET_", assets2.get(9).getId().getId(), null); + List assets3 = assetDao.findAssetsByTenantId(tenantId1, pageLink3); + assertEquals(0, assets3.size()); + } + + @Test + public void testFindAssetsByTenantIdAndCustomerId() { + UUID tenantId1 = UUIDs.timeBased(); + UUID tenantId2 = UUIDs.timeBased(); + UUID customerId1 = UUIDs.timeBased(); + UUID customerId2 = UUIDs.timeBased(); + for (int i = 0; i < 60; i++) { + UUID assetId = UUIDs.timeBased(); + UUID tenantId = i % 2 == 0 ? tenantId1 : tenantId2; + UUID customerId = i % 2 == 0 ? customerId1 : customerId2; + saveAsset(assetId, tenantId, customerId, "ASSET_" + i); + } + + TextPageLink pageLink1 = new TextPageLink(20, "ASSET_"); + List assets1 = assetDao.findAssetsByTenantIdAndCustomerId(tenantId1, customerId1, pageLink1); + assertEquals(20, assets1.size()); + + TextPageLink pageLink2 = new TextPageLink(20, "ASSET_", assets1.get(19).getId().getId(), null); + List assets2 = assetDao.findAssetsByTenantIdAndCustomerId(tenantId1, customerId1, pageLink2); + assertEquals(10, assets2.size()); + + TextPageLink pageLink3 = new TextPageLink(20, "ASSET_", assets2.get(9).getId().getId(), null); + List assets3 = assetDao.findAssetsByTenantIdAndCustomerId(tenantId1, customerId1, pageLink3); + assertEquals(0, assets3.size()); + } + + @Test + public void testFindAssetsByTenantIdAndIdsAsync() throws ExecutionException, InterruptedException { + UUID tenantId = UUIDs.timeBased(); + UUID customerId = UUIDs.timeBased(); + List searchIds = new ArrayList<>(); + for (int i = 0; i < 30; i++) { + UUID assetId = UUIDs.timeBased(); + saveAsset(assetId, tenantId, customerId, "ASSET_" + i); + if (i % 3 == 0) { + searchIds.add(assetId); + } + } + + ListenableFuture> assetsFuture = assetDao + .findAssetsByTenantIdAndIdsAsync(tenantId, searchIds); + List assets = assetsFuture.get(); + assertNotNull(assets); + assertEquals(10, assets.size()); + } + + @Test + public void testFindAssetsByTenantIdCustomerIdAndIdsAsync() throws ExecutionException, InterruptedException { + UUID tenantId = UUIDs.timeBased(); + UUID customerId1 = UUIDs.timeBased(); + UUID customerId2 = UUIDs.timeBased(); + List searchIds = new ArrayList<>(); + for (int i = 0; i < 30; i++) { + UUID assetId = UUIDs.timeBased(); + UUID customerId = i%2 == 0 ? customerId1 : customerId2; + saveAsset(assetId, tenantId, customerId, "ASSET_" + i); + if (i % 3 == 0) { + searchIds.add(assetId); + } + } + + ListenableFuture> assetsFuture = assetDao + .findAssetsByTenantIdAndCustomerIdAndIdsAsync(tenantId, customerId1, searchIds); + List assets = assetsFuture.get(); + assertNotNull(assets); + assertEquals(5, assets.size()); + } + + @Test + public void testFindAssetsByTenantIdAndName() { + UUID assetId1 = UUIDs.timeBased(); + UUID assetId2 = UUIDs.timeBased(); + UUID tenantId1 = UUIDs.timeBased(); + UUID tenantId2 = UUIDs.timeBased(); + UUID customerId1 = UUIDs.timeBased(); + UUID customerId2 = UUIDs.timeBased(); + String name = "TEST_ASSET"; + saveAsset(assetId1, tenantId1, customerId1, name); + saveAsset(assetId2, tenantId2, customerId2, name); + + Optional assetOpt1 = assetDao.findAssetsByTenantIdAndName(tenantId2, name); + assertTrue("Optional expected to be non-empty", assetOpt1.isPresent()); + assertEquals(assetId2, assetOpt1.get().getId().getId()); + + Optional assetOpt2 = assetDao.findAssetsByTenantIdAndName(tenantId2, "NON_EXISTENT_NAME"); + assertFalse("Optional expected to be empty", assetOpt2.isPresent()); + } + + private void saveAsset(UUID id, UUID tenantId, UUID customerId, String name) { + Asset asset = new Asset(); + asset.setId(new AssetId(id)); + asset.setTenantId(new TenantId(tenantId)); + asset.setCustomerId(new CustomerId(customerId)); + asset.setName(name); + + assetDao.save(asset); + } +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDaoTest.java index 5ee112abf3..82ceeb8c5f 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDaoTest.java @@ -26,9 +26,11 @@ import org.thingsboard.server.dao.AbstractJpaDaoTest; import org.thingsboard.server.dao.customer.CustomerDao; import java.util.List; +import java.util.Optional; import java.util.UUID; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * Created by Valerii Sosliuk on 5/6/2017. @@ -57,6 +59,19 @@ public class JpaCustomerDaoTest extends AbstractJpaDaoTest { assertEquals(5, customers2.size()); } + @Test + public void testFindCustomersByTenantIdAndTitle() { + UUID tenantId = UUIDs.timeBased(); + + for (int i = 0; i < 10; i++) { + createCustomer(tenantId, i); + } + + Optional customerOpt = customerDao.findCustomersByTenantIdAndTitle(tenantId, "CUSTOMER_5"); + assertTrue(customerOpt.isPresent()); + assertEquals("CUSTOMER_5", customerOpt.get().getTitle()); + } + private void createCustomer(UUID tenantId, int index) { Customer customer = new Customer(); customer.setId(new CustomerId(UUIDs.timeBased())); diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java index af03ac57da..b0af98013c 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java @@ -64,7 +64,7 @@ public class JpaBaseEventDaoTest extends AbstractJpaDaoTest { } @Test - @DatabaseSetup("classpath:dbunit/events.xml") + @DatabaseSetup("classpath:dbunit/event.xml") public void findEvent() { UUID tenantId = UUID.fromString("be41c7a0-31f5-11e7-9cfd-2786e6aa2046"); UUID entityId = UUID.fromString("be41c7a1-31f5-11e7-9cfd-2786e6aa2046"); diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java index 17463baf28..9ec8a6800f 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java @@ -45,14 +45,14 @@ public class JpaUserDaoTest extends AbstractJpaDaoTest { private UserDao userDao; @Test - @DatabaseSetup("classpath:dbunit/users.xml") + @DatabaseSetup("classpath:dbunit/user.xml") public void testFindAll() { List users = userDao.find(); assertEquals(users.size(), 5); } @Test - @DatabaseSetup("classpath:dbunit/users.xml") + @DatabaseSetup("classpath:dbunit/user.xml") public void testFindByEmail() { User user = userDao.findByEmail("sysadm@thingsboard.org"); assertNotNull("User is expected to be not null", user); @@ -97,7 +97,7 @@ public class JpaUserDaoTest extends AbstractJpaDaoTest { } @Test - @DatabaseSetup("classpath:dbunit/users.xml") + @DatabaseSetup("classpath:dbunit/user.xml") public void testSave() throws IOException { User user = new User(); user.setId(new UserId(UUID.fromString("cd481534-27cc-11e7-93ae-92361f002671"))); diff --git a/dao/src/test/resources/dbunit/events.xml b/dao/src/test/resources/dbunit/event.xml similarity index 100% rename from dao/src/test/resources/dbunit/events.xml rename to dao/src/test/resources/dbunit/event.xml diff --git a/dao/src/test/resources/dbunit/users.xml b/dao/src/test/resources/dbunit/user.xml similarity index 100% rename from dao/src/test/resources/dbunit/users.xml rename to dao/src/test/resources/dbunit/user.xml From e37e4369783b78b9efa596a4487a124bba50b254 Mon Sep 17 00:00:00 2001 From: mp-loki Date: Thu, 25 May 2017 22:13:03 -0400 Subject: [PATCH 27/69] Enum persistence changed to string --- .../server/dao/model/sql/AlarmEntity.java | 2 ++ .../model/sql/ComponentDescriptorEntity.java | 9 ++++----- .../dao/model/sql/DeviceCredentialsEntity.java | 10 ++++------ .../server/dao/model/sql/EventEntity.java | 9 ++++----- .../dao/model/sql/PluginMetaDataEntity.java | 9 ++++----- .../dao/model/sql/RuleMetaDataEntity.java | 17 ++++++++++++----- .../server/dao/model/sql/UserEntity.java | 1 + .../ComponentDescriptorRepository.java | 8 ++++---- .../JpaBaseComponentDescriptorDao.java | 8 ++++---- .../server/dao/sql/user/UserRepository.java | 8 ++++---- .../server/dao/sql/user/JpaUserDaoTest.java | 1 - .../resources/dbunit/device_credentials.xml | 4 ++-- dao/src/test/resources/dbunit/event.xml | 4 ++-- dao/src/test/resources/dbunit/user.xml | 14 +++++++------- 14 files changed, 54 insertions(+), 50 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java index 6806d6be29..d807c59dbe 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java @@ -58,9 +58,11 @@ public final class AlarmEntity implements BaseEntity { @Column(name = ALARM_TYPE_PROPERTY) private String type; + @Enumerated(EnumType.STRING) @Column(name = ALARM_SEVERITY_PROPERTY) private AlarmSeverity severity; + @Enumerated(EnumType.STRING) @Column(name = ALARM_STATUS_PROPERTY) private AlarmStatus status; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java index 02cad5d8e6..00e34e8081 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java @@ -15,11 +15,8 @@ */ package org.thingsboard.server.dao.model.sql; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; @@ -50,9 +47,11 @@ public class ComponentDescriptorEntity implements SearchTextEntity { @Column(name = EVENT_TENANT_ID_PROPERTY) private UUID tenantId; + @Enumerated(EnumType.STRING) @Column(name = EVENT_ENTITY_TYPE_PROPERTY) private EntityType entityType; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java index 8d8974dcf8..283ca35e3b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java @@ -16,11 +16,9 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; + +import javax.persistence.*; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; @@ -66,6 +64,7 @@ public class PluginMetaDataEntity implements SearchTextEntity { @Column(name = ModelConstants.PLUGIN_ACCESS_PROPERTY) private boolean publicAccess; + @Enumerated(EnumType.STRING) @Column(name = ModelConstants.PLUGIN_STATE_PROPERTY) private ComponentLifecycleState state; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java index 193501a981..77a8562568 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java @@ -17,11 +17,7 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -53,27 +49,38 @@ public class RuleMetaDataEntity implements SearchTextEntity { @Id @Column(name = ModelConstants.ID_PROPERTY) private UUID id; + @Column(name = ModelConstants.RULE_TENANT_ID_PROPERTY) private UUID tenantId; + @Column(name = ModelConstants.RULE_NAME_PROPERTY) private String name; + + @Enumerated(EnumType.STRING) @Column(name = ModelConstants.RULE_STATE_PROPERTY) private ComponentLifecycleState state; + @Column(name = ModelConstants.RULE_WEIGHT_PROPERTY) private int weight; + @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) private String searchText; + @Column(name = ModelConstants.RULE_PLUGIN_TOKEN_PROPERTY) private String pluginToken; + @Type(type = "jsonb") @Column(name = ModelConstants.RULE_FILTERS, columnDefinition = "jsonb") private JsonNode filters; + @Type(type = "jsonb") @Column(name = ModelConstants.RULE_PROCESSOR, columnDefinition = "jsonb") private JsonNode processor; + @Type(type = "jsonb") @Column(name = ModelConstants.RULE_ACTION, columnDefinition = "jsonb") private JsonNode action; + @Type(type = "jsonb") @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY, columnDefinition = "jsonb") private JsonNode additionalInfo; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java index 6572462df0..e7bc7fae3e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java @@ -56,6 +56,7 @@ public class UserEntity implements SearchTextEntity { @Column(name = ModelConstants.USER_CUSTOMER_ID_PROPERTY) private UUID customerId; + @Enumerated(EnumType.STRING) @Column(name = ModelConstants.USER_AUTHORITY_PROPERTY) private Authority authority; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java index 9bd8c1f252..ee72b2dcca 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java @@ -39,22 +39,22 @@ public interface ComponentDescriptorRepository extends CrudRepository findByTypeFirstPage(int limit, int type, String textSearch); + List findByTypeFirstPage(int limit, String type, String textSearch); @Query(nativeQuery = true, value = "SELECT * FROM COMPONENT_DESCRIPTOR WHERE TYPE = ?2 " + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + "AND ID > ?4 ORDER BY ID LIMIT ?1") - List findByTypeNextPage(int limit, int type, String textSearch, UUID idOffset); + List findByTypeNextPage(int limit, String type, String textSearch, UUID idOffset); @Query(nativeQuery = true, value = "SELECT * FROM COMPONENT_DESCRIPTOR WHERE TYPE = ?2 " + "AND SCOPE = ?3 AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?4, '%')) " + "ORDER BY ID LIMIT ?1") - List findByScopeAndTypeFirstPage(int limit, int type, int scope, String textSearch); + List findByScopeAndTypeFirstPage(int limit, String type, String scope, String textSearch); @Query(nativeQuery = true, value = "SELECT * FROM COMPONENT_DESCRIPTOR WHERE TYPE = ?2 " + "AND SCOPE = ?3 AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?4, '%')) " + "AND ID > ?5 ORDER BY ID LIMIT ?1") - List findByScopeAndTypeNextPage(int limit, int type, int scope, String textSearch, UUID idOffset); + List findByScopeAndTypeNextPage(int limit, String type, String scope, String textSearch, UUID idOffset); void deleteByClazz(String clazz); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java index 596d142dd9..fec30b9d3f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java @@ -78,10 +78,10 @@ public class JpaBaseComponentDescriptorDao extends JpaAbstractSearchTextDao findByTypeAndPageLink(ComponentType type, TextPageLink pageLink) { if (pageLink.getIdOffset() == null) { return DaoUtil.convertDataList(componentDescriptorRepository.findByTypeFirstPage(pageLink.getLimit(), - type.ordinal(), pageLink.getTextSearch())); + type.toString(), pageLink.getTextSearch())); } else { return DaoUtil.convertDataList(componentDescriptorRepository.findByTypeNextPage(pageLink.getLimit(), - type.ordinal(), pageLink.getTextSearch(), pageLink.getIdOffset())); + type.toString(), pageLink.getTextSearch(), pageLink.getIdOffset())); } } @@ -89,10 +89,10 @@ public class JpaBaseComponentDescriptorDao extends JpaAbstractSearchTextDao findByScopeAndTypeAndPageLink(ComponentScope scope, ComponentType type, TextPageLink pageLink) { if (pageLink.getIdOffset() == null) { return DaoUtil.convertDataList(componentDescriptorRepository.findByScopeAndTypeFirstPage(pageLink.getLimit(), - type.ordinal(), scope.ordinal(), pageLink.getTextSearch())); + type.toString(), scope.toString(), pageLink.getTextSearch())); } else { return DaoUtil.convertDataList(componentDescriptorRepository.findByScopeAndTypeNextPage(pageLink.getLimit(), - type.ordinal(), scope.ordinal(), pageLink.getTextSearch(), pageLink.getIdOffset())); + type.toString(), scope.toString(), pageLink.getTextSearch(), pageLink.getIdOffset())); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java index 585bf38335..b7d3aa7016 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java @@ -32,22 +32,22 @@ public interface UserRepository extends CrudRepository { UserEntity findByEmail(String email); @Query(nativeQuery = true, value = "SELECT * FROM TB_USER WHERE TENANT_ID = ?2 " + - "AND CUSTOMER_ID IS NULL AND AUTHORITY = 1 " + + "AND CUSTOMER_ID IS NULL AND AUTHORITY = 'TENANT_ADMIN' " + "ORDER BY ID LIMIT ?1") List findTenantAdminsFirstPage(int limit, UUID tenantId); @Query(nativeQuery = true, value = "SELECT * FROM TB_USER WHERE TENANT_ID = ?2 " + - "AND CUSTOMER_ID IS NULL AND AUTHORITY = 1 " + + "AND CUSTOMER_ID IS NULL AND AUTHORITY = 'TENANT_ADMIN' " + "AND ID > ?3 ORDER BY ID LIMIT ?1") List findTenantAdminsNextPage(int limit, UUID tenantId, UUID idOffset); @Query(nativeQuery = true, value = "SELECT * FROM TB_USER WHERE TENANT_ID = ?2 " + - "AND CUSTOMER_ID = ?3 AND AUTHORITY = 2 " + + "AND CUSTOMER_ID = ?3 AND AUTHORITY = 'CUSTOMER_USER' " + "ORDER BY ID LIMIT ?1") List findCustomerUsersFirstPage(int limit, UUID tenantId, UUID customerId); @Query(nativeQuery = true, value = "SELECT * FROM TB_USER WHERE TENANT_ID = ?2 " + - "AND CUSTOMER_ID = ?3 AND AUTHORITY = 2 " + + "AND CUSTOMER_ID = ?3 AND AUTHORITY = 'CUSTOMER_USER' " + "AND ID > ?4 ORDER BY ID LIMIT ?1") List findCustomerUsersNextPage(int limit, UUID tenantId, UUID customerId, UUID idOffset); diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java index 9ec8a6800f..4b4691867d 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java @@ -113,7 +113,6 @@ public class JpaUserDaoTest extends AbstractJpaDaoTest { userDao.save(user); assertEquals(6, userDao.find().size()); User savedUser = userDao.findByEmail("user@thingsboard.org"); - //User savedUser = userDao.findById(UUID.fromString("cd481534-27cc-11e7-93ae-92361f002671")); assertNotNull(savedUser); assertEquals(additionalInfo, savedUser.getAdditionalInfo().toString()); } diff --git a/dao/src/test/resources/dbunit/device_credentials.xml b/dao/src/test/resources/dbunit/device_credentials.xml index aee6b1ec19..01ccd6615b 100644 --- a/dao/src/test/resources/dbunit/device_credentials.xml +++ b/dao/src/test/resources/dbunit/device_credentials.xml @@ -2,14 +2,14 @@ diff --git a/dao/src/test/resources/dbunit/event.xml b/dao/src/test/resources/dbunit/event.xml index 943b45af2e..b150b7c394 100644 --- a/dao/src/test/resources/dbunit/event.xml +++ b/dao/src/test/resources/dbunit/event.xml @@ -3,7 +3,7 @@ id="be41c7a2-31f5-11e7-9cfd-2786e6aa2046" tenant_id="be41c7a0-31f5-11e7-9cfd-2786e6aa2046" entity_id="be41c7a1-31f5-11e7-9cfd-2786e6aa2046" - entity_type="7" + entity_type="DEVICE" event_type="STATS" event_uid="be41c7a3-31f5-11e7-9cfd-2786e6aa2046" /> @@ -11,7 +11,7 @@ id="be41c7a4-31f5-11e7-9cfd-2786e6aa2046" tenant_id="be41c7a0-31f5-11e7-9cfd-2786e6aa2046" entity_id="be41c7a1-31f5-11e7-9cfd-2786e6aa2046" - entity_type="7" + entity_type="DEVICE" event_type="STATS" event_uid="be41c7a5-31f5-11e7-9cfd-2786e6aa2046" /> diff --git a/dao/src/test/resources/dbunit/user.xml b/dao/src/test/resources/dbunit/user.xml index 4b704a0a2e..2127202cad 100644 --- a/dao/src/test/resources/dbunit/user.xml +++ b/dao/src/test/resources/dbunit/user.xml @@ -2,7 +2,7 @@ \ No newline at end of file From 3c5b76b25d580b2be8f3741f40ed21db34a3fad8 Mon Sep 17 00:00:00 2001 From: mp-loki Date: Mon, 29 May 2017 23:47:45 -0400 Subject: [PATCH 28/69] Added method implementations to missing JPA Asset and Alalrm DAO methods --- .../common/data/asset/TenantAssetType.java | 7 ++ .../server/dao/sql/JpaAbstractDao.java | 1 - .../server/dao/sql/alarm/AlarmRepository.java | 2 +- .../server/dao/sql/alarm/JpaAlarmDao.java | 34 ++++++-- .../server/dao/sql/asset/AssetRepository.java | 16 ++++ .../server/dao/sql/asset/JpaAssetDao.java | 11 ++- .../dao/sql/relation/JpaRelationDao.java | 84 +++++++++++++++++++ .../server/dao/sql/alarm/JpaAlarmDaoTest.java | 5 ++ .../server/dao/sql/asset/JpaAssetDaoTest.java | 66 +++++++++++++-- 9 files changed, 205 insertions(+), 21 deletions(-) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/asset/TenantAssetType.java b/common/data/src/main/java/org/thingsboard/server/common/data/asset/TenantAssetType.java index bd23f2aa5a..8e0eb0e69e 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/asset/TenantAssetType.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/asset/TenantAssetType.java @@ -17,6 +17,8 @@ package org.thingsboard.server.common.data.asset; import org.thingsboard.server.common.data.id.TenantId; +import java.util.UUID; + public class TenantAssetType { private static final long serialVersionUID = 8057290243855622101L; @@ -33,6 +35,11 @@ public class TenantAssetType { this.tenantId = tenantId; } + public TenantAssetType(String type, UUID tenantId) { + this.type = type; + this.tenantId = new TenantId(tenantId); + } + public String getType() { return type; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java index 7073b491ac..a2b2bc9150 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java @@ -76,7 +76,6 @@ public abstract class JpaAbstractDao, D> implements Dao< @Override public ListenableFuture findByIdAsync(UUID key) { log.debug("Get entity by key async {}", key); - // Should ListeningExecutorService be a field? ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); ListenableFuture listenableFuture = service.submit(() -> DaoUtil.getData(getCrudRepository().findOne(key))); return listenableFuture; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java index f14a08f7eb..e46c144692 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java @@ -27,7 +27,7 @@ import java.util.UUID; * Created by Valerii Sosliuk on 5/21/2017. */ @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) -public interface AlarmRepository extends CrudRepository { +public interface AlarmRepository extends CrudRepository { @Query(nativeQuery = true, value = "SELECT * FROM ALARM WHERE TENANT_ID = ?1 AND ORIGINATOR_ID = ?2 " + "AND ?3 = ?3 AND TYPE = ?4 ORDER BY ID DESC LIMIT 1") diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java index 86ad73692e..cd0df63c32 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java @@ -15,23 +15,28 @@ */ package org.thingsboard.server.dao.sql.alarm; -import com.google.common.util.concurrent.ListenableFuture; -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; +import com.google.common.util.concurrent.*; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.alarm.Alarm; import org.thingsboard.server.common.data.alarm.AlarmQuery; 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.DaoUtil; import org.thingsboard.server.dao.alarm.AlarmDao; +import org.thingsboard.server.dao.alarm.BaseAlarmService; import org.thingsboard.server.dao.model.sql.AlarmEntity; +import org.thingsboard.server.dao.relation.RelationDao; import org.thingsboard.server.dao.sql.JpaAbstractDao; +import java.util.ArrayList; import java.util.List; import java.util.UUID; import java.util.concurrent.Executors; @@ -41,6 +46,7 @@ import static org.springframework.transaction.annotation.Propagation.REQUIRES_NE /** * Created by Valerii Sosliuk on 5/19/2017. */ +@Slf4j @Component @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) public class JpaAlarmDao extends JpaAbstractDao implements AlarmDao { @@ -48,6 +54,9 @@ public class JpaAlarmDao extends JpaAbstractDao implements A @Autowired private AlarmRepository alarmRepository; + @Autowired + private RelationDao relationDao; + @Override protected Class getEntityClass() { return AlarmEntity.class; @@ -62,21 +71,28 @@ public class JpaAlarmDao extends JpaAbstractDao implements A @Transactional(propagation = REQUIRES_NEW) public ListenableFuture findLatestByOriginatorAndType(TenantId tenantId, EntityId originator, String type) { ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); - ListenableFuture listenableFuture = service.submit(() -> DaoUtil.getData( + return service.submit(() -> DaoUtil.getData( alarmRepository.findLatestByOriginatorAndType(tenantId.getId(), originator.getId(), originator.getEntityType().ordinal(), type))); - return listenableFuture; } @Override public ListenableFuture findAlarmByIdAsync(UUID key) { - //TODO: Implement - return null; + return findByIdAsync(key); } @Override public ListenableFuture> findAlarms(AlarmQuery query) { - //TODO: Implement - return null; + log.trace("Try to find alarms by entity [{}], status [{}] and pageLink [{}]", query.getAffectedEntityId(), query.getStatus(), query.getPageLink()); + EntityId affectedEntity = query.getAffectedEntityId(); + String relationType = query.getStatus() == null ? BaseAlarmService.ALARM_RELATION : BaseAlarmService.ALARM_RELATION_PREFIX + query.getStatus().name(); + ListenableFuture> relations = relationDao.findRelations(affectedEntity, relationType, RelationTypeGroup.ALARM, EntityType.ALARM, query.getPageLink()); + return Futures.transform(relations, (AsyncFunction, List>) input -> { + List> alarmFutures = new ArrayList<>(input.size()); + for (EntityRelation relation : input) { + alarmFutures.add(findAlarmByIdAsync(relation.getTo().getId())); + } + return Futures.successfulAsList(alarmFutures); + }); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java index cf38c02988..b6c9891540 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java @@ -19,6 +19,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.thingsboard.server.common.data.asset.Asset; +import org.thingsboard.server.common.data.asset.TenantAssetType; import org.thingsboard.server.dao.model.sql.AssetEntity; import java.util.List; @@ -58,4 +59,19 @@ public interface AssetRepository extends CrudRepository { List findByTenantIdAndCustomerIdAndIdIn(UUID tenantId, UUID customerId, List assetIds); AssetEntity findByTenantIdAndName(UUID tenantId, String name); + + @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = ?2 " + + "AND CUSTOMER_ID = ?3 AND TYPE = ?4 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?5, '%')) " + + "ORDER BY ID LIMIT ?1") + List findByTenantIdAndCustomerIdAndTypeFirstPage(int limit, UUID tenantId, UUID customerId, String type, String textSearch); + + @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = ?2 " + + "AND CUSTOMER_ID = ?3 AND TYPE = ?4 " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?5, '%')) " + + "AND ID > ?6 ORDER BY ID LIMIT ?1") + List findByTenantIdAndCustomerIdAndTypeNextPage(int limit, UUID tenantId, UUID customerId, String type, String textSearch, UUID idOffset); + + @Query(value = "SELECT NEW org.thingsboard.server.common.data.asset.TenantAssetType(a.type, a.tenantId) FROM AssetEntity a GROUP BY a.tenantId, a.type") + List findTenantAssetTypes(); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java index bc52aa088f..49f8d44e05 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java @@ -104,11 +104,18 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao im @Override public List findAssetsByTenantIdAndCustomerIdAndType(UUID tenantId, UUID customerId, String type, TextPageLink pageLink) { - return null; + if (pageLink.getIdOffset() == null) { + return DaoUtil.convertDataList(assetRepository.findByTenantIdAndCustomerIdAndTypeFirstPage(pageLink.getLimit(), tenantId, + customerId, type, pageLink.getTextSearch())); + } else { + return DaoUtil.convertDataList(assetRepository.findByTenantIdAndCustomerIdAndTypeNextPage(pageLink.getLimit(), tenantId, + customerId, type, pageLink.getTextSearch(), pageLink.getIdOffset())); + } } @Override public ListenableFuture> findTenantAssetTypesAsync() { - return null; + ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); + return service.submit(() -> assetRepository.findTenantAssetTypes()); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java new file mode 100644 index 0000000000..beaa9c64ac --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java @@ -0,0 +1,84 @@ +package org.thingsboard.server.dao.sql.relation; + +import com.google.common.util.concurrent.ListenableFuture; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Component; +import org.thingsboard.server.common.data.EntityType; +import org.thingsboard.server.common.data.id.EntityId; +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.relation.RelationDao; + +import java.util.List; + +/** + * Created by Valerii Sosliuk on 5/29/2017. + */ +@Slf4j +@Component +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +public class JpaRelationDao implements RelationDao { + + + @Override + public ListenableFuture> findAllByFrom(EntityId from, RelationTypeGroup typeGroup) { + // TODO: Implement + return null; + } + + @Override + public ListenableFuture> findAllByFromAndType(EntityId from, String relationType, RelationTypeGroup typeGroup) { + // TODO: Implement + return null; + } + + @Override + public ListenableFuture> findAllByTo(EntityId to, RelationTypeGroup typeGroup) { + // TODO: Implement + return null; + } + + @Override + public ListenableFuture> findAllByToAndType(EntityId to, String relationType, RelationTypeGroup typeGroup) { + // TODO: Implement + return null; + } + + @Override + public ListenableFuture checkRelation(EntityId from, EntityId to, String relationType, RelationTypeGroup typeGroup) { + // TODO: Implement + return null; + } + + @Override + public ListenableFuture saveRelation(EntityRelation relation) { + // TODO: Implement + return null; + } + + @Override + public ListenableFuture deleteRelation(EntityRelation relation) { + // TODO: Implement + return null; + } + + @Override + public ListenableFuture deleteRelation(EntityId from, EntityId to, String relationType, RelationTypeGroup typeGroup) { + // TODO: Implement + return null; + } + + @Override + public ListenableFuture deleteOutboundRelations(EntityId entity) { + // TODO: Implement + return null; + } + + @Override + public ListenableFuture> findRelations(EntityId from, String relationType, RelationTypeGroup typeGroup, EntityType toType, TimePageLink pageLink) { + // TODO: Implement + return null; + } +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java index 94b6f51c33..b26db0bb97 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java @@ -71,6 +71,11 @@ 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)); diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/asset/JpaAssetDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/asset/JpaAssetDaoTest.java index ebee17e4bc..4be102e089 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/asset/JpaAssetDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/asset/JpaAssetDaoTest.java @@ -20,6 +20,7 @@ import com.google.common.util.concurrent.ListenableFuture; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.thingsboard.server.common.data.asset.Asset; +import org.thingsboard.server.common.data.asset.TenantAssetType; import org.thingsboard.server.common.data.id.AssetId; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.TenantId; @@ -32,6 +33,7 @@ import java.util.List; import java.util.Optional; import java.util.UUID; import java.util.concurrent.ExecutionException; +import java.util.stream.Collectors; import static junit.framework.TestCase.assertFalse; import static org.junit.Assert.assertEquals; @@ -56,7 +58,7 @@ public class JpaAssetDaoTest extends AbstractJpaDaoTest { UUID assetId = UUIDs.timeBased(); UUID tenantId = i % 2 == 0 ? tenantId1 : tenantId2; UUID customerId = i % 2 == 0 ? customerId1 : customerId2; - saveAsset(assetId, tenantId, customerId, "ASSET_" + i); + saveAsset(assetId, tenantId, customerId, "ASSET_" + i, "TYPE_1"); } assertEquals(60, assetDao.find().size()); @@ -83,7 +85,7 @@ public class JpaAssetDaoTest extends AbstractJpaDaoTest { UUID assetId = UUIDs.timeBased(); UUID tenantId = i % 2 == 0 ? tenantId1 : tenantId2; UUID customerId = i % 2 == 0 ? customerId1 : customerId2; - saveAsset(assetId, tenantId, customerId, "ASSET_" + i); + saveAsset(assetId, tenantId, customerId, "ASSET_" + i, "TYPE_1"); } TextPageLink pageLink1 = new TextPageLink(20, "ASSET_"); @@ -106,7 +108,7 @@ public class JpaAssetDaoTest extends AbstractJpaDaoTest { List searchIds = new ArrayList<>(); for (int i = 0; i < 30; i++) { UUID assetId = UUIDs.timeBased(); - saveAsset(assetId, tenantId, customerId, "ASSET_" + i); + saveAsset(assetId, tenantId, customerId, "ASSET_" + i, "TYPE_1"); if (i % 3 == 0) { searchIds.add(assetId); } @@ -128,7 +130,7 @@ public class JpaAssetDaoTest extends AbstractJpaDaoTest { for (int i = 0; i < 30; i++) { UUID assetId = UUIDs.timeBased(); UUID customerId = i%2 == 0 ? customerId1 : customerId2; - saveAsset(assetId, tenantId, customerId, "ASSET_" + i); + saveAsset(assetId, tenantId, customerId, "ASSET_" + i, "TYPE_1"); if (i % 3 == 0) { searchIds.add(assetId); } @@ -150,8 +152,8 @@ public class JpaAssetDaoTest extends AbstractJpaDaoTest { UUID customerId1 = UUIDs.timeBased(); UUID customerId2 = UUIDs.timeBased(); String name = "TEST_ASSET"; - saveAsset(assetId1, tenantId1, customerId1, name); - saveAsset(assetId2, tenantId2, customerId2, name); + saveAsset(assetId1, tenantId1, customerId1, name, "TYPE_1"); + saveAsset(assetId2, tenantId2, customerId2, name, "TYPE_1"); Optional assetOpt1 = assetDao.findAssetsByTenantIdAndName(tenantId2, name); assertTrue("Optional expected to be non-empty", assetOpt1.isPresent()); @@ -161,13 +163,61 @@ public class JpaAssetDaoTest extends AbstractJpaDaoTest { assertFalse("Optional expected to be empty", assetOpt2.isPresent()); } - private void saveAsset(UUID id, UUID tenantId, UUID customerId, String name) { + @Test + public void testFindAssetsByTenantIdAndType() { + // TODO: implement + } + + @Test + public void testFindAssetsByTenantIdAndCustomerIdAndType() { + // TODO: implement + } + + @Test + public void testFindTenantAssetTypesAsync() throws ExecutionException, InterruptedException { + UUID assetId1 = UUIDs.timeBased(); + UUID assetId2 = UUIDs.timeBased(); + UUID tenantId1 = UUIDs.timeBased(); + UUID tenantId2 = UUIDs.timeBased(); + UUID customerId1 = UUIDs.timeBased(); + UUID customerId2 = UUIDs.timeBased(); + saveAsset(UUIDs.timeBased(), tenantId1, customerId1, "TEST_ASSET_1", "TYPE_1"); + saveAsset(UUIDs.timeBased(), tenantId1, customerId1, "TEST_ASSET_2", "TYPE_1"); + saveAsset(UUIDs.timeBased(), tenantId1, customerId1, "TEST_ASSET_3", "TYPE_2"); + saveAsset(UUIDs.timeBased(), tenantId1, customerId1, "TEST_ASSET_4", "TYPE_3"); + saveAsset(UUIDs.timeBased(), tenantId1, customerId1, "TEST_ASSET_5", "TYPE_3"); + saveAsset(UUIDs.timeBased(), tenantId1, customerId1, "TEST_ASSET_6", "TYPE_3"); + + saveAsset(UUIDs.timeBased(), tenantId2, customerId2, "TEST_ASSET_7", "TYPE_4"); + saveAsset(UUIDs.timeBased(), tenantId2, customerId2, "TEST_ASSET_8", "TYPE_1"); + saveAsset(UUIDs.timeBased(), tenantId2, customerId2, "TEST_ASSET_9", "TYPE_1"); + + ListenableFuture> tenantAssetTypesFuture = assetDao.findTenantAssetTypesAsync(); + List tenantAssetTypes = tenantAssetTypesFuture.get(); + assertNotNull(tenantAssetTypes); + List tenant1Types = tenantAssetTypes.stream().filter(t -> t.getTenantId().getId().equals(tenantId1)).collect(Collectors.toList()); + List tenant2Types = tenantAssetTypes.stream().filter(t -> t.getTenantId().getId().equals(tenantId2)).collect(Collectors.toList()); + + assertEquals(3, tenant1Types.size()); + assertTrue(tenant1Types.stream().anyMatch(t -> t.getType().equals("TYPE_1"))); + assertTrue(tenant1Types.stream().anyMatch(t -> t.getType().equals("TYPE_2"))); + assertTrue(tenant1Types.stream().anyMatch(t -> t.getType().equals("TYPE_3"))); + assertFalse(tenant1Types.stream().anyMatch(t -> t.getType().equals("TYPE_4"))); + + assertEquals(2, tenant2Types.size()); + assertTrue(tenant2Types.stream().anyMatch(t -> t.getType().equals("TYPE_1"))); + assertTrue(tenant2Types.stream().anyMatch(t -> t.getType().equals("TYPE_4"))); + assertFalse(tenant2Types.stream().anyMatch(t -> t.getType().equals("TYPE_2"))); + assertFalse(tenant2Types.stream().anyMatch(t -> t.getType().equals("TYPE_3"))); + } + + private void saveAsset(UUID id, UUID tenantId, UUID customerId, String name, String type) { Asset asset = new Asset(); asset.setId(new AssetId(id)); asset.setTenantId(new TenantId(tenantId)); asset.setCustomerId(new CustomerId(customerId)); asset.setName(name); - + asset.setType(type); assetDao.save(asset); } } From d1dad3c09a51d341ebdcc0f68cfa7708c9ca8e8f Mon Sep 17 00:00:00 2001 From: volodymyr-babak Date: Tue, 30 May 2017 11:54:59 +0300 Subject: [PATCH 29/69] Added config parameter for tests to enable cassandra --- .../org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java | 4 ++-- .../org/thingsboard/server/dao/sql/asset/JpaAssetDao.java | 4 ++-- dao/src/test/resources/application-test.properties | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java index cd0df63c32..a452fede57 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java @@ -58,12 +58,12 @@ public class JpaAlarmDao extends JpaAbstractDao implements A private RelationDao relationDao; @Override - protected Class getEntityClass() { + protected Class getEntityClass() { return AlarmEntity.class; } @Override - protected CrudRepository getCrudRepository() { + protected CrudRepository getCrudRepository() { return alarmRepository; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java index 49f8d44e05..47b2ab1c5e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java @@ -46,12 +46,12 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao im private AssetRepository assetRepository; @Override - protected Class getEntityClass() { + protected Class getEntityClass() { return AssetEntity.class; } @Override - protected CrudRepository getCrudRepository() { + protected CrudRepository getCrudRepository() { return assetRepository; } diff --git a/dao/src/test/resources/application-test.properties b/dao/src/test/resources/application-test.properties index 1430eb4f10..cc41cc7a93 100644 --- a/dao/src/test/resources/application-test.properties +++ b/dao/src/test/resources/application-test.properties @@ -7,4 +7,6 @@ zk.enabled=false zk.url=localhost:2181 zk.zk_dir=/thingsboard -sql.enabled=false \ No newline at end of file +sql.enabled=false + +cassandra.enabled=true \ No newline at end of file From 410d197a340b1db3ebe71ee023a86659b5f38403 Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Tue, 30 May 2017 13:14:51 +0300 Subject: [PATCH 30/69] 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 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 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>) assetTypeEntities -> { List 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 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>) deviceTypeEntities -> { List deviceTypes = new ArrayList<>(); for (TenantDeviceType deviceType : deviceTypeEntities) { - if (deviceType.getTenantId().equals(tenantId.getId())) { + if (deviceType.getTenantId().equals(tenantId)) { deviceTypes.add(deviceType); } } From f7bbe2136bcaacee98777e2f0c96330b033500db Mon Sep 17 00:00:00 2001 From: volodymyr-babak Date: Tue, 30 May 2017 13:42:28 +0300 Subject: [PATCH 31/69] Fixed cache functionality. Moved annotation from interface to classes because of Spring bug https://jira.spring.io/browse/SPR-15271 --- dao/pom.xml | 8 ----- .../dao/cache/ServiceCacheConfiguration.java | 29 ++++++++++++------- .../dao/device/DeviceCredentialsService.java | 7 ----- .../device/DeviceCredentialsServiceImpl.java | 6 ++++ .../service/DeviceCredentialsCacheTest.java | 12 +++----- 5 files changed, 28 insertions(+), 34 deletions(-) diff --git a/dao/pom.xml b/dao/pom.xml index a3c9b2cfa4..9ab0b62611 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -60,10 +60,6 @@ org.postgresql postgresql - - org.springframework - spring-test - junit junit @@ -177,10 +173,6 @@ com.h2database h2 - - org.springframework.boot - spring-boot-starter-data-jpa - diff --git a/dao/src/main/java/org/thingsboard/server/dao/cache/ServiceCacheConfiguration.java b/dao/src/main/java/org/thingsboard/server/dao/cache/ServiceCacheConfiguration.java index 7c435bf779..35391785d0 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/cache/ServiceCacheConfiguration.java +++ b/dao/src/main/java/org/thingsboard/server/dao/cache/ServiceCacheConfiguration.java @@ -57,16 +57,25 @@ public class ServiceCacheConfiguration { Config config = new Config(); if (zkEnabled) { - config.getNetworkConfig().getJoin().getMulticastConfig().setEnabled(false); - - config.setProperty(GroupProperty.DISCOVERY_SPI_ENABLED.getName(), Boolean.TRUE.toString()); - DiscoveryStrategyConfig discoveryStrategyConfig = new DiscoveryStrategyConfig(new ZookeeperDiscoveryStrategyFactory()); - discoveryStrategyConfig.addProperty(ZookeeperDiscoveryProperties.ZOOKEEPER_URL.key(), zkUrl); - discoveryStrategyConfig.addProperty(ZookeeperDiscoveryProperties.ZOOKEEPER_PATH.key(), zkDir); - discoveryStrategyConfig.addProperty(ZookeeperDiscoveryProperties.GROUP.key(), HAZELCAST_CLUSTER_NAME); - config.getNetworkConfig().getJoin().getDiscoveryConfig().addDiscoveryStrategyConfig(discoveryStrategyConfig); + addZkConfig(config); } + config.addMapConfig(createDeviceCredentialsCacheConfig()); + + return Hazelcast.newHazelcastInstance(config); + } + + private void addZkConfig(Config config) { + config.getNetworkConfig().getJoin().getMulticastConfig().setEnabled(false); + config.setProperty(GroupProperty.DISCOVERY_SPI_ENABLED.getName(), Boolean.TRUE.toString()); + DiscoveryStrategyConfig discoveryStrategyConfig = new DiscoveryStrategyConfig(new ZookeeperDiscoveryStrategyFactory()); + discoveryStrategyConfig.addProperty(ZookeeperDiscoveryProperties.ZOOKEEPER_URL.key(), zkUrl); + discoveryStrategyConfig.addProperty(ZookeeperDiscoveryProperties.ZOOKEEPER_PATH.key(), zkDir); + discoveryStrategyConfig.addProperty(ZookeeperDiscoveryProperties.GROUP.key(), HAZELCAST_CLUSTER_NAME); + config.getNetworkConfig().getJoin().getDiscoveryConfig().addDiscoveryStrategyConfig(discoveryStrategyConfig); + } + + private MapConfig createDeviceCredentialsCacheConfig() { MapConfig deviceCredentialsCacheConfig = new MapConfig(CacheConstants.DEVICE_CREDENTIALS_CACHE); deviceCredentialsCacheConfig.setTimeToLiveSeconds(cacheDeviceCredentialsTTL); deviceCredentialsCacheConfig.setEvictionPolicy(EvictionPolicy.LRU); @@ -75,9 +84,7 @@ public class ServiceCacheConfiguration { cacheDeviceCredentialsMaxSizeSize, MaxSizeConfig.MaxSizePolicy.valueOf(cacheDeviceCredentialsMaxSizePolicy)) ); - config.addMapConfig(deviceCredentialsCacheConfig); - - return Hazelcast.newHazelcastInstance(config); + return deviceCredentialsCacheConfig; } @Bean diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsService.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsService.java index 3e71162961..73e9dd3f76 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsService.java @@ -15,25 +15,18 @@ */ package org.thingsboard.server.dao.device; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.Cacheable; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.security.DeviceCredentials; -import static org.thingsboard.server.common.data.CacheConstants.DEVICE_CREDENTIALS_CACHE; - public interface DeviceCredentialsService { DeviceCredentials findDeviceCredentialsByDeviceId(DeviceId deviceId); - @Cacheable(cacheNames = DEVICE_CREDENTIALS_CACHE, unless="#result == null") DeviceCredentials findDeviceCredentialsByCredentialsId(String credentialsId); - @CacheEvict(cacheNames = DEVICE_CREDENTIALS_CACHE, keyGenerator="previousDeviceCredentialsId", beforeInvocation = true) DeviceCredentials updateDeviceCredentials(DeviceCredentials deviceCredentials); DeviceCredentials createDeviceCredentials(DeviceCredentials deviceCredentials); - @CacheEvict(cacheNames = DEVICE_CREDENTIALS_CACHE, key="#deviceCredentials.credentialsId") void deleteDeviceCredentials(DeviceCredentials deviceCredentials); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java index ae2322121c..fb8553c96c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java @@ -18,6 +18,8 @@ package org.thingsboard.server.dao.device; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import org.thingsboard.server.common.data.Device; @@ -28,6 +30,7 @@ import org.thingsboard.server.dao.EncryptionUtil; import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.service.DataValidator; +import static org.thingsboard.server.common.data.CacheConstants.DEVICE_CREDENTIALS_CACHE; import static org.thingsboard.server.dao.service.Validator.validateId; import static org.thingsboard.server.dao.service.Validator.validateString; @@ -49,6 +52,7 @@ public class DeviceCredentialsServiceImpl implements DeviceCredentialsService { } @Override + @Cacheable(cacheNames = DEVICE_CREDENTIALS_CACHE, unless="#result == null") public DeviceCredentials findDeviceCredentialsByCredentialsId(String credentialsId) { log.trace("Executing findDeviceCredentialsByCredentialsId [{}]", credentialsId); validateString(credentialsId, "Incorrect credentialsId " + credentialsId); @@ -56,6 +60,7 @@ public class DeviceCredentialsServiceImpl implements DeviceCredentialsService { } @Override + @CacheEvict(cacheNames = DEVICE_CREDENTIALS_CACHE, keyGenerator="previousDeviceCredentialsId", beforeInvocation = true) public DeviceCredentials updateDeviceCredentials(DeviceCredentials deviceCredentials) { return saveOrUpdare(deviceCredentials); } @@ -82,6 +87,7 @@ public class DeviceCredentialsServiceImpl implements DeviceCredentialsService { } @Override + @CacheEvict(cacheNames = DEVICE_CREDENTIALS_CACHE, key="#deviceCredentials.credentialsId") public void deleteDeviceCredentials(DeviceCredentials deviceCredentials) { log.trace("Executing deleteDeviceCredentials [{}]", deviceCredentials); deviceCredentialsDao.removeById(deviceCredentials.getUuidId()); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java index 4428d020eb..66b4f2bfbc 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java @@ -15,13 +15,9 @@ */ package org.thingsboard.server.dao.service; -import com.datastax.driver.core.utils.UUIDs; import com.hazelcast.core.HazelcastInstance; import org.apache.commons.lang3.RandomStringUtils; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.*; import org.springframework.aop.framework.Advised; import org.springframework.aop.support.AopUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -56,7 +52,7 @@ public class DeviceCredentialsCacheTest extends AbstractServiceTest { @Autowired private HazelcastInstance hazelcastInstance; - private UUID deviceId = UUIDs.timeBased(); + private UUID deviceId = UUID.randomUUID(); @Before public void setup() throws Exception { @@ -115,7 +111,7 @@ public class DeviceCredentialsCacheTest extends AbstractServiceTest { when(deviceCredentialsDao.findByDeviceId(deviceId)).thenReturn(createDummyDeviceCredentialsEntity(CREDENTIALS_ID_1)); - UUID deviceCredentialsId = UUIDs.timeBased(); + UUID deviceCredentialsId = UUID.randomUUID(); when(deviceCredentialsDao.findById(deviceCredentialsId)).thenReturn(createDummyDeviceCredentialsEntity(CREDENTIALS_ID_1)); when(deviceService.findDeviceById(new DeviceId(deviceId))).thenReturn(new Device()); @@ -140,7 +136,7 @@ public class DeviceCredentialsCacheTest extends AbstractServiceTest { } private DeviceCredentials createDummyDeviceCredentialsEntity(String deviceCredentialsId) { - DeviceCredentials result = new DeviceCredentials(new DeviceCredentialsId(UUIDs.timeBased())); + DeviceCredentials result = new DeviceCredentials(new DeviceCredentialsId(UUID.randomUUID())); result.setCredentialsId(deviceCredentialsId); return result; } From 4af67822a12dffdf0b3be934dcf3361ff0d20963 Mon Sep 17 00:00:00 2001 From: volodymyr-babak Date: Tue, 30 May 2017 17:04:16 +0300 Subject: [PATCH 32/69] Fixed dao could not find class exception during tests and added license header --- .../server/dao/sql/relation/JpaRelationDao.java | 15 +++++++++++++++ .../server/dao/JpaDbunitTestConfig.java | 2 ++ 2 files changed, 17 insertions(+) diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java index beaa9c64ac..7841463398 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java @@ -1,3 +1,18 @@ +/** + * 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.sql.relation; import com.google.common.util.concurrent.ListenableFuture; diff --git a/dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java b/dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java index dda8d638e0..ad4145ab1d 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java +++ b/dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java @@ -20,6 +20,7 @@ import com.github.springtestdbunit.bean.DatabaseDataSourceConnectionFactoryBean; import org.dbunit.DatabaseUnitException; import org.dbunit.ext.postgresql.PostgresqlDataTypeFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -31,6 +32,7 @@ import java.sql.SQLException; * Created by Valerii Sosliuk on 5/6/2017. */ @Configuration +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") public class JpaDbunitTestConfig { @Autowired From 6a62b6495358cc00a671af287b9d0827c1669b02 Mon Sep 17 00:00:00 2001 From: volodymyr-babak Date: Tue, 30 May 2017 20:37:53 +0300 Subject: [PATCH 33/69] Fixed controller tests --- .../service/mail/DefaultMailService.java | 31 +++++++++---------- pom.xml | 4 +++ 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java b/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java index d80b3b719f..d4c0decf3e 100644 --- a/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java +++ b/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java @@ -15,34 +15,31 @@ */ package org.thingsboard.server.service.mail; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; - -import javax.annotation.PostConstruct; -import javax.mail.internet.MimeMessage; - +import com.fasterxml.jackson.databind.JsonNode; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.velocity.app.VelocityEngine; -import org.springframework.beans.factory.annotation.Qualifier; -import org.thingsboard.server.exception.ThingsboardErrorCode; -import org.thingsboard.server.exception.ThingsboardException; -import org.thingsboard.server.common.data.AdminSettings; -import org.thingsboard.server.dao.settings.AdminSettingsService; -import org.thingsboard.server.dao.exception.IncorrectParameterException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.MessageSource; import org.springframework.core.NestedRuntimeException; import org.springframework.mail.javamail.JavaMailSenderImpl; import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.stereotype.Service; import org.springframework.ui.velocity.VelocityEngineUtils; +import org.thingsboard.server.common.data.AdminSettings; +import org.thingsboard.server.dao.exception.IncorrectParameterException; +import org.thingsboard.server.dao.settings.AdminSettingsService; +import org.thingsboard.server.exception.ThingsboardErrorCode; +import org.thingsboard.server.exception.ThingsboardException; + +import javax.annotation.PostConstruct; +import javax.mail.internet.MimeMessage; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; -import com.fasterxml.jackson.databind.JsonNode; @Service @Slf4j public class DefaultMailService implements MailService { diff --git a/pom.xml b/pom.xml index 3bdacd3ebd..dec1e441ef 100755 --- a/pom.xml +++ b/pom.xml @@ -480,6 +480,10 @@ javax.servlet servlet-api + + dom4j + dom4j + From 7d514d8cadae746a8055201f582cf390a921b2d8 Mon Sep 17 00:00:00 2001 From: volodymyr-babak Date: Tue, 30 May 2017 21:02:14 +0300 Subject: [PATCH 34/69] Fixed js builds Disabled autoconfiguration for hibernate --- .../server/ThingsboardServerApplication.java | 5 ++++- .../src/main/resources/thingsboard.yml | 19 ++++++++++++++++--- ui/src/app/api/customer.service.js | 11 ----------- ui/src/app/components/dashboard.directive.js | 2 -- ui/src/app/components/widget.controller.js | 1 - ui/src/app/widget/lib/flot-widget.js | 8 +------- 6 files changed, 21 insertions(+), 25 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/ThingsboardServerApplication.java b/application/src/main/java/org/thingsboard/server/ThingsboardServerApplication.java index 4d3c8e9161..5e00ac4a11 100644 --- a/application/src/main/java/org/thingsboard/server/ThingsboardServerApplication.java +++ b/application/src/main/java/org/thingsboard/server/ThingsboardServerApplication.java @@ -18,12 +18,15 @@ package org.thingsboard.server; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; +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.ComponentScan; import springfox.documentation.swagger2.annotations.EnableSwagger2; import java.util.Arrays; -@EnableAutoConfiguration +@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class, HibernateJpaAutoConfiguration.class}) @SpringBootApplication @EnableSwagger2 @ComponentScan({"org.thingsboard.server"}) diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index f24761c9e1..6bbce15a8c 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -227,7 +227,20 @@ spring.mvc.cors: # SQL DAO Configuration sql: enabled: "${SQL_ENABLED:false}" + +spring: + data: + jpa: + repositories: + enabled: "false" + jpa: + show-sql: "false" + generate-ddl: "false" + database-platform: "org.hibernate.dialect.PostgreSQLDialect" + hibernate: + ddl-auto: "none" datasource: - url: "${SQL_DATASOURCE_URL:jdbc:postgresql://localhost:5432/thingsboard}" - username: "${SQL_DATASOURCE_USERNAME:postgres}" - password: "${SQL_DATASOURCE_PASSWORD:postgres}" + driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}" + url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/thingsboard}" + username: "${SPRING_DATASOURCE_USERNAME:postgres}" + password: "${SPRING_DATASOURCE_PASSWORD:postgres}" \ No newline at end of file diff --git a/ui/src/app/api/customer.service.js b/ui/src/app/api/customer.service.js index 8a3fe66a16..b36b44afdf 100644 --- a/ui/src/app/api/customer.service.js +++ b/ui/src/app/api/customer.service.js @@ -63,17 +63,6 @@ function CustomerService($http, $q, types) { return deferred.promise; } - function getCustomerTitle(customerId) { - var deferred = $q.defer(); - var url = '/api/customer/' + customerId + '/title'; - $http.get(url, null).then(function success(response) { - deferred.resolve(response.data); - }, function fail(response) { - deferred.reject(response.data); - }); - return deferred.promise; - } - function getShortCustomerInfo(customerId) { var deferred = $q.defer(); var url = '/api/customer/' + customerId + '/shortInfo'; diff --git a/ui/src/app/components/dashboard.directive.js b/ui/src/app/components/dashboard.directive.js index b254cca37b..f26121ccea 100644 --- a/ui/src/app/components/dashboard.directive.js +++ b/ui/src/app/components/dashboard.directive.js @@ -202,10 +202,8 @@ function DashboardController($scope, $rootScope, $element, $timeout, $mdMedia, t onResetTimewindow: function() { $timeout(function() { if (vm.originalDashboardTimewindow) { - $timeout(function() { vm.dashboardTimewindow = angular.copy(vm.originalDashboardTimewindow); vm.originalDashboardTimewindow = null; - }, 0); } }, 0); }, diff --git a/ui/src/app/components/widget.controller.js b/ui/src/app/components/widget.controller.js index ef53ac2001..6fc4bba646 100644 --- a/ui/src/app/components/widget.controller.js +++ b/ui/src/app/components/widget.controller.js @@ -561,7 +561,6 @@ export default function WidgetController($scope, $timeout, $window, $element, $q } } - var dataIndex = 0; //TODO: widgets visibility /*function updateVisibility(forceRedraw) { if (visibleRect) { diff --git a/ui/src/app/widget/lib/flot-widget.js b/ui/src/app/widget/lib/flot-widget.js index 6687f1ad8c..3076594d07 100644 --- a/ui/src/app/widget/lib/flot-widget.js +++ b/ui/src/app/widget/lib/flot-widget.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + import $ from 'jquery'; import tinycolor from 'tinycolor2'; import moment from 'moment'; @@ -34,12 +34,6 @@ export default class TbFlot { this.chartType = chartType || 'line'; var settings = ctx.settings; - if (this.chartType === 'line' && settings.smoothLines && !series.points.show) { - series.curvedLines = { - apply: true - } - } - ctx.tooltip = $('#flot-series-tooltip'); if (ctx.tooltip.length === 0) { ctx.tooltip = $("
"); From 0e31cd4cb4131405063029f25dcf2558c637453d Mon Sep 17 00:00:00 2001 From: volodymyr-babak Date: Wed, 31 May 2017 12:48:35 +0300 Subject: [PATCH 35/69] Added postgres docker contrainer Fixed build to run with sql enabled true --- .../server/ThingsboardServerApplication.java | 2 +- .../service/mail/DefaultMailService.java | 10 ++- .../src/main/resources/thingsboard.yml | 6 +- .../dao/cassandra/CassandraCluster.java | 2 + .../CassandraBaseComponentDescriptorDao.java | 2 + .../dao/sql/attributes/JpaAttributesDao.java | 46 +++++++++++++ .../JpaBaseComponentDescriptorDao.java | 9 ++- .../dao/sql/settings/JpaAdminSettingsDao.java | 9 ++- .../dao/sql/timeseries/JpaTimeseriesDao.java | 65 +++++++++++++++++++ .../CassandraBaseTimeseriesDao.java | 2 + docker/.env | 9 ++- docker/cassandra/Makefile | 2 +- docker/docker-compose.static.yml | 3 + docker/docker-compose.yml | 8 +++ docker/postgres/Dockerfile | 21 ++++++ docker/postgres/Makefile | 10 +++ docker/postgres/init-user-db.sh | 22 +++++++ docker/tb-cassandra-schema/Makefile | 2 +- docker/tb/Makefile | 2 +- docker/zookeeper/Makefile | 2 +- pom.xml | 4 ++ 21 files changed, 219 insertions(+), 19 deletions(-) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributesDao.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java create mode 100644 docker/postgres/Dockerfile create mode 100644 docker/postgres/Makefile create mode 100644 docker/postgres/init-user-db.sh diff --git a/application/src/main/java/org/thingsboard/server/ThingsboardServerApplication.java b/application/src/main/java/org/thingsboard/server/ThingsboardServerApplication.java index 5e00ac4a11..b70d9522c8 100644 --- a/application/src/main/java/org/thingsboard/server/ThingsboardServerApplication.java +++ b/application/src/main/java/org/thingsboard/server/ThingsboardServerApplication.java @@ -26,7 +26,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; import java.util.Arrays; -@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class, HibernateJpaAutoConfiguration.class}) +@EnableAutoConfiguration @SpringBootApplication @EnableSwagger2 @ComponentScan({"org.thingsboard.server"}) diff --git a/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java b/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java index d4c0decf3e..f4dfb096e3 100644 --- a/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java +++ b/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java @@ -66,9 +66,13 @@ public class DefaultMailService implements MailService { @Override public void updateMailConfiguration() { AdminSettings settings = adminSettingsService.findAdminSettingsByKey("mail"); - JsonNode jsonConfig = settings.getJsonValue(); - mailSender = createMailSender(jsonConfig); - mailFrom = jsonConfig.get("mailFrom").asText(); + if (settings != null) { + JsonNode jsonConfig = settings.getJsonValue(); + mailSender = createMailSender(jsonConfig); + mailFrom = jsonConfig.get("mailFrom").asText(); + } else { + throw new IncorrectParameterException("Failed to date mail configuration. Settings not found!"); + } } private JavaMailSenderImpl createMailSender(JsonNode jsonConfig) { diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 6bbce15a8c..c797cf1433 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -232,13 +232,13 @@ spring: data: jpa: repositories: - enabled: "false" + enabled: "true" jpa: show-sql: "false" - generate-ddl: "false" + generate-ddl: "true" database-platform: "org.hibernate.dialect.PostgreSQLDialect" hibernate: - ddl-auto: "none" + ddl-auto: "create" datasource: driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}" url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/thingsboard}" diff --git a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java index efe05f8fb8..6bffb3e3b4 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java +++ b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java @@ -25,6 +25,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; @@ -37,6 +38,7 @@ import java.util.List; @Component @Slf4j @Data +@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true") public class CassandraCluster { private static final String COMMA = ","; diff --git a/dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java b/dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java index 0426a3372a..0c7984e254 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java @@ -21,6 +21,7 @@ import com.datastax.driver.core.querybuilder.QueryBuilder; import com.datastax.driver.core.querybuilder.Select; import com.datastax.driver.core.utils.UUIDs; import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.ComponentDescriptorId; import org.thingsboard.server.common.data.page.TextPageLink; @@ -45,6 +46,7 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.select; */ @Component @Slf4j +@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) public class CassandraBaseComponentDescriptorDao extends CassandraAbstractSearchTextDao implements ComponentDescriptorDao { @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributesDao.java new file mode 100644 index 0000000000..d4f1caa369 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributesDao.java @@ -0,0 +1,46 @@ +package org.thingsboard.server.dao.sql.attributes; + +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.ResultSetFuture; +import com.google.common.util.concurrent.ListenableFuture; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +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.attributes.AttributesDao; + +import java.util.Collection; +import java.util.List; +import java.util.Optional; + +@Component +@Slf4j +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") +public class JpaAttributesDao implements AttributesDao { + + @Override + public ListenableFuture> find(EntityId entityId, String attributeType, String attributeKey) { + return null; + } + + @Override + public ListenableFuture> find(EntityId entityId, String attributeType, Collection attributeKey) { + return null; + } + + @Override + public ListenableFuture> findAll(EntityId entityId, String attributeType) { + return null; + } + + @Override + public ResultSetFuture save(EntityId entityId, String attributeType, AttributeKvEntry attribute) { + return null; + } + + @Override + public ListenableFuture> removeAll(EntityId entityId, String scope, List keys) { + return null; + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java index fec30b9d3f..bbc442e537 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java @@ -57,11 +57,14 @@ public class JpaBaseComponentDescriptorDao extends JpaAbstractSearchTextDao saveIfNotExist(ComponentDescriptor component) { + if (component.getId() == null) { + component.setId(new ComponentDescriptorId(UUID.randomUUID())); + } boolean exists = componentDescriptorRepository.findOne(component.getId().getId()) != null; - if (exists) { - return Optional.empty(); + if (!exists) { + return Optional.of(save(component)); } - return Optional.of(save(component)); + return Optional.empty(); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java index b1e2326f41..10dab03e57 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java @@ -15,8 +15,11 @@ */ package org.thingsboard.server.dao.sql.settings; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.sql.AdminSettingsEntity; @@ -27,9 +30,9 @@ import java.util.UUID; import static org.thingsboard.server.dao.model.ModelConstants.ADMIN_SETTINGS_COLUMN_FAMILY_NAME; -/** - * Created by Valerii Sosliuk on 5/6/2017. - */ +@Component +@Slf4j +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") public class JpaAdminSettingsDao extends JpaAbstractDao implements AdminSettingsDao{ @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java new file mode 100644 index 0000000000..e114d3dccd --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java @@ -0,0 +1,65 @@ +package org.thingsboard.server.dao.sql.timeseries; + +import com.datastax.driver.core.ResultSetFuture; +import com.datastax.driver.core.Row; +import com.google.common.util.concurrent.ListenableFuture; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Component; +import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.kv.TsKvEntry; +import org.thingsboard.server.common.data.kv.TsKvQuery; +import org.thingsboard.server.dao.timeseries.TimeseriesDao; + +import java.util.List; + +@Component +@Slf4j +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") +public class JpaTimeseriesDao implements TimeseriesDao { + + @Override + public long toPartitionTs(long ts) { + return 0; + } + + @Override + public ListenableFuture> findAllAsync(EntityId entityId, List queries) { + return null; + } + + @Override + public ResultSetFuture findLatest(EntityId entityId, String key) { + return null; + } + + @Override + public ResultSetFuture findAllLatest(EntityId entityId) { + return null; + } + + @Override + public ResultSetFuture save(EntityId entityId, long partition, TsKvEntry tsKvEntry) { + return null; + } + + @Override + public ResultSetFuture savePartition(EntityId entityId, long partition, String key) { + return null; + } + + @Override + public ResultSetFuture saveLatest(EntityId entityId, TsKvEntry tsKvEntry) { + return null; + } + + @Override + public TsKvEntry convertResultToTsKvEntry(Row row) { + return null; + } + + @Override + public List convertResultToTsKvEntryList(List rows) { + return null; + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java index d6c7443944..4932e60ec2 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java @@ -25,6 +25,7 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.kv.*; @@ -51,6 +52,7 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; */ @Component @Slf4j +@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implements TimeseriesDao { //@Value("${cassandra.query.min_aggregation_step_ms}") diff --git a/docker/.env b/docker/.env index 1c7e512569..7fa0ea81df 100644 --- a/docker/.env +++ b/docker/.env @@ -1,7 +1,12 @@ +# cassandra environment variables CASSANDRA_DATA_DIR=/home/docker/cassandra_volume -# cassandra schema container environment variables +# cassandra schema environment variables CREATE_SCHEMA=true ADD_SYSTEM_DATA=false ADD_DEMO_DATA=false -CASSANDRA_URL=cassandra \ No newline at end of file +CASSANDRA_URL=cassandra + +# postgres environment variables +POSTGRES_DATA_DIR=/home/docker/postgres_volume +POSTGRES_PASSWORD=postgres \ No newline at end of file diff --git a/docker/cassandra/Makefile b/docker/cassandra/Makefile index 15eb3ed04b..f277e9e543 100644 --- a/docker/cassandra/Makefile +++ b/docker/cassandra/Makefile @@ -7,4 +7,4 @@ build: push: build docker push ${PROJECT}/${APP}:${VERSION} - docker push ${PROJECT}/${APP}:latest \ No newline at end of file + docker push ${PROJECT}/${APP}:latest diff --git a/docker/docker-compose.static.yml b/docker/docker-compose.static.yml index 5471cb2339..1071a75317 100644 --- a/docker/docker-compose.static.yml +++ b/docker/docker-compose.static.yml @@ -24,3 +24,6 @@ services: zk: ports: - "2181:2181" + postgres: + ports: + - "5432:5432" \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 8367abcd9b..29f162928c 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -46,3 +46,11 @@ services: ports: - "2181" restart: always + postgres: + image: "thingsboard/postgres:1.2.4" + ports: + - "5432" + environment: + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + volumes: + - "${POSTGRES_DATA_DIR}:/var/lib/postgresql/data" \ No newline at end of file diff --git a/docker/postgres/Dockerfile b/docker/postgres/Dockerfile new file mode 100644 index 0000000000..ab997750ff --- /dev/null +++ b/docker/postgres/Dockerfile @@ -0,0 +1,21 @@ +# +# 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. +# + +FROM postgres:9.6 + +ADD init-user-db.sh /docker-entrypoint-initdb.d/init-user-db.sh + +CMD ["postgres"] \ No newline at end of file diff --git a/docker/postgres/Makefile b/docker/postgres/Makefile new file mode 100644 index 0000000000..179eb6cfc5 --- /dev/null +++ b/docker/postgres/Makefile @@ -0,0 +1,10 @@ +VERSION=1.2.4 +PROJECT=thingsboard +APP=postgres + +build: + docker build --pull -t ${PROJECT}/${APP}:${VERSION} -t ${PROJECT}/${APP}:latest . + +push: build + docker push ${PROJECT}/${APP}:${VERSION} + docker push ${PROJECT}/${APP}:latest diff --git a/docker/postgres/init-user-db.sh b/docker/postgres/init-user-db.sh new file mode 100644 index 0000000000..0efc89af45 --- /dev/null +++ b/docker/postgres/init-user-db.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# +# 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. +# + +set -e + +psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL + CREATE DATABASE thingsboard; +EOSQL \ No newline at end of file diff --git a/docker/tb-cassandra-schema/Makefile b/docker/tb-cassandra-schema/Makefile index 68625f4d2d..2262c50611 100644 --- a/docker/tb-cassandra-schema/Makefile +++ b/docker/tb-cassandra-schema/Makefile @@ -11,4 +11,4 @@ build: push: build docker push ${PROJECT}/${APP}:${VERSION} - docker push ${PROJECT}/${APP}:latest \ No newline at end of file + docker push ${PROJECT}/${APP}:latest diff --git a/docker/tb/Makefile b/docker/tb/Makefile index 0d38e51f57..b12e5a6b5d 100644 --- a/docker/tb/Makefile +++ b/docker/tb/Makefile @@ -9,4 +9,4 @@ build: push: build docker push ${PROJECT}/${APP}:${VERSION} - docker push ${PROJECT}/${APP}:latest \ No newline at end of file + docker push ${PROJECT}/${APP}:latest diff --git a/docker/zookeeper/Makefile b/docker/zookeeper/Makefile index 911c4f3320..9ac2703a3c 100644 --- a/docker/zookeeper/Makefile +++ b/docker/zookeeper/Makefile @@ -7,4 +7,4 @@ build: push: build docker push ${PROJECT}/${APP}:${VERSION} - docker push ${PROJECT}/${APP}:latest \ No newline at end of file + docker push ${PROJECT}/${APP}:latest diff --git a/pom.xml b/pom.xml index dec1e441ef..5f87e1a1a1 100755 --- a/pom.xml +++ b/pom.xml @@ -484,6 +484,10 @@ dom4j dom4j + + antlr + antlr + From 533a5d004d48dc019f8943a807226104b85611a4 Mon Sep 17 00:00:00 2001 From: volodymyr-babak Date: Wed, 31 May 2017 18:55:59 +0300 Subject: [PATCH 36/69] Added system and demo data Added docker file for postgres db schema --- .../src/main/resources/thingsboard.yml | 6 +- .../controller/ControllerTestSuite.java | 4 +- .../thingsboard/server/mqtt/MqttSuite.java | 6 +- .../server/system/SystemTestSuite.java | 4 +- .../server/dao/model/sql/DeviceEntity.java | 3 + .../JpaBaseComponentDescriptorDao.java | 4 +- .../server/dao/sql/event/JpaBaseEventDao.java | 6 +- .../resources/{ => cassandra}/demo-data.cql | 0 .../main/resources/{ => cassandra}/schema.cql | 0 .../resources/{ => cassandra}/system-data.cql | 0 dao/src/main/resources/postgres/demo-data.sql | 445 ++++++++++++++++++ dao/src/main/resources/postgres/schema.sql | 221 +++++++++ .../main/resources/postgres/system-data.sql | 302 ++++++++++++ .../thingsboard/server/dao/DaoTestSuite.java | 4 +- docker/.env | 15 +- docker/docker-compose.yml | 17 +- docker/postgres/Makefile | 10 - docker/postgres/init-user-db.sh | 22 - docker/tb-cassandra-schema/Dockerfile | 5 +- docker/tb-cassandra-schema/Makefile | 6 +- .../Dockerfile | 10 +- docker/tb-postgres-schema/Makefile | 14 + docker/tb-postgres-schema/install-schema.sh | 52 ++ 23 files changed, 1093 insertions(+), 63 deletions(-) rename dao/src/main/resources/{ => cassandra}/demo-data.cql (100%) rename dao/src/main/resources/{ => cassandra}/schema.cql (100%) rename dao/src/main/resources/{ => cassandra}/system-data.cql (100%) create mode 100644 dao/src/main/resources/postgres/demo-data.sql create mode 100644 dao/src/main/resources/postgres/schema.sql create mode 100644 dao/src/main/resources/postgres/system-data.sql delete mode 100644 docker/postgres/Makefile delete mode 100644 docker/postgres/init-user-db.sh rename docker/{postgres => tb-postgres-schema}/Dockerfile (72%) create mode 100644 docker/tb-postgres-schema/Makefile create mode 100644 docker/tb-postgres-schema/install-schema.sh diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index c797cf1433..208d9ab053 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -107,7 +107,7 @@ coap: # Cassandra driver configuration parameters cassandra: - enabled: "${CASSANDRA_ENABLED:true}" + enabled: "${CASSANDRA_ENABLED:false}" # Thingsboard cluster name cluster_name: "${CASSANDRA_CLUSTER_NAME:Thingsboard Cluster}" # Thingsboard keyspace name @@ -226,7 +226,7 @@ spring.mvc.cors: # SQL DAO Configuration sql: - enabled: "${SQL_ENABLED:false}" + enabled: "${SQL_ENABLED:true}" spring: data: @@ -238,7 +238,7 @@ spring: generate-ddl: "true" database-platform: "org.hibernate.dialect.PostgreSQLDialect" hibernate: - ddl-auto: "create" + ddl-auto: "validate" datasource: driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}" url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/thingsboard}" diff --git a/application/src/test/java/org/thingsboard/server/controller/ControllerTestSuite.java b/application/src/test/java/org/thingsboard/server/controller/ControllerTestSuite.java index 21093b3a0b..686e600ff6 100644 --- a/application/src/test/java/org/thingsboard/server/controller/ControllerTestSuite.java +++ b/application/src/test/java/org/thingsboard/server/controller/ControllerTestSuite.java @@ -31,8 +31,8 @@ public class ControllerTestSuite { @ClassRule public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(Arrays.asList( - new ClassPathCQLDataSet("schema.cql", false, false), - new ClassPathCQLDataSet("system-data.cql", false, false), + 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); diff --git a/application/src/test/java/org/thingsboard/server/mqtt/MqttSuite.java b/application/src/test/java/org/thingsboard/server/mqtt/MqttSuite.java index a1e415dfa9..c43b97bcad 100644 --- a/application/src/test/java/org/thingsboard/server/mqtt/MqttSuite.java +++ b/application/src/test/java/org/thingsboard/server/mqtt/MqttSuite.java @@ -33,9 +33,9 @@ public class MqttSuite { @ClassRule public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit( - Arrays.asList(new ClassPathCQLDataSet("schema.cql", false, false), - new ClassPathCQLDataSet("system-data.cql", false, false), - new ClassPathCQLDataSet("demo-data.cql", false, false)), + Arrays.asList(new ClassPathCQLDataSet("cassandra/schema.cql", false, false), + new ClassPathCQLDataSet("cassandra/system-data.cql", false, false), + new ClassPathCQLDataSet("cassandra/demo-data.cql", false, false)), "cassandra-test.yaml", 30000l); } diff --git a/application/src/test/java/org/thingsboard/server/system/SystemTestSuite.java b/application/src/test/java/org/thingsboard/server/system/SystemTestSuite.java index f3297d6f52..cb2ef56318 100644 --- a/application/src/test/java/org/thingsboard/server/system/SystemTestSuite.java +++ b/application/src/test/java/org/thingsboard/server/system/SystemTestSuite.java @@ -33,7 +33,7 @@ public class SystemTestSuite { @ClassRule public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit(Arrays.asList( - new ClassPathCQLDataSet("schema.cql", false, false), - new ClassPathCQLDataSet("system-data.cql", false, false)), + new ClassPathCQLDataSet("cassandra/schema.cql", false, false), + new ClassPathCQLDataSet("cassandra/system-data.cql", false, false)), "cassandra-test.yaml", 30000l); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java index 0504ccf903..abcd5a71f3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java @@ -57,6 +57,9 @@ public final class DeviceEntity implements SearchTextEntity { @Column(name = ModelConstants.DEVICE_CUSTOMER_ID_PROPERTY) private UUID customerId; + @Column(name = ModelConstants.DEVICE_TYPE_PROPERTY) + private String type; + @Column(name = ModelConstants.DEVICE_NAME_PROPERTY) private String name; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java index bbc442e537..c94e042488 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.sql.component; +import com.datastax.driver.core.utils.UUIDs; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; @@ -26,7 +27,6 @@ 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.component.ComponentDescriptorDao; -import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.sql.ComponentDescriptorEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; @@ -58,7 +58,7 @@ public class JpaBaseComponentDescriptorDao extends JpaAbstractSearchTextDao saveIfNotExist(ComponentDescriptor component) { if (component.getId() == null) { - component.setId(new ComponentDescriptorId(UUID.randomUUID())); + component.setId(new ComponentDescriptorId(UUIDs.timeBased())); } boolean exists = componentDescriptorRepository.findOne(component.getId().getId()) != null; if (!exists) { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java index efe5908f43..9cde87e8f8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java @@ -28,6 +28,7 @@ import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.Event; 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.event.EventDao; @@ -44,7 +45,6 @@ import java.util.Optional; import java.util.UUID; import static org.springframework.data.jpa.domain.Specifications.where; -import static org.thingsboard.server.dao.model.ModelConstants.EVENT_COLUMN_FAMILY_NAME; import static org.thingsboard.server.dao.model.ModelConstants.ID_PROPERTY; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @@ -73,6 +73,10 @@ public class JpaBaseEventDao extends JpaAbstractSearchTimeDao= 100"}} + ]', + '{"clazz":"org.thingsboard.server.extensions.core.processor.AlarmDeduplicationProcessor", "name": "AlarmDeduplicationProcessor", "configuration":{ + "alarmIdTemplate": "[$date.get(''yyyy-MM-dd HH:mm'')] Device $cs.get(''serialNumber'')($cs.get(''model'')) temperature is high!", + "alarmBodyTemplate": "[$date.get(''yyyy-MM-dd HH:mm:ss'')] Device $cs.get(''serialNumber'')($cs.get(''model'')) temperature is $temp.valueAsString!" + }}', + '{"clazz":"org.thingsboard.server.extensions.core.action.mail.SendMailAction", "name":"Send Mail Action", "configuration":{ + "sendFlag": "isNewAlarm", + "fromTemplate": "thingsboard@gmail.com", + "toTemplate": "thingsboard@gmail.com", + "subjectTemplate": "$alarmId", + "bodyTemplate": "$alarmBody" + }}' +); + +INSERT INTO public.rule ( id, tenant_id, name, plugin_token, state, search_text, weight, filters, processor, action) +VALUES ( + '2346416c-4614-11e7-a919-92ebcb67fe33', + '041800f6-4613-11e7-a919-92ebcb67fe33', + 'Demo Alarm Rule', + 'mail', + 'ACTIVE', + 'demo alarm rule', + 0, + '[{"clazz":"org.thingsboard.server.extensions.core.filter.MsgTypeFilter", "name":"MsgTypeFilter", "configuration": {"messageTypes":["POST_TELEMETRY","POST_ATTRIBUTES","GET_ATTRIBUTES"]}} + , + {"clazz":"org.thingsboard.server.extensions.core.filter.DeviceTelemetryFilter", "name":"Temperature filter", "configuration": {"filter":"typeof temperature !== ''undefined'' && temperature >= 100"}} + ]', + '{"clazz":"org.thingsboard.server.extensions.core.processor.AlarmDeduplicationProcessor", "name": "AlarmDeduplicationProcessor", "configuration":{ + "alarmIdTemplate": "[$date.get(''yyyy-MM-dd HH:mm'')] Device $cs.get(''serialNumber'')($cs.get(''model'')) temperature is high!", + "alarmBodyTemplate": "[$date.get(''yyyy-MM-dd HH:mm:ss'')] Device $cs.get(''serialNumber'')($cs.get(''model'')) temperature is $temperature.valueAsString!" + }}', + '{"clazz":"org.thingsboard.server.extensions.core.action.mail.SendMailAction", "name":"Send Mail Action", "configuration":{ + "sendFlag": "isNewAlarm", + "fromTemplate": "thingsboard@gmail.com", + "toTemplate": "thingsboard@gmail.com", + "subjectTemplate": "$alarmId", + "bodyTemplate": "$alarmBody" + }}' +); + +INSERT INTO public.rule ( id, tenant_id, name, plugin_token, state, search_text, weight, filters, processor, action) +VALUES ( + '9fa09bd0-4615-11e7-a919-92ebcb67fe33', + '041800f6-4613-11e7-a919-92ebcb67fe33', + 'Demo getTime RPC Rule', + 'time', + 'ACTIVE', + 'demo alarm rule', + 0, + '[{"configuration":{"messageTypes":["RPC_REQUEST"]},"name":"RPC Request Filter","clazz":"org.thingsboard.server.extensions.core.filter.MsgTypeFilter"},{"configuration":{"methodNames":[{"name":"getTime"}]},"name":"getTime method filter","clazz":"org.thingsboard.server.extensions.core.filter.MethodNameFilter"}]', + null, + '{"configuration":{},"clazz":"org.thingsboard.server.extensions.core.action.rpc.RpcPluginAction","name":"getTimeAction"}' +); + +INSERT INTO public.rule ( id, tenant_id, name, plugin_token, state, search_text, weight, filters, processor, action) +VALUES ( + '2cb5b3d6-4614-11e7-a919-92ebcb67fe33', + '041800f6-4613-11e7-a919-92ebcb67fe33', + 'Demo Messaging RPC Rule', + 'messaging', + 'ACTIVE', + 'demo messaging rpc rule', + 0, + '[{"configuration":{"messageTypes":["RPC_REQUEST"]},"name":"RPC Request Filter","clazz":"org.thingsboard.server.extensions.core.filter.MsgTypeFilter"},{"configuration":{"methodNames":[{"name":"getDevices"},{"name":"sendMsg"}]},"name":"Messaging methods filter","clazz":"org.thingsboard.server.extensions.core.filter.MethodNameFilter"}]', + null, + '{"configuration":{},"clazz":"org.thingsboard.server.extensions.core.action.rpc.RpcPluginAction","name":"Messaging RPC Action"}' +); + +/** Demo dashboards **/ + +INSERT INTO public.dashboard ( id, tenant_id, customer_id, configuration, title, search_text) +VALUES ( + '37337276-4614-11e7-a919-92ebcb67fe33', + '041800f6-4613-11e7-a919-92ebcb67fe33', + '13814000-1dd2-11b2-8080-808080808080', + '{"description":"Demo dashboard for sample applications that upload temperature and humidity received from DHT11 or DHT22 sensors","widgets":[{"isSystemType":true,"bundleAlias":"digital_gauges","typeAlias":"digital_thermometer","type":"latest","title":"New widget","sizeX":5,"sizeY":5,"config":{"datasources":[{"type":"device","dataKeys":[{"name":"temperature","type":"timeseries","label":"temperature","color":"#2196f3","settings":{},"_hash":0.3720839051412099}],"deviceAliasId":1,"name":"DHT11"}],"timewindow":{"realtime":{"timewindowMs":60000}},"showTitle":false,"backgroundColor":"#000000","color":"rgba(0, 0, 0, 0.87)","padding":"0px","settings":{"maxValue":50,"donutStartAngle":90,"showValue":true,"showMinMax":true,"gaugeWidthScale":1,"levelColors":["#304ffe","#7e57c2","#ff4081","#d32f2f"],"refreshAnimationType":"<>","refreshAnimationTime":700,"startAnimationType":"<>","startAnimationTime":700,"titleFont":{"family":"RobotoDraft","size":12,"style":"normal","weight":"500"},"labelFont":{"family":"RobotoDraft","size":8,"style":"normal","weight":"500"},"valueFont":{"family":"Segment7Standard","style":"normal","weight":"500","size":18},"minMaxFont":{"family":"Segment7Standard","size":12,"style":"normal","weight":"500"},"dashThickness":1.5,"decimals":0,"minValue":0,"units":"°C","gaugeColor":"#333333","neonGlowBrightness":35,"gaugeType":"donut","showTitle":false},"title":"Temperature"},"row":0,"col":0},{"isSystemType":true,"bundleAlias":"digital_gauges","typeAlias":"digital_vertical_bar","type":"latest","title":"New widget","sizeX":3,"sizeY":5,"config":{"datasources":[{"type":"device","dataKeys":[{"name":"humidity","type":"timeseries","label":"humidity","color":"#2196f3","settings":{},"_hash":0.9492802776509441}],"deviceAliasId":"1","name":"DHT11"}],"timewindow":{"realtime":{"timewindowMs":60000}},"showTitle":false,"backgroundColor":"#000000","color":"rgba(0, 0, 0, 0.87)","padding":"0px","settings":{"maxValue":100,"donutStartAngle":90,"showValue":true,"showMinMax":true,"gaugeWidthScale":0.75,"levelColors":["#3d5afe","#f44336"],"refreshAnimationType":"<>","refreshAnimationTime":700,"startAnimationType":"<>","startAnimationTime":700,"titleFont":{"family":"RobotoDraft","size":12,"style":"normal","weight":"500"},"labelFont":{"family":"RobotoDraft","size":8,"style":"normal","weight":"500"},"valueFont":{"family":"Segment7Standard","style":"normal","weight":"500","size":14},"minMaxFont":{"family":"Segment7Standard","size":8,"style":"normal","weight":"normal","color":"#cccccc"},"neonGlowBrightness":20,"decimals":0,"showUnitTitle":true,"gaugeColor":"#171a1c","gaugeType":"verticalBar","showTitle":false,"minValue":0,"dashThickness":1.2},"title":"Humidity"},"row":0,"col":5}],"deviceAliases":{"1":{"alias":"DHT11","deviceId":"c8f1a6f0-b993-11e6-8a04-9ff4e1b7933c"}}}', + 'Temperature & Humidity Demo Dashboard', + 'temperature & humidity demo dashboard' +); + +INSERT INTO public.dashboard ( id, tenant_id, customer_id, configuration, title, search_text) +VALUES ( + '3c144c3e-4614-11e7-a919-92ebcb67fe33', + '041800f6-4613-11e7-a919-92ebcb67fe33', + '13814000-1dd2-11b2-8080-808080808080', + '{"description":"Demo dashboard for Raspberry PI GPIO Demo","widgets":[{"isSystemType":true,"bundleAlias":"gpio_widgets","typeAlias":"raspberry_pi_gpio_control","type":"rpc","title":"New widget","sizeX":6,"sizeY":10,"config":{"targetDeviceAliases":[],"showTitle":true,"backgroundColor":"#fff","color":"rgba(0, 0, 0, 0.87)","padding":"0px","settings":{"parseGpioStatusFunction":"return body[pin] === true;","gpioStatusChangeRequest":{"method":"setGpioStatus","paramsBody":"{\n \"pin\": \"{$pin}\",\n \"enabled\": \"{$enabled}\"\n}"},"requestTimeout":500,"switchPanelBackgroundColor":"#008a00","gpioStatusRequest":{"method":"getGpioStatus","paramsBody":"{}"},"gpioList":[{"pin":7,"label":"GPIO 4 (GPCLK0)","row":3,"col":0,"_uniqueKey":0},{"pin":11,"label":"GPIO 17","row":5,"col":0,"_uniqueKey":1},{"pin":12,"label":"GPIO 18","row":5,"col":1,"_uniqueKey":2},{"_uniqueKey":3,"pin":13,"label":"GPIO 27","row":6,"col":0},{"_uniqueKey":4,"pin":15,"label":"GPIO 22","row":7,"col":0},{"_uniqueKey":5,"pin":16,"label":"GPIO 23","row":7,"col":1},{"_uniqueKey":6,"pin":18,"label":"GPIO 24","row":8,"col":1},{"_uniqueKey":7,"pin":22,"label":"GPIO 25","row":10,"col":1},{"_uniqueKey":8,"pin":29,"label":"GPIO 5","row":14,"col":0},{"_uniqueKey":9,"pin":31,"label":"GPIO 6","row":15,"col":0},{"_uniqueKey":10,"pin":32,"label":"GPIO 12","row":15,"col":1},{"_uniqueKey":11,"pin":33,"label":"GPIO 13","row":16,"col":0},{"_uniqueKey":12,"pin":35,"label":"GPIO 19","row":17,"col":0},{"_uniqueKey":13,"pin":36,"label":"GPIO 16","row":17,"col":1},{"_uniqueKey":14,"pin":37,"label":"GPIO 26","row":18,"col":0},{"_uniqueKey":15,"pin":38,"label":"GPIO 20","row":18,"col":1},{"_uniqueKey":16,"pin":40,"label":"GPIO 21","row":19,"col":1}]},"title":"Raspberry Pi GPIO Control Panel","datasources":[],"targetDeviceAliasIds":["1"]},"row":0,"col":0},{"isSystemType":true,"bundleAlias":"gpio_widgets","typeAlias":"raspberry_pi_gpio_panel","type":"latest","title":"New widget","sizeX":7,"sizeY":10,"config":{"showTitle":true,"backgroundColor":"#fff","color":"rgba(0, 0, 0, 0.87)","padding":"0px","settings":{"gpioList":[{"pin":1,"label":"3.3V","row":0,"col":0,"color":"#fc9700","_uniqueKey":0},{"pin":2,"label":"5V","row":0,"col":1,"color":"#fb0000","_uniqueKey":1},{"pin":3,"label":"GPIO 2 (I2C1_SDA)","row":1,"col":0,"color":"#02fefb","_uniqueKey":2},{"color":"#fb0000","pin":4,"label":"5V","row":1,"col":1},{"color":"#02fefb","pin":5,"label":"GPIO 3 (I2C1_SCL)","row":2,"col":0},{"color":"#000000","pin":6,"label":"GND","row":2,"col":1},{"color":"#00fd00","pin":7,"label":"GPIO 4 (GPCLK0)","row":3,"col":0},{"color":"#fdfb00","pin":8,"label":"GPIO 14 (UART_TXD)","row":3,"col":1},{"color":"#000000","pin":9,"label":"GND","row":4,"col":0},{"color":"#fdfb00","pin":10,"label":"GPIO 15 (UART_RXD)","row":4,"col":1},{"color":"#00fd00","pin":11,"label":"GPIO 17","row":5,"col":0},{"color":"#00fd00","pin":12,"label":"GPIO 18","row":5,"col":1},{"color":"#00fd00","pin":13,"label":"GPIO 27","row":6,"col":0},{"color":"#000000","pin":14,"label":"GND","row":6,"col":1},{"color":"#00fd00","pin":15,"label":"GPIO 22","row":7,"col":0},{"color":"#00fd00","pin":16,"label":"GPIO 23","row":7,"col":1},{"color":"#fc9700","pin":17,"label":"3.3V","row":8,"col":0},{"color":"#00fd00","pin":18,"label":"GPIO 24","row":8,"col":1},{"color":"#fd01fd","pin":19,"label":"GPIO 10 (SPI_MOSI)","row":9,"col":0},{"color":"#000000","pin":20,"label":"GND","row":9,"col":1},{"color":"#fd01fd","pin":21,"label":"GPIO 9 (SPI_MISO)","row":10,"col":0},{"color":"#00fd00","pin":22,"label":"GPIO 25","row":10,"col":1},{"color":"#fd01fd","pin":23,"label":"GPIO 11 (SPI_SCLK)","row":11,"col":0},{"color":"#fd01fd","pin":24,"label":"GPIO 8 (SPI_CE0)","row":11,"col":1},{"color":"#000000","pin":25,"label":"GND","row":12,"col":0},{"color":"#fd01fd","pin":26,"label":"GPIO 7 (SPI_CE1)","row":12,"col":1},{"color":"#ffffff","pin":27,"label":"ID_SD","row":13,"col":0},{"color":"#ffffff","pin":28,"label":"ID_SC","row":13,"col":1},{"color":"#00fd00","pin":29,"label":"GPIO 5","row":14,"col":0},{"color":"#000000","pin":30,"label":"GND","row":14,"col":1},{"color":"#00fd00","pin":31,"label":"GPIO 6","row":15,"col":0},{"color":"#00fd00","pin":32,"label":"GPIO 12","row":15,"col":1},{"color":"#00fd00","pin":33,"label":"GPIO 13","row":16,"col":0},{"color":"#000000","pin":34,"label":"GND","row":16,"col":1},{"color":"#00fd00","pin":35,"label":"GPIO 19","row":17,"col":0},{"color":"#00fd00","pin":36,"label":"GPIO 16","row":17,"col":1},{"color":"#00fd00","pin":37,"label":"GPIO 26","row":18,"col":0},{"color":"#00fd00","pin":38,"label":"GPIO 20","row":18,"col":1},{"color":"#000000","pin":39,"label":"GND","row":19,"col":0},{"color":"#00fd00","pin":40,"label":"GPIO 21","row":19,"col":1}],"ledPanelBackgroundColor":"#008a00"},"title":"Raspberry Pi GPIO Status Panel","datasources":[{"type":"device","dataKeys":[{"name":"7","type":"attribute","label":"7","color":"#2196f3","settings":{},"_hash":0.20925966435886978},{"name":"11","type":"attribute","label":"11","color":"#4caf50","settings":{},"_hash":0.330267349594344},{"name":"12","type":"attribute","label":"12","color":"#f44336","settings":{},"_hash":0.5040578704481748},{"name":"13","type":"attribute","label":"13","color":"#ffc107","settings":{},"_hash":0.588956328191639},{"name":"15","type":"attribute","label":"15","color":"#607d8b","settings":{},"_hash":0.9229040530336119},{"name":"16","type":"attribute","label":"16","color":"#9c27b0","settings":{},"_hash":0.8692315253041654},{"name":"18","type":"attribute","label":"18","color":"#8bc34a","settings":{},"_hash":0.41465562857521543},{"name":"22","type":"attribute","label":"22","color":"#3f51b5","settings":{},"_hash":0.36135260043112827},{"name":"29","type":"attribute","label":"29","color":"#e91e63","settings":{},"_hash":0.9904592276182183},{"name":"31","type":"attribute","label":"31","color":"#ffeb3b","settings":{},"_hash":0.038330985429919195},{"name":"32","type":"attribute","label":"32","color":"#03a9f4","settings":{},"_hash":0.4334683890135089},{"name":"33","type":"attribute","label":"33","color":"#ff9800","settings":{},"_hash":0.6487255992492305},{"name":"35","type":"attribute","label":"35","color":"#673ab7","settings":{},"_hash":0.971555321150732},{"name":"36","type":"attribute","label":"36","color":"#cddc39","settings":{},"_hash":0.7826129728424382},{"name":"37","type":"attribute","label":"37","color":"#009688","settings":{},"_hash":0.44925676517537627},{"name":"38","type":"attribute","label":"38","color":"#795548","settings":{},"_hash":0.051518155759787465},{"name":"40","type":"attribute","label":"40","color":"#00bcd4","settings":{},"_hash":0.8733296686871144}],"deviceAliasId":1,"name":"RPi"}],"timewindow":{"realtime":{"timewindowMs":60000}}},"row":0,"col":6}],"deviceAliases":{"1":{"alias":"RPi","deviceId":"c8f1a6f0-b993-11e6-8a04-9ff4e1b7933d"}}}', + 'Raspberry PI GPIO Demo Dashboard', + 'raspberry pi gpio demo dashboard' +); \ No newline at end of file diff --git a/dao/src/main/resources/postgres/schema.sql b/dao/src/main/resources/postgres/schema.sql new file mode 100644 index 0000000000..96d0b8f863 --- /dev/null +++ b/dao/src/main/resources/postgres/schema.sql @@ -0,0 +1,221 @@ +-- +-- 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. +-- +SET statement_timeout = 0; +SET lock_timeout = 0; +SET idle_in_transaction_session_timeout = 0; +SET client_encoding = 'UTF8'; +SET standard_conforming_strings = on; +SET check_function_bodies = false; +SET client_min_messages = warning; +SET row_security = off; + +SET search_path = public, pg_catalog; +SET default_tablespace = ''; +SET default_with_oids = false; + +CREATE TABLE IF NOT EXISTS admin_settings ( + id uuid NOT NULL CONSTRAINT admin_settings_pkey PRIMARY KEY, + json_value jsonb, + key character varying(255) +); +ALTER TABLE admin_settings OWNER TO postgres; + +CREATE TABLE IF NOT EXISTS alarm ( + id uuid NOT NULL CONSTRAINT alarm_pkey PRIMARY KEY, + ack_ts bigint, + clear_ts bigint, + additional_info jsonb, + end_ts bigint, + originator_id uuid, + originator_type integer, + propagate boolean, + severity character varying(255), + start_ts bigint, + status character varying(255), + tenant_id uuid, + type character varying(255) +); +ALTER TABLE alarm OWNER TO postgres; + +CREATE TABLE IF NOT EXISTS asset ( + id uuid NOT NULL CONSTRAINT asset_pkey PRIMARY KEY, + additional_info jsonb, + customer_id uuid, + name character varying(255), + search_text character varying(255), + tenant_id uuid, + type character varying(255) +); +ALTER TABLE asset OWNER TO postgres; + +CREATE TABLE IF NOT EXISTS component_descriptor ( + id uuid NOT NULL CONSTRAINT component_descriptor_pkey PRIMARY KEY, + actions character varying(255), + clazz character varying(255), + configuration_descriptor jsonb, + name character varying(255), + scope character varying(255), + search_text character varying(255), + type character varying(255) +); +ALTER TABLE component_descriptor OWNER TO postgres; + +CREATE TABLE IF NOT EXISTS customer ( + id uuid NOT NULL CONSTRAINT customer_pkey PRIMARY KEY, + additional_info jsonb, + address character varying(255), + address2 character varying(255), + city character varying(255), + country character varying(255), + email character varying(255), + phone character varying(255), + search_text character varying(255), + state character varying(255), + tenant_id uuid, + title character varying(255), + zip character varying(255) +); +ALTER TABLE customer OWNER TO postgres; + +CREATE TABLE IF NOT EXISTS dashboard ( + id uuid NOT NULL CONSTRAINT dashboard_pkey PRIMARY KEY, + configuration jsonb, + customer_id uuid, + search_text character varying(255), + tenant_id uuid, + title character varying(255) +); +ALTER TABLE dashboard OWNER TO postgres; + +CREATE TABLE IF NOT EXISTS device ( + id uuid NOT NULL CONSTRAINT device_pkey PRIMARY KEY, + additional_info jsonb, + customer_id uuid, + type character varying(255), + name character varying(255), + search_text character varying(255), + tenant_id uuid +); +ALTER TABLE device OWNER TO postgres; + +CREATE TABLE IF NOT EXISTS device_credentials ( + id uuid NOT NULL CONSTRAINT device_credentials_pkey PRIMARY KEY, + credentials_id character varying(255), + credentials_type character varying(255), + credentials_value character varying(255), + device_id uuid +); +ALTER TABLE device_credentials OWNER TO postgres; + +CREATE TABLE IF NOT EXISTS event ( + id uuid NOT NULL CONSTRAINT event_pkey PRIMARY KEY, + body jsonb, + entity_id uuid, + entity_type character varying(255), + event_type character varying(255), + event_uid character varying(255), + tenant_id uuid +); +ALTER TABLE event OWNER TO postgres; + +CREATE TABLE IF NOT EXISTS plugin ( + id uuid NOT NULL CONSTRAINT plugin_pkey PRIMARY KEY, + additional_info jsonb, + api_token character varying(255), + plugin_class character varying(255), + configuration jsonb, + name character varying(255), + public_access boolean, + search_text character varying(255), + state character varying(255), + tenant_id uuid +); +ALTER TABLE plugin OWNER TO postgres; + +CREATE TABLE IF NOT EXISTS rule ( + id uuid NOT NULL CONSTRAINT rule_pkey PRIMARY KEY, + action jsonb, + additional_info jsonb, + filters jsonb, + name character varying(255), + plugin_token character varying(255), + processor jsonb, + search_text character varying(255), + state character varying(255), + tenant_id uuid, + weight integer +); +ALTER TABLE rule OWNER TO postgres; + +CREATE TABLE IF NOT EXISTS tb_user ( + id uuid NOT NULL CONSTRAINT tb_user_pkey PRIMARY KEY, + additional_info jsonb, + authority character varying(255), + customer_id uuid, + email character varying(255) UNIQUE, + first_name character varying(255), + last_name character varying(255), + search_text character varying(255), + tenant_id uuid +); +ALTER TABLE tb_user OWNER TO postgres; + +CREATE TABLE IF NOT EXISTS tenant ( + id uuid NOT NULL CONSTRAINT tenant_pkey PRIMARY KEY, + additional_info jsonb, + address character varying(255), + address2 character varying(255), + city character varying(255), + country character varying(255), + email character varying(255), + phone character varying(255), + region character varying(255), + search_text character varying(255), + state character varying(255), + title character varying(255), + zip character varying(255) +); +ALTER TABLE tenant OWNER TO postgres; + +CREATE TABLE IF NOT EXISTS user_credentials ( + id uuid NOT NULL CONSTRAINT user_credentials_pkey PRIMARY KEY, + activate_token character varying(255) UNIQUE, + enabled boolean, + password character varying(255), + reset_token character varying(255) UNIQUE, + user_id uuid UNIQUE +); +ALTER TABLE user_credentials OWNER TO postgres; + +CREATE TABLE IF NOT EXISTS widget_type ( + id uuid NOT NULL CONSTRAINT widget_type_pkey PRIMARY KEY, + alias character varying(255), + bundle_alias character varying(255), + descriptor jsonb, + name character varying(255), + tenant_id uuid +); +ALTER TABLE widget_type OWNER TO postgres; + +CREATE TABLE IF NOT EXISTS widgets_bundle ( + id uuid NOT NULL CONSTRAINT widgets_bundle_pkey PRIMARY KEY, + alias character varying(255), + image bytea, + search_text character varying(255), + tenant_id uuid, + title character varying(255) +); +ALTER TABLE widgets_bundle OWNER TO postgres; diff --git a/dao/src/main/resources/postgres/system-data.sql b/dao/src/main/resources/postgres/system-data.sql new file mode 100644 index 0000000000..2b69fdfe02 --- /dev/null +++ b/dao/src/main/resources/postgres/system-data.sql @@ -0,0 +1,302 @@ +-- +-- 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. +-- + +/** SYSTEM **/ + +/** System admin **/ +INSERT INTO public.tb_user ( id, tenant_id, customer_id, email, search_text, authority ) +VALUES ( '5a797660-4612-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', '13814000-1dd2-11b2-8080-808080808080', 'sysadmin@thingsboard.org', + 'sysadmin@thingsboard.org', 'SYS_ADMIN' ); + +INSERT INTO public.user_credentials ( id, user_id, enabled, password ) +VALUES ( '61441950-4612-11e7-a919-92ebcb67fe33', '5a797660-4612-11e7-a919-92ebcb67fe33', true, + '$2a$10$5JTB8/hxWc9WAy62nCGSxeefl3KWmipA9nFpVdDa0/xfIseeBB4Bu' ); + +/** System settings **/ +INSERT INTO public.admin_settings ( id, key, json_value ) +VALUES ( '6a2266e4-4612-11e7-a919-92ebcb67fe33', 'general', '{ + "baseUrl": "http://localhost:8080" +}' ); + +INSERT INTO public.admin_settings ( id, key, json_value ) +VALUES ( '6eaaefa6-4612-11e7-a919-92ebcb67fe33', 'mail', '{ + "mailFrom": "Thingsboard ", + "smtpProtocol": "smtp", + "smtpHost": "localhost", + "smtpPort": "25", + "timeout": "10000", + "enableTls": "false", + "username": "", + "password": "" +}' ); + +/** System widgets library **/ +INSERT INTO public.widgets_bundle ( "id", "tenant_id", "alias", "search_text", "title" ) +VALUES ( '720d2788-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'gpio_widgets', 'gpio widgets', 'GPIO widgets' ); + +INSERT INTO public.widgets_bundle ( "id", "tenant_id", "alias", "search_text", "title" ) +VALUES ( '75d009da-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'maps', 'maps', 'Maps' ); + +INSERT INTO public.widgets_bundle ( "id", "tenant_id", "alias", "search_text", "title" ) +VALUES ( '7b2bf538-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', 'digital gauges', 'Digital gauges' ); + +INSERT INTO public.widgets_bundle ( "id", "tenant_id", "alias", "search_text", "title" ) +VALUES ( '7ec2783e-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'charts', 'Charts' ); + +INSERT INTO public.widgets_bundle ( "id", "tenant_id", "alias", "search_text", "title" ) +VALUES ( '82ded5f2-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'cards', 'cards', 'Cards' ); + +INSERT INTO public.widgets_bundle ( "id", "tenant_id", "alias", "search_text", "title" ) +VALUES ( '85a1fa1c-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'analogue_gauges', 'analogue gauges', 'Analogue gauges' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( '89ab3f2e-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'timeseries', + '{"type":"timeseries","sizeX":8,"sizeY":5,"resources":[{"url":"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.4.0/Chart.min.js"}],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n \n var lineData = {\n labels: [],\n datasets: []\n };\n \n for (var i=0; i < self.ctx.data.length; i++) {\n var dataKey = self.ctx.data[i].dataKey;\n var keySettings = dataKey.settings;\n var backgroundColor = tinycolor(dataKey.color);\n backgroundColor.setAlpha(0.4);\n var dataset = {\n label: dataKey.label,\n data: [],\n borderColor: dataKey.color,\n borderWidth: 2,\n backgroundColor: backgroundColor.toRgbString(),\n pointRadius: keySettings.showPoints ? 1 : 0,\n fill: keySettings.fillLines || false,\n showLine: keySettings.showLines || true,\n spanGaps: false,\n lineTension: angular.isDefined(keySettings.tension) ? keySettings.tension : 0.2\n }\n lineData.datasets.push(dataset);\n }\n\n var ctx = $(''#lineChart'', self.ctx.$container);\n self.ctx.chart = new Chart(ctx, {\n type: ''line'',\n data: lineData,\n options: {\n responsive: false,\n tooltips: {\n mode: ''index'',\n inersect: true\n },\n hover: {\n mode: ''index'',\n inersect: true\n },\n maintainAspectRatio: false,\n /*animation: {\n duration: 200,\n easing: ''linear''\n },*/\n elements: {\n line: {\n tension: 0.2\n } \n },\n scales: {\n xAxes: [{\n type: ''time'',\n ticks: {\n maxRotation: 20,\n autoSkip: true\n },\n time: {\n displayFormats: {\n second: ''hh:mm:ss'',\n minute: ''hh:mm:ss''\n }\n }\n }]\n },\n zoom: {\n onSelect: function(startTimeMs, endTimeMs) {\n self.ctx.timewindowFunctions.onUpdateTimewindow(startTimeMs, endTimeMs);\n },\n onResetSelect: function() {\n self.ctx.timewindowFunctions.onResetTimewindow();\n }\n }\n }\n });\n \n self.onResize();\n \n}\n\nself.onDataUpdated = function() {\n \n if (self.ctx.chart.zoom.isMouseInteraction) {\n return;\n }\n if (!self.ctx.tickUpdate) {\n for (var i = 0; i < self.ctx.data.length; i++) {\n var dataSetData = [];\n var dataKeyData = self.ctx.data[i].data;\n for (var i2 = 0; i2 < dataKeyData.length; i2 ++) {\n dataSetData.push({x: moment(dataKeyData[i2][0]), y: dataKeyData[i2][1]});\n \n }\n self.ctx.chart.data.datasets[i].data = dataSetData; \n }\n }\n \n self.ctx.chart.options.scales.xAxes[0].time.min = moment(self.ctx.timeWindow.minTime);\n self.ctx.chart.options.scales.xAxes[0].time.max = moment(self.ctx.timeWindow.maxTime);\n \n self.ctx.chart.update(0, true);\n\n}\n\nself.onResize = function() {\n self.ctx.chart.resize();\n self.ctx.chart.update(0, true);\n}\n\nself.onDestroy = function() {\n}\n\nfunction getYAxis(chartInstance) {\n var scales = chartInstance.scales;\n for (var scaleId in scales) {\n\t var scale = scales[scaleId];\n\n\t if (!scale.isHorizontal()) {\n\t\t return scale;\n\t }\n }\n}\n\nfunction getXAxis(chartInstance) {\n var scales = chartInstance.scales;\n for (var scaleId in scales) {\n\t var scale = scales[scaleId];\n\n\t if (scale.isHorizontal()) {\n\t\t return scale;\n\t }\n }\n}\n\nfunction eventPointer (e) {\n if (angular.isDefined(e.touches) && e.touches.length > 0) {\n return {\n x : e.touches[0].pageX,\n y : e.touches[0].pageY\n };\n } else if (angular.isDefined(e.changedTouches) && e.changedTouches.length > 0) {\n return {\n x : e.changedTouches[0].pageX,\n y : e.changedTouches[0].pageY\n };\n } else if (e.pageX || e.pageY) {\n return {\n x : e.pageX,\n y : e.pageY\n };\n } else if (e.clientX || e.clientY) {\n var\n d = document,\n b = d.body,\n de = d.documentElement;\n return {\n x: e.clientX + b.scrollLeft + de.scrollLeft,\n y: e.clientY + b.scrollTop + de.scrollTop\n };\n }\n}\n\nvar zoomPlugin = {\n beforeInit: function(chartInstance) {\n chartInstance.zoom = {};\n var node = chartInstance.zoom.node = chartInstance.chart.ctx.canvas;\n \n chartInstance.zoom.mouseDownHandler = function(event) {\n chartInstance.zoom.dragZoomStart = event;\n chartInstance.zoom.dragZoomStartPointer = eventPointer(event);\n chartInstance.zoom.isMouseInteraction = true;\n };\n\n node.addEventListener(''mousedown'', chartInstance.zoom.mouseDownHandler);\n \n chartInstance.zoom.mouseMoveHandler = function(event) {\n if (chartInstance.zoom.dragZoomStart) {\n chartInstance.update(0);\n chartInstance.zoom.dragZoomEnd = event;\n chartInstance.zoom.dragZoomEndPointer = eventPointer(event);\n }\n };\n \n node.addEventListener(''mousemove'', chartInstance.zoom.mouseMoveHandler);\n \n chartInstance.zoom.mouseUpHandler = function(event) {\n if (chartInstance.zoom.dragZoomStart) {\n \n var chartArea = chartInstance.chartArea;\n var yAxis = getYAxis(chartInstance);\n\t\t\t\t\tvar beginPoint = chartInstance.zoom.dragZoomStart;\n\t\t\t\t\tvar beginPointer = chartInstance.zoom.dragZoomStartPointer;\n\t\t\t\t\tvar upEventPointer = eventPointer(event);\n\t\t\t\t\tvar offsetX = beginPoint.target.getBoundingClientRect().left;\n\t\t\t\t\tvar startX = Math.min(beginPointer.x, upEventPointer.x) - offsetX;\n\t\t\t\t\tvar endX = Math.max(beginPointer.x, upEventPointer.x) - offsetX;\n\t\t\t\t\tvar dragDistance = endX - startX;\n\t\t\t\t\t\n\t\t\t\t\tif (dragDistance > 0) {\n \t\t\t\t\tvar xAxis = getXAxis(chartInstance);\n \t\t\t\t\tvar options = chartInstance.options;\n \t\t\t\t\tif (options.scales.xAxes[0].time) {\n \t\t\t\t\t startX = Math.max(startX, xAxis.left);\n \t\t\t\t\t endX = Math.min(endX, xAxis.right);\n \t\t\t\t\t if (endX - startX > 0) {\n \t\t\t\t\t startX = startX - xAxis.left;\n \t\t\t\t\t endX = endX - xAxis.left;\n \t\t\t\t\t var time = options.scales.xAxes[0].time;\n \t\t\t\t\t var min = time.min.valueOf();\n \t\t\t\t\t var max = time.max.valueOf();\n \t\t\t\t\t var axisDistance = xAxis.right - xAxis.left;\n \t\t\t\t\t var timeDistance = max - min;\n \t\t\t\t\t \n \t\t\t\t\t var zoomStartTime = min + startX / axisDistance * timeDistance;\n \t\t\t\t\t var zoomEndTime = min + endX / axisDistance * timeDistance;\n\n \t\t\t\t\t if (options.zoom && options.zoom.onSelect) {\n \t\t\t\t\t options.zoom.onSelect(zoomStartTime, zoomEndTime);\n \t\t\t\t\t }\n \t\t\t\t\t }\n \t\t\t\t\t}\n\t\t\t\t\t}\n \t\t\tchartInstance.zoom.dragZoomStart = null;\n \t\t\tchartInstance.zoom.dragZoomEnd = null; \n }\n chartInstance.zoom.isMouseInteraction = false;\n };\n \n node.addEventListener(''mouseup'', chartInstance.zoom.mouseUpHandler);\n \n chartInstance.zoom.mouseLeaveHandler = function(event) {\n if (chartInstance.zoom.dragZoomStart) {\n \t\t\tchartInstance.zoom.dragZoomStart = null;\n \t\t\tchartInstance.zoom.dragZoomEnd = null; \n }\n chartInstance.zoom.isMouseInteraction = false;\n };\n \n node.addEventListener(''mouseleave'', chartInstance.zoom.mouseLeaveHandler);\n \n chartInstance.zoom.dblClickHandler = function(event) {\n if (chartInstance.zoom.dragZoomStart) {\n \t\t\tchartInstance.zoom.dragZoomStart = null;\n \t\t\tchartInstance.zoom.dragZoomEnd = null; \n }\n var options = chartInstance.options;\n if (options.zoom && options.zoom.onResetSelect) {\n options.zoom.onResetSelect();\n }\n };\n \n node.addEventListener(''dblclick'', chartInstance.zoom.dblClickHandler);\n },\n beforeDatasetsDraw: function(chartInstance, easing) {\n \t\tvar ctx = chartInstance.chart.ctx;\n \t\tvar chartArea = chartInstance.chartArea;\n \t\tctx.save();\n \t\tctx.beginPath();\n \t\tif (chartInstance.zoom && chartInstance.zoom.dragZoomEnd) {\n \t\t\tvar yAxis = getYAxis(chartInstance);\n \t\t\tvar beginPoint = chartInstance.zoom.dragZoomStart;\n \t\t\tvar beginPointer = chartInstance.zoom.dragZoomStartPointer;\n \t\t\tvar endPoint = chartInstance.zoom.dragZoomEnd;\n \t\t\tvar endPointer = chartInstance.zoom.dragZoomEndPointer;\n \t\t\t\n \t\t\tvar offsetX = beginPoint.target.getBoundingClientRect().left;\n \t\t\tvar startX = Math.min(beginPointer.x, endPointer.x) - offsetX;\n \t\t\tvar endX = Math.max(beginPointer.x, endPointer.x) - offsetX;\n \t\t\tvar rectWidth = endX - startX;\n \t\t\tctx.fillStyle = ''rgba(157,203,255,0.1)'';\n \t\t\tctx.lineWidth = 1;\n \t\t\tctx.strokeRect(startX, yAxis.top, rectWidth, yAxis.bottom - yAxis.top);\n \t\t\tctx.fillRect(startX, yAxis.top, rectWidth, yAxis.bottom - yAxis.top);\n \t\t}\n \t\tif (chartArea) {\n \t\t ctx.rect(chartArea.left, chartArea.top, chartArea.right - chartArea.left, chartArea.bottom - chartArea.top);\n \t\t}\n\t\t ctx.clip(); \n },\n \n afterDatasetsDraw: function(chartInstance) {\n\t chartInstance.chart.ctx.restore();\n },\n \n destroy: function(chartInstance) {\n if (chartInstance.zoom) {\n var node = chartInstance.zoom.node;\n\t\t\t\tnode.removeEventListener(''mousedown'', chartInstance.zoom.mouseDownHandler);\n\t\t\t\tnode.removeEventListener(''mousemove'', chartInstance.zoom.mouseMoveHandler);\n\t\t\t\tnode.removeEventListener(''mouseup'', chartInstance.zoom.mouseUpHandler);\n\t\t\t\tnode.removeEventListener(''mouseleave'', chartInstance.zoom.mouseLeaveHandler);\t \n\t\t\t\tnode.removeEventListener(''dblclick'', chartInstance.zoom.dblClickHandler);\n\t\t\t\tdelete chartInstance.zoom;\n }\n }\n };\n\nChart.pluginService.register(zoomPlugin);\n","settingsSchema":"{}","dataKeySettingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"DataKeySettings\",\n \"properties\": {\n \"showLines\": {\n \"title\": \"Show lines\",\n \"type\": \"boolean\",\n \"default\": true\n },\n \"fillLines\": {\n \"title\": \"Fill lines\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"showPoints\": {\n \"title\": \"Show points\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"tension\": {\n \"title\": \"Line tension\",\n \"type\": \"number\",\n \"default\": 0.2\n }\n },\n \"required\": [\"showLines\", \"fillLines\", \"showPoints\"]\n },\n \"form\": [\n \"showLines\",\n \"fillLines\",\n \"showPoints\",\n \"tension\"\n ]\n}","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{\"showLines\":true,\"fillLines\":false,\"showPoints\":false},\"_hash\":0.5644745944820795,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#ffc107\",\"settings\":{\"showLines\":true,\"fillLines\":true,\"showPoints\":false},\"_hash\":0.18379294198604845,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Timeseries - Chart.js (Deprecated)\"}"}', + 'Timeseries - Chart.js (Deprecated)' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( '8d5ffd08-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', + 'digital_vertical_bar', + '{"type":"latest","sizeX":2.5,"sizeY":4.5,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#000000\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":60,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[\"#3d5afe\",\"#f44336\"],\"refreshAnimationType\":\"<>\",\"refreshAnimationTime\":700,\"startAnimationType\":\"<>\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":14},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":8,\"style\":\"normal\",\"weight\":\"normal\",\"color\":\"#cccccc\"},\"neonGlowBrightness\":20,\"decimals\":0,\"showUnitTitle\":true,\"gaugeColor\":\"#171a1c\",\"gaugeType\":\"verticalBar\",\"showTitle\":false,\"units\":\"°C\",\"minValue\":-60,\"dashThickness\":1.2},\"title\":\"Digital vertical bar\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'Digital vertical bar' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( '90e8e4ee-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'gpio_widgets', 'gpio_panel', + '{"type":"latest","sizeX":5,"sizeY":2,"resources":[],"templateHtml":"
\n
\n
\n
\n {{ cell.label }}\n
\n {{cell.pin}}\n \n \n \n \n {{cell.pin}}\n
\n {{ cell.label }}\n
\n
\n \n \n \n
\n
\n
\n
","templateCss":".error {\n font-size: 14px !important;\n color: maroon;/*rgb(250,250,250);*/\n background-color: transparent;\n padding: 6px;\n}\n\n.error span {\n margin: auto;\n}\n\n.gpio-panel {\n padding-top: 10px;\n white-space: nowrap;\n}\n\n.gpio-panel tb-led-light > div {\n margin: auto;\n}\n\n.led-panel {\n margin: 0;\n width: 66px;\n min-width: 66px;\n}\n\n.led-container {\n width: 48px;\n min-width: 48px;\n}\n\n.pin {\n margin-top: auto;\n margin-bottom: auto;\n color: white;\n font-size: 12px;\n width: 16px;\n min-width: 16px;\n}\n\n.led-panel.col-0 .pin {\n margin-left: auto;\n padding-left: 2px;\n text-align: right;\n}\n\n.led-panel.col-1 .pin {\n margin-right: auto;\n \n text-align: left;\n}\n\n.gpio-left-label {\n margin-right: 8px;\n}\n\n.gpio-right-label {\n margin-left: 8px;\n}","controllerScript":"self.onInit = function() {\n var i, gpio;\n \n var scope = self.ctx.$scope;\n var settings = self.ctx.settings;\n \n scope.gpioList = [];\n scope.gpioByPin = {};\n for (var g = 0; g < settings.gpioList.length; g++) {\n gpio = settings.gpioList[g];\n scope.gpioList.push(\n {\n row: gpio.row,\n col: gpio.col,\n pin: gpio.pin,\n label: gpio.label,\n enabled: false,\n colorOn: tinycolor(gpio.color).lighten(20).toHexString(),\n colorOff: tinycolor(gpio.color).darken().toHexString()\n }\n );\n scope.gpioByPin[gpio.pin] = scope.gpioList[scope.gpioList.length-1];\n }\n\n scope.ledPanelBackgroundColor = settings.ledPanelBackgroundColor || tinycolor(''green'').lighten(2).toRgbString();\n\n scope.gpioCells = {};\n var rowCount = 0;\n for (i = 0; i < scope.gpioList.length; i++) {\n gpio = scope.gpioList[i];\n scope.gpioCells[gpio.row+''_''+gpio.col] = gpio;\n rowCount = Math.max(rowCount, gpio.row+1);\n }\n \n scope.prefferedRowHeight = 32;\n scope.rows = [];\n for (i = 0; i < rowCount; i++) {\n var row = [];\n for (var c =0; c<2;c++) {\n if (scope.gpioCells[i+''_''+c]) {\n row[c] = scope.gpioCells[i+''_''+c];\n } else {\n row[c] = null;\n }\n }\n scope.rows.push(row);\n } \n \n self.onResize();\n}\n\nself.onDataUpdated = function() {\n var changed = false;\n for (var d = 0; d < self.ctx.data.length; d++) {\n var cellData = self.ctx.data[d];\n var dataKey = cellData.dataKey;\n var gpio = self.ctx.$scope.gpioByPin[dataKey.label];\n if (gpio) {\n var enabled = false;\n if (cellData.data.length > 0) {\n var tvPair = cellData.data[cellData.data.length - 1];\n enabled = (tvPair[1] === true || tvPair[1] === ''true'');\n }\n if (gpio.enabled != enabled) {\n changed = true;\n gpio.enabled = enabled;\n }\n }\n }\n if (changed) {\n self.ctx.$scope.$digest();\n } \n}\n\nself.onResize = function() {\n var rowCount = self.ctx.$scope.rows.length;\n var prefferedRowHeight = (self.ctx.height - 35)/rowCount;\n prefferedRowHeight = Math.min(32, prefferedRowHeight);\n prefferedRowHeight = Math.max(12, prefferedRowHeight);\n self.ctx.$scope.prefferedRowHeight = prefferedRowHeight;\n \n var ratio = prefferedRowHeight/32;\n \n var leftLabels = $(''.gpio-left-label'', self.ctx.$container);\n leftLabels.css(''font-size'', 16*ratio+''px'');\n var rightLabels = $(''.gpio-right-label'', self.ctx.$container);\n rightLabels.css(''font-size'', 16*ratio+''px'');\n var pins = $(''.pin'', self.ctx.$container);\n var pinsFontSize = Math.max(9, 12*ratio);\n pins.css(''font-size'', pinsFontSize+''px''); \n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"Settings\",\n \"properties\": {\n \"gpioList\": {\n \"title\": \"Gpio leds\",\n \"type\": \"array\",\n \"minItems\" : 1,\n \"items\": {\n \"title\": \"Gpio led\",\n \"type\": \"object\",\n \"properties\": {\n \"pin\": {\n \"title\": \"Pin\",\n \"type\": \"number\"\n },\n \"label\": {\n \"title\": \"Label\",\n \"type\": \"string\"\n },\n \"row\": {\n \"title\": \"Row\",\n \"type\": \"number\"\n },\n \"col\": {\n \"title\": \"Column\",\n \"type\": \"number\"\n },\n \"color\": {\n \"title\": \"Color\",\n \"type\": \"string\",\n \"default\": \"red\"\n }\n },\n \"required\": [\"pin\", \"label\", \"row\", \"col\", \"color\"]\n }\n },\n \"ledPanelBackgroundColor\": {\n \"title\": \"LED panel background color\",\n \"type\": \"string\",\n \"default\": \"#008a00\"\n } \n },\n \"required\": [\"gpioList\", \n \"ledPanelBackgroundColor\"]\n },\n \"form\": [\n {\n \"key\": \"gpioList\",\n \"items\": [\n \"gpioList[].pin\",\n \"gpioList[].label\",\n \"gpioList[].row\",\n \"gpioList[].col\",\n {\n \"key\": \"gpioList[].color\",\n \"type\": \"color\"\n }\n ]\n },\n {\n \"key\": \"ledPanelBackgroundColor\",\n \"type\": \"color\"\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"gpioList\":[{\"pin\":1,\"label\":\"GPIO 1\",\"row\":0,\"col\":0,\"color\":\"#008000\",\"_uniqueKey\":0},{\"pin\":2,\"label\":\"GPIO 2\",\"row\":0,\"col\":1,\"color\":\"#ffff00\",\"_uniqueKey\":1},{\"pin\":3,\"label\":\"GPIO 3\",\"row\":1,\"col\":0,\"color\":\"#cf006f\",\"_uniqueKey\":2}],\"ledPanelBackgroundColor\":\"#b71c1c\"},\"title\":\"Basic GPIO Panel\",\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"1\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.22518255793320163,\"funcBody\":\"var period = time % 1500;\\nreturn period < 500;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"2\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.7008206860666621,\"funcBody\":\"var period = time % 1500;\\nreturn period >= 500 && period < 1000;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"3\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.42600325102193426,\"funcBody\":\"var period = time % 1500;\\nreturn period >= 1000;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}}}"}', + 'Basic GPIO Panel' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( '955ad5fa-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'cards', 'timeseries_table', + '{"type":"timeseries","sizeX":8,"sizeY":6.5,"resources":[],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n \n var scope = self.ctx.$scope;\n var id = self.ctx.$scope.$injector.get(''utils'').guid();\n\n scope.config = {\n settings: self.ctx.settings,\n widgetConfig: self.ctx.widgetConfig\n }\n\n scope.datasources = self.ctx.datasources;\n scope.data = self.ctx.data;\n scope.tableId = \"table-\"+id;\n \n}\n\nself.onDataUpdated = function() {\n self.ctx.$scope.data = self.ctx.data;\n self.ctx.$scope.$broadcast(''timeseries-table-data-updated'', self.ctx.$scope.tableId);\n}\n\nself.onDestroy = function() {\n}","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"TimeseriesTableSettings\",\n \"properties\": {\n \"showTimestamp\": {\n \"title\": \"Display timestamp column\",\n \"type\": \"boolean\",\n \"default\": true\n }\n },\n \"required\": []\n },\n \"form\": [\n \"showTimestamp\"\n ]\n}","dataKeySettingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"DataKeySettings\",\n \"properties\": {\n \"useCellStyleFunction\": {\n \"title\": \"Use cell style function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"cellStyleFunction\": {\n \"title\": \"Cell style function: f(value)\",\n \"type\": \"string\",\n \"default\": \"\"\n },\n \"useCellContentFunction\": {\n \"title\": \"Use cell content function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"cellContentFunction\": {\n \"title\": \"Cell content function: f(value, rowData, filter)\",\n \"type\": \"string\",\n \"default\": \"\"\n }\n },\n \"required\": []\n },\n \"form\": [\n \"useCellStyleFunction\",\n {\n \"key\": \"cellStyleFunction\",\n \"type\": \"javascript\"\n },\n \"useCellContentFunction\",\n {\n \"key\": \"cellContentFunction\",\n \"type\": \"javascript\"\n }\n ]\n}","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temperature °C\",\"color\":\"#2196f3\",\"settings\":{\"useCellStyleFunction\":true,\"cellStyleFunction\":\"if (value) {\\n var percent = (value + 60)/120 * 100;\\n var color = tinycolor.mix(''blue'', ''red'', amount = percent);\\n color.setAlpha(.5);\\n return {\\n paddingLeft: ''20px'',\\n color: ''#ffffff'',\\n background: color.toRgbString(),\\n fontSize: ''18px''\\n };\\n} else {\\n return {};\\n}\"},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nvar multiplier = Math.pow(10, 1 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Humidity, %\",\"color\":\"#ffc107\",\"settings\":{\"useCellStyleFunction\":true,\"cellStyleFunction\":\"if (value) {\\n var percent = value;\\n var backgroundColor = tinycolor(''blue'');\\n backgroundColor.setAlpha(value/100);\\n var color = ''blue'';\\n if (value > 50) {\\n color = ''white'';\\n }\\n \\n return {\\n paddingLeft: ''20px'',\\n color: color,\\n background: backgroundColor.toRgbString(),\\n fontSize: ''18px''\\n };\\n} else {\\n return {};\\n}\",\"useCellContentFunction\":false},\"_hash\":0.12775350966079668,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nvar multiplier = Math.pow(10, 1 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < 5) {\\n\\tvalue = 5;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"interval\":1000,\"timewindowMs\":60000},\"aggregation\":{\"type\":\"NONE\",\"limit\":200}},\"showTitle\":true,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"showTimestamp\":true},\"title\":\"Timeseries table\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"useDashboardTimewindow\":false,\"showLegend\":false}"}', + 'Timeseries table' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( '9aa48574-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'polar_area_chart_js', + '{"type":"latest","sizeX":7,"sizeY":5,"resources":[{"url":"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"}],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n var pieData = {\n labels: [],\n datasets: []\n };\n\n var dataset = {\n data: [],\n backgroundColor: [],\n borderColor: [],\n borderWidth: [],\n hoverBackgroundColor: []\n }\n \n pieData.datasets.push(dataset);\n \n for (var i = 0; i < self.ctx.data.length; i++) {\n var dataKey = self.ctx.data[i].dataKey;\n pieData.labels.push(dataKey.label);\n dataset.data.push(0);\n var hoverBackgroundColor = tinycolor(dataKey.color).lighten(15);\n var borderColor = tinycolor(dataKey.color).darken();\n dataset.backgroundColor.push(dataKey.color);\n dataset.borderColor.push(''#fff'');\n dataset.borderWidth.push(5);\n dataset.hoverBackgroundColor.push(hoverBackgroundColor.toRgbString());\n }\n\n var ctx = $(''#pieChart'', self.ctx.$container);\n self.ctx.chart = new Chart(ctx, {\n type: ''polarArea'',\n data: pieData,\n options: {\n responsive: false,\n maintainAspectRatio: false\n }\n });\n \n self.onResize();\n}\n\nself.onDataUpdated = function() {\n for (var i = 0; i < self.ctx.data.length; i++) {\n var cellData = self.ctx.data[i];\n if (cellData.data.length > 0) {\n var tvPair = cellData.data[cellData.data.length - 1];\n var value = tvPair[1];\n self.ctx.chart.data.datasets[0].data[i] = parseFloat(value);\n }\n }\n \n self.ctx.chart.update();\n}\n\nself.onResize = function() {\n if (self.ctx.height >= 70) {\n try {\n self.ctx.chart.resize();\n } catch (e) {}\n }\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fifth\",\"color\":\"#607d8b\",\"settings\":{},\"_hash\":0.2074391823443591,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Polar Area - Chart.js\"}"}', + 'Polar Area - Chart.js' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( '9d896bb0-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'cards', 'html_card', + '{"type":"static","sizeX":7.5,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"","controllerScript":"self.onInit = function() {\n\n var cssParser = new cssjs();\n cssParser.testMode = false;\n var namespace = ''html-card-'' + hashCode(self.ctx.settings.cardCss);\n cssParser.cssPreviewNamespace = namespace;\n cssParser.createStyleElement(namespace, self.ctx.settings.cardCss);\n self.ctx.$container.addClass(namespace);\n cardHtml = self.ctx.settings.cardHtml;\n self.ctx.$container.html(cardHtml);\n \n function hashCode(str) {\n var hash = 0;\n var i, char;\n if (str.length === 0) return hash;\n for (i = 0; i < str.length; i++) {\n char = str.charCodeAt(i);\n hash = ((hash << 5) - hash) + char;\n hash = hash & hash;\n }\n return hash;\n }\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"Settings\",\n \"required\": [\"cardHtml\"],\n \"properties\": {\n \"cardCss\": {\n \"title\": \"CSS\",\n \"type\": \"string\",\n \"default\": \".card {\\n font-weight: bold; \\n}\"\n },\n \"cardHtml\": {\n \"title\": \"HTML\",\n \"type\": \"string\",\n \"default\": \"
HTML code here
\"\n }\n }\n },\n \"form\": [\n {\n \"key\": \"cardCss\",\n \"type\": \"css\"\n }, \n {\n \"key\": \"cardHtml\",\n \"type\": \"html\"\n } \n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"static\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Random\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"cardHtml\":\"
HTML code here
\",\"cardCss\":\".card {\\n font-weight: bold;\\n font-size: 32px;\\n color: #999;\\n width: 100%;\\n height: 100%;\\n display: flex;\\n align-items: center;\\n justify-content: center;\\n}\"},\"title\":\"HTML Card\",\"dropShadow\":true}"}', + 'HTML Card' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'a0cf40e2-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', + 'simple_neon_gauge_justgage', + '{"type":"latest","sizeX":3,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#388e3c\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#000000\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":1,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":32},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"neonGlowBrightness\":40,\"dashThickness\":1.5,\"decimals\":0,\"gaugeType\":\"donut\"},\"title\":\"Simple neon gauge - justGage\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'Simple neon gauge - justGage' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'a4e28428-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'analogue_gauges', + 'radial_gauge_canvas_gauges', + '{"type":"latest","sizeX":6,"sizeY":5,"resources":[],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbAnalogueRadialGauge(self.ctx, ''radialGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.getSettingsSchema = function() {\n return TbAnalogueRadialGauge.settingsSchema;\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 50 - 25;\\nif (value < -100) {\\n\\tvalue = -100;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"maxValue\":100,\"startAngle\":45,\"ticksAngle\":270,\"showBorder\":true,\"defaultColor\":\"#e65100\",\"needleCircleSize\":10,\"highlights\":[],\"showUnitTitle\":true,\"colorPlate\":\"#fff\",\"colorMajorTicks\":\"#444\",\"colorMinorTicks\":\"#666\",\"minorTicks\":10,\"valueInt\":3,\"valueDec\":0,\"highlightsWidth\":15,\"valueBox\":true,\"animation\":true,\"animationDuration\":500,\"animationRule\":\"cycle\",\"colorNeedleShadowUp\":\"rgba(2, 255, 255, 0)\",\"numbersFont\":{\"family\":\"Roboto\",\"size\":18,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#616161\"},\"titleFont\":{\"family\":\"Roboto\",\"size\":24,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#888\"},\"unitsFont\":{\"family\":\"Roboto\",\"size\":22,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#616161\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"size\":36,\"style\":\"normal\",\"weight\":\"normal\",\"shadowColor\":\"rgba(0, 0, 0, 0.49)\",\"color\":\"#444\"},\"minValue\":-100,\"colorNeedleShadowDown\":\"rgba(188,143,143,0.45)\",\"colorValueBoxRect\":\"#888\",\"colorValueBoxRectEnd\":\"#666\",\"colorValueBoxBackground\":\"#babab2\",\"colorValueBoxShadow\":\"rgba(0,0,0,1)\"},\"title\":\"Radial gauge - Canvas Gauges\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'Radial gauge - Canvas Gauges' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'a9005382-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', + 'digital_speedometer', + '{"type":"latest","sizeX":5,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Speed\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 45) {\\n\\tvalue = 45;\\n} else if (value > 130) {\\n\\tvalue = 130;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#000000\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":180,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[\"#008000\",\"#fbc02d\",\"#f44336\"],\"refreshAnimationType\":\"linear\",\"refreshAnimationTime\":700,\"startAnimationType\":\"linear\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":32},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#ffffff\"},\"neonGlowBrightness\":40,\"dashThickness\":1.5,\"decimals\":0,\"unitTitle\":\"MPH\",\"showUnitTitle\":true,\"gaugeColor\":\"#171a1c\",\"gaugeType\":\"arc\"},\"title\":\"Digital speedometer\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'Digital speedometer' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'b0e395d2-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'doughnut_chart_js', + '{"type":"latest","sizeX":7,"sizeY":5,"resources":[{"url":"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"}],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n var pieData = {\n labels: [],\n datasets: []\n };\n\n var dataset = {\n data: [],\n backgroundColor: [],\n borderColor: [],\n borderWidth: [],\n hoverBackgroundColor: []\n }\n \n var borderColor = self.ctx.settings.borderColor || ''#fff'';\n var borderWidth = angular.isDefined(self.ctx.settings.borderWidth) ? self.ctx.settings.borderWidth : 5;\n \n pieData.datasets.push(dataset);\n \n for (var i=0; i < self.ctx.data.length; i++) {\n var dataKey = self.ctx.data[i].dataKey;\n pieData.labels.push(dataKey.label);\n dataset.data.push(0);\n var hoverBackgroundColor = tinycolor(dataKey.color).lighten(15);\n dataset.backgroundColor.push(dataKey.color);\n dataset.borderColor.push(borderColor);\n dataset.borderWidth.push(borderWidth);\n dataset.hoverBackgroundColor.push(hoverBackgroundColor.toRgbString());\n }\n\n var options = {\n responsive: false,\n maintainAspectRatio: false,\n legend: {\n display: true,\n labels: {\n fontColor: ''#666''\n }\n },\n tooltips: {\n callbacks: {\n label: function(tooltipItem, data) {\n var label = data.labels[tooltipItem.index];\n var value = data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];\n var content = label + '': '' + value;\n var units = self.ctx.settings.units ? self.ctx.settings.units : self.ctx.units;\n if (units) {\n content += '' '' + units;\n } \n return content;\n }\n }\n }\n };\n\n if (self.ctx.settings.legend) {\n options.legend.display = self.ctx.settings.legend.display !== false;\n options.legend.labels.fontColor = self.ctx.settings.legend.labelsFontColor || ''#666'';\n }\n\n var ctx = $(''#pieChart'', self.ctx.$container);\n self.ctx.chart = new Chart(ctx, {\n type: ''doughnut'',\n data: pieData,\n options: options\n });\n \n self.onResize();\n}\n\nself.onDataUpdated = function() {\n for (var i = 0; i < self.ctx.data.length; i++) {\n var cellData = self.ctx.data[i];\n if (cellData.data.length > 0) {\n var tvPair = cellData.data[cellData.data.length - 1];\n var value = tvPair[1];\n self.ctx.chart.data.datasets[0].data[i] = parseFloat(value);\n }\n }\n self.ctx.chart.update();\n}\n\nself.onResize = function() {\n self.ctx.chart.resize();\n}\n\n","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"Settings\",\n \"properties\": {\n \"borderWidth\": {\n \"title\": \"Border width\",\n \"type\": \"number\",\n \"default\": 5\n },\n \"borderColor\": {\n \"title\": \"Border color\",\n \"type\": \"string\",\n \"default\": \"#fff\"\n },\n \"legend\": {\n \"title\": \"Legend settings\",\n \"type\": \"object\",\n \"properties\": {\n \"display\": {\n \"title\": \"Display legend\",\n \"type\": \"boolean\",\n \"default\": true\n },\n \"labelsFontColor\": {\n \"title\": \"Labels font color\",\n \"type\": \"string\",\n \"default\": \"#666\"\n }\n }\n }\n },\n \"required\": []\n },\n \"form\": [\n \"borderWidth\", \n {\n \"key\": \"borderColor\",\n \"type\": \"color\"\n }, \n {\n \"key\": \"legend\",\n \"items\": [\n \"legend.display\",\n {\n \"key\": \"legend.labelsFontColor\",\n \"type\": \"color\"\n }\n ]\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#26a69a\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#f57c00\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#afb42b\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#673ab7\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"borderWidth\":5,\"borderColor\":\"#fff\",\"legend\":{\"display\":true,\"labelsFontColor\":\"#666666\"}},\"title\":\"Doughnut - Chart.js\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'Doughnut - Chart.js' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'b456a0f6-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'pie_chart_js', + '{"type":"latest","sizeX":8,"sizeY":5,"resources":[{"url":"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"}],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n \n var pieData = {\n labels: [],\n datasets: []\n };\n\n var dataset = {\n data: [],\n backgroundColor: [],\n borderColor: [],\n borderWidth: [],\n hoverBackgroundColor: []\n }\n \n pieData.datasets.push(dataset);\n \n for (var i=0; i < self.ctx.data.length; i++) {\n var dataKey = self.ctx.data[i].dataKey;\n pieData.labels.push(dataKey.label);\n dataset.data.push(0);\n var hoverBackgroundColor = tinycolor(dataKey.color).lighten(15);\n var borderColor = tinycolor(dataKey.color).darken();\n dataset.backgroundColor.push(dataKey.color);\n dataset.borderColor.push(''#fff'');\n dataset.borderWidth.push(5);\n dataset.hoverBackgroundColor.push(hoverBackgroundColor.toRgbString());\n }\n\n var ctx = $(''#pieChart'', self.ctx.$container);\n self.ctx.chart = new Chart(ctx, {\n type: ''pie'',\n data: pieData,\n options: {\n responsive: false,\n maintainAspectRatio: false\n }\n }); \n \n self.onResize();\n}\n\nself.onDataUpdated = function() {\n for (var i = 0; i < self.ctx.data.length; i++) {\n var cellData = self.ctx.data[i];\n if (cellData.data.length > 0) {\n var tvPair = cellData.data[cellData.data.length - 1];\n var value = tvPair[1];\n self.ctx.chart.data.datasets[0].data[i] = parseFloat(value);\n }\n }\n self.ctx.chart.update();\n}\n\nself.onResize = function() {\n self.ctx.chart.resize();\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Pie - Chart.js\"}"}', + 'Pie - Chart.js' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'b72c406a-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'bars', + '{"type":"latest","sizeX":7,"sizeY":5,"resources":[{"url":"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"}],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n var barData = {\n labels: [],\n datasets: []\n };\n \n for (var i = 0; i < self.ctx.datasources.length; i++) {\n var datasource = self.ctx.datasources[i];\n for (var d = 0; d < datasource.dataKeys.length; d++) {\n var dataset = {\n label: datasource.dataKeys[d].label,\n data: [0],\n backgroundColor: [datasource.dataKeys[d].color],\n borderColor: [datasource.dataKeys[d].color],\n borderWidth: 1\n }\n barData.datasets.push(dataset);\n }\n }\n\n var ctx = $(''#barChart'', self.ctx.$container);\n self.ctx.chart = new Chart(ctx, {\n type: ''bar'',\n data: barData,\n options: {\n responsive: false,\n maintainAspectRatio: false,\n scales: {\n yAxes: [{\n ticks: {\n beginAtZero:true\n }\n }]\n }\n }\n });\n \n self.onResize();\n}\n\nself.onDataUpdated = function() {\n var c = 0;\n for (var i = 0; i < self.ctx.chart.data.datasets.length; i++) {\n var dataset = self.ctx.chart.data.datasets[i];\n var cellData = self.ctx.data[i]; \n if (cellData.data.length > 0) {\n var tvPair = cellData.data[cellData.data.length - 1];\n var value = tvPair[1];\n dataset.data[0] = parseFloat(value);\n }\n }\n self.ctx.chart.update();\n}\n\nself.onResize = function() {\n self.ctx.chart.resize();\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Bars - Chart.js\"}"}', + 'Bars - Chart.js' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'bb14af46-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', 'digital_bar', + '{"type":"latest","sizeX":6,"sizeY":2.5,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Speed\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 80) {\\n\\tvalue = 80;\\n} else if (value > 160) {\\n\\tvalue = 160;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#000000\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":180,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[\"#008000\",\"#fbc02d\",\"#f44336\"],\"refreshAnimationType\":\"linear\",\"refreshAnimationTime\":700,\"startAnimationType\":\"linear\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":18},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#ffffff\"},\"neonGlowBrightness\":40,\"dashThickness\":1.5,\"decimals\":0,\"unitTitle\":\"MPH\",\"showUnitTitle\":true,\"gaugeColor\":\"#171a1c\",\"gaugeType\":\"horizontalBar\",\"showTitle\":false},\"title\":\"Digital horizontal bar\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'Digital horizontal bar' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'be62e9f6-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', + 'mini_gauge_justgage', + '{"type":"latest","sizeX":2,"sizeY":2,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#7cb342\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Roboto\",\"style\":\"normal\",\"weight\":\"500\",\"size\":32},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"neonGlowBrightness\":0,\"dashThickness\":0,\"decimals\":0,\"roundedLineCap\":true,\"gaugeType\":\"donut\"},\"title\":\"Mini gauge - justGage\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'Mini gauge - justGage' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'c7a95f5e-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'maps', 'route_map_openstreetmap', + '{"type":"timeseries","sizeX":8.5,"sizeY":6,"resources":[],"templateHtml":"","templateCss":".leaflet-zoom-box {\n\tz-index: 9;\n}\n\n.leaflet-pane { z-index: 4; }\n\n.leaflet-tile-pane { z-index: 2; }\n.leaflet-overlay-pane { z-index: 4; }\n.leaflet-shadow-pane { z-index: 5; }\n.leaflet-marker-pane { z-index: 6; }\n.leaflet-tooltip-pane { z-index: 7; }\n.leaflet-popup-pane { z-index: 8; }\n\n.leaflet-map-pane canvas { z-index: 1; }\n.leaflet-map-pane svg { z-index: 2; }\n\n.leaflet-control {\n\tz-index: 9;\n}\n.leaflet-top,\n.leaflet-bottom {\n\tz-index: 11;\n}\n\n.tb-marker-label {\n border: none;\n background: none;\n box-shadow: none;\n}\n\n.tb-marker-label:before {\n border: none;\n background: none;\n}\n","controllerScript":"self.onInit = function() {\n self.ctx.map = new TbMapWidget(''openstreet-map'', true, self.ctx);\n}\n\nself.onDataUpdated = function() {\n self.ctx.map.update();\n}\n\nself.onResize = function() {\n self.ctx.map.resize();\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"title\": \"Route Map Configuration\",\n \"type\": \"object\",\n \"properties\": {\n \"defaultZoomLevel\": {\n \"title\": \"Default map zoom level (1 - 20)\",\n \"type\": \"number\"\n },\n \"fitMapBounds\": {\n \"title\": \"Fit map bounds to cover all markers\",\n \"type\": \"boolean\",\n \"default\": true\n },\n \"routesSettings\": {\n \"title\": \"Routes\",\n \"type\": \"array\",\n \"items\": {\n \"title\": \"Route settings\",\n \"type\": \"object\",\n \"properties\": {\n \"latKeyName\": {\n \"title\": \"Latitude key name\",\n \"type\": \"string\",\n \"default\": \"lat\"\n },\n \"lngKeyName\": {\n \"title\": \"Longitude key name\",\n \"type\": \"string\",\n \"default\": \"lng\"\n },\n \"showLabel\": {\n \"title\": \"Show label\",\n \"type\": \"boolean\",\n \"default\": true\n }, \n \"label\": {\n \"title\": \"Label\",\n \"type\": \"string\"\n },\n \"tooltipPattern\": {\n \"title\": \"Pattern ( for ex. ''Text ${keyName} units.'' or ''${#} units'' )\",\n \"type\": \"string\",\n \"default\": \"Latitude: ${lat:7}
Longitude: ${lng:7}\"\n },\n \"color\": {\n \"title\": \"Color\",\n \"type\": \"string\"\n },\n \"useColorFunction\": {\n \"title\": \"Use color function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"colorFunction\": {\n \"title\": \"Color function: f(data)\",\n \"type\": \"string\"\n },\n \"markerImage\": {\n \"title\": \"Custom marker image\",\n \"type\": \"string\"\n },\n \"markerImageSize\": {\n \"title\": \"Custom marker image size (px)\",\n \"type\": \"number\",\n \"default\": 34\n },\n \"useMarkerImageFunction\": {\n \"title\": \"Use marker image function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"markerImageFunction\": {\n \"title\": \"Marker image function: f(data, images)\",\n \"type\": \"string\"\n },\n \"markerImages\": {\n \"title\": \"Marker images\",\n \"type\": \"array\",\n \"items\": {\n \"title\": \"Marker image\",\n \"type\": \"string\"\n }\n },\n \"strokeWeight\": {\n \"title\": \"Stroke weight\",\n \"type\": \"number\",\n \"default\": 2\n },\n \"strokeOpacity\": {\n \"title\": \"Stroke opacity\",\n \"type\": \"number\",\n \"default\": 1.0\n }\n }\n }\n }\n },\n \"required\": [\n ]\n },\n \"form\": [\n \"defaultZoomLevel\",\n \"fitMapBounds\",\n {\n \"key\": \"routesSettings\",\n \"items\": [\n \"routesSettings[].latKeyName\",\n \"routesSettings[].lngKeyName\",\n \"routesSettings[].showLabel\",\n \"routesSettings[].label\",\n \"routesSettings[].tooltipPattern\",\n {\n \"key\": \"routesSettings[].color\",\n \"type\": \"color\"\n },\n \"routesSettings[].useColorFunction\",\n {\n \"key\": \"routesSettings[].colorFunction\",\n \"type\": \"javascript\"\n },\n {\n \"key\": \"routesSettings[].markerImage\",\n \"type\": \"image\"\n },\n \"routesSettings[].markerImageSize\",\n \"routesSettings[].useMarkerImageFunction\",\n {\n \"key\": \"routesSettings[].markerImageFunction\",\n \"type\": \"javascript\"\n },\n {\n \"key\": \"routesSettings[].markerImages\",\n \"items\": [\n {\n \"key\": \"routesSettings[].markerImages[]\",\n \"type\": \"image\"\n }\n ]\n },\n \"routesSettings[].strokeWeight\",\n \"routesSettings[].strokeOpacity\"\n ]\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"latitude\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.8950926999078694,\"funcBody\":\"var lats = [37.7696499,\\n37.7699074,\\n37.7699536,\\n37.7697242,\\n37.7695189,\\n37.7696889,\\n37.7697153,\\n37.7701244,\\n37.7700604,\\n37.7705491,\\n37.7715705,\\n37.771752,\\n37.7707533,\\n37.769866];\\n\\nvar i = Math.floor((time/3 % 14000) / 1000);\\n\\nreturn lats[i];\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"longitude\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.2757675428823283,\"funcBody\":\"var lons = [-122.4261215,\\n-122.4219157,\\n-122.4199623,\\n-122.4179074,\\n-122.4155876,\\n-122.4155521,\\n-122.4163203,\\n-122.4193876,\\n-122.4210496,\\n-122.422284,\\n-122.4232717,\\n-122.4235138,\\n-122.4247605,\\n-122.4258812];\\n\\nvar i = Math.floor((time/3 % 14000) / 1000);\\n\\nreturn lons[i];\"}],\"intervalSec\":60},{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Speed\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.14481354591724638,\"funcBody\":\"var value = prevValue;\\nif (time % 500 < 100) {\\n value = value + Math.random() * 40 - 20;\\n if (value < 45) {\\n \\tvalue = 45;\\n } else if (value > 130) {\\n \\tvalue = 130;\\n }\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":30000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"fitMapBounds\":true,\"routesSettings\":[{\"latKeyName\":\"latitude\",\"lngKeyName\":\"longitude\",\"showLabel\":true,\"tooltipPattern\":\"Latitude: ${latitude:7}
Longitude: ${longitude:7}
Speed: ${Speed} MPH
See advanced settings for details\",\"strokeWeight\":4,\"label\":\"First route\",\"color\":\"#3d5afe\",\"strokeOpacity\":1,\"useColorFunction\":true,\"useMarkerImageFunction\":true,\"markerImages\":[\"data:image/png;base64,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\",\"data:image/png;base64,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\",\"data:image/png;base64,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\"],\"colorFunction\":\"var speed = data[''Speed''];\\nif (typeof speed !== undefined) {\\n var percent = (speed - 45)/85;\\n if (percent < 0.5) {\\n percent *=2*100; \\n return tinycolor.mix(''green'', ''yellow'', amount = percent).toHexString();\\n } else {\\n percent = (percent - 0.5)*2*100;\\n return tinycolor.mix(''yellow'', ''red'', amount = percent).toHexString();\\n }\\n}\\nreturn ''green'';\",\"markerImageFunction\":\"var speed = data[''Speed''];\\nvar res = {\\n url: images[0],\\n size: 55\\n};\\nif (typeof speed !== undefined) {\\n var percent = (speed - 45)/85;\\n var index = Math.floor(3 * percent);\\n res.url = images[index];\\n}\\nreturn res;\"}]},\"title\":\"Route Map - OpenStreetMap\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"useDashboardTimewindow\":true,\"showLegend\":false}"}', + 'Route Map - OpenStreetMap' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'cb0e48b2-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'cards', 'label_widget', + '{"type":"latest","sizeX":4.5,"sizeY":5,"resources":[],"templateHtml":"","templateCss":"#container {\n overflow: auto;\n}\n\n.tbDatasource-container {\n margin: 5px;\n padding: 8px;\n}\n\n.tbDatasource-title {\n font-size: 1.200rem;\n font-weight: 500;\n padding-bottom: 10px;\n}\n\n.tbDatasource-table {\n width: 100%;\n box-shadow: 0 0 10px #ccc;\n border-collapse: collapse;\n white-space: nowrap;\n font-size: 1.000rem;\n color: #757575;\n}\n\n.tbDatasource-table td {\n position: relative;\n border-top: 1px solid rgba(0, 0, 0, 0.12);\n border-bottom: 1px solid rgba(0, 0, 0, 0.12);\n padding: 0px 18px;\n box-sizing: border-box;\n}","controllerScript":"self.onInit = function() {\n self.ctx.varsRegex = /\\$\\{([^\\}]*)\\}/g;\n \n var imageUrl = self.ctx.settings.backgroundImageUrl ? self.ctx.settings.backgroundImageUrl :\n ''data:image/svg+xml;base64,PHN2ZyBpZD0ic3ZnMiIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMTAwIiB3aWR0aD0iMTAwIiB2ZXJzaW9uPSIxLjEiIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgdmlld0JveD0iMCAwIDEwMCAxMDAiPgogPGcgaWQ9ImxheWVyMSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAtOTUyLjM2KSI+CiAgPHJlY3QgaWQ9InJlY3Q0Njg0IiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBoZWlnaHQ9Ijk5LjAxIiB3aWR0aD0iOTkuMDEiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiB5PSI5NTIuODYiIHg9Ii40OTUwNSIgc3Ryb2tlLXdpZHRoPSIuOTkwMTAiIGZpbGw9IiNlZWUiLz4KICA8dGV4dCBpZD0idGV4dDQ2ODYiIHN0eWxlPSJ3b3JkLXNwYWNpbmc6MHB4O2xldHRlci1zcGFjaW5nOjBweDt0ZXh0LWFuY2hvcjptaWRkbGU7dGV4dC1hbGlnbjpjZW50ZXIiIGZvbnQtd2VpZ2h0PSJib2xkIiB4bWw6c3BhY2U9InByZXNlcnZlIiBmb250LXNpemU9IjEwcHgiIGxpbmUtaGVpZ2h0PSIxMjUlIiB5PSI5NzAuNzI4MDkiIHg9IjQ5LjM5NjQ3NyIgZm9udC1mYW1pbHk9IlJvYm90byIgZmlsbD0iIzY2NjY2NiI+PHRzcGFuIGlkPSJ0c3BhbjQ2OTAiIHg9IjUwLjY0NjQ3NyIgeT0iOTcwLjcyODA5Ij5JbWFnZSBiYWNrZ3JvdW5kIDwvdHNwYW4+PHRzcGFuIGlkPSJ0c3BhbjQ2OTIiIHg9IjQ5LjM5NjQ3NyIgeT0iOTgzLjIyODA5Ij5pcyBub3QgY29uZmlndXJlZDwvdHNwYW4+PC90ZXh0PgogIDxyZWN0IGlkPSJyZWN0NDY5NCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgaGVpZ2h0PSIxOS4zNiIgd2lkdGg9IjY5LjM2IiBzdHJva2U9IiMwMDAiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgeT0iOTkyLjY4IiB4PSIxNS4zMiIgc3Ryb2tlLXdpZHRoPSIuNjM5ODYiIGZpbGw9Im5vbmUiLz4KIDwvZz4KPC9zdmc+Cg=='';\n\n self.ctx.$container.css(''background'', ''url(\"''+imageUrl+''\") no-repeat'');\n self.ctx.$container.css(''backgroundSize'', ''contain'');\n self.ctx.$container.css(''backgroundPosition'', ''50% 50%'');\n \n function processLabelPattern(pattern, data) {\n var match = self.ctx.varsRegex.exec(pattern);\n var replaceInfo = {};\n replaceInfo.variables = [];\n while (match !== null) {\n var variableInfo = {};\n variableInfo.dataKeyIndex = -1;\n var variable = match[0];\n var label = match[1];\n var valDec = 2;\n var splitVals = label.split('':'');\n if (splitVals.length > 1) {\n label = splitVals[0];\n valDec = parseFloat(splitVals[1]);\n }\n variableInfo.variable = variable;\n variableInfo.valDec = valDec;\n \n if (label.startsWith(''#'')) {\n var keyIndexStr = label.substring(1);\n var n = Math.floor(Number(keyIndexStr));\n if (String(n) === keyIndexStr && n >= 0) {\n variableInfo.dataKeyIndex = n;\n }\n }\n if (variableInfo.dataKeyIndex === -1) {\n for (var i = 0; i < data.length; i++) {\n var datasourceData = data[i];\n var dataKey = datasourceData.dataKey;\n if (dataKey.label === label) {\n variableInfo.dataKeyIndex = i;\n break;\n }\n }\n }\n replaceInfo.variables.push(variableInfo);\n match = self.ctx.varsRegex.exec(pattern);\n }\n return replaceInfo;\n }\n\n var configuredLabels = self.ctx.settings.labels;\n if (!configuredLabels) {\n configuredLabels = [];\n }\n \n self.ctx.labels = [];\n\n for (var l = 0; l < configuredLabels.length; l++) {\n var labelConfig = configuredLabels[l];\n var localConfig = {};\n localConfig.font = {};\n \n localConfig.pattern = labelConfig.pattern ? labelConfig.pattern : ''${#0}'';\n localConfig.x = labelConfig.x ? labelConfig.x : 0;\n localConfig.y = labelConfig.y ? labelConfig.y : 0;\n localConfig.backgroundColor = labelConfig.backgroundColor ? labelConfig.backgroundColor : ''rgba(0,0,0,0)'';\n \n var settingsFont = labelConfig.font;\n if (!settingsFont) {\n settingsFont = {};\n }\n \n localConfig.font.family = settingsFont.family || ''RobotoDraft'';\n localConfig.font.size = settingsFont.size ? settingsFont.size : 6;\n localConfig.font.style = settingsFont.style ? settingsFont.style : ''normal'';\n localConfig.font.weight = settingsFont.weight ? settingsFont.weight : ''500'';\n localConfig.font.color = settingsFont.color ? settingsFont.color : ''#fff'';\n \n localConfig.replaceInfo = processLabelPattern(localConfig.pattern, self.ctx.data);\n \n var label = {};\n var labelElement = $(''
'');\n labelElement.css(''position'', ''absolute'');\n labelElement.css(''display'', ''none'');\n labelElement.css(''top'', ''0'');\n labelElement.css(''left'', ''0'');\n labelElement.css(''backgroundColor'', localConfig.backgroundColor);\n labelElement.css(''color'', localConfig.font.color);\n labelElement.css(''fontFamily'', localConfig.font.family);\n labelElement.css(''fontStyle'', localConfig.font.style);\n labelElement.css(''fontWeight'', localConfig.font.weight);\n \n labelElement.html(localConfig.pattern);\n self.ctx.$container.append(labelElement);\n label.element = labelElement;\n label.config = localConfig;\n label.htmlSet = false;\n label.visible = false;\n self.ctx.labels.push(label);\n }\n\n var bgImg = $('''');\n bgImg.hide();\n bgImg.bind(''load'', function()\n {\n self.ctx.bImageHeight = $(this).height();\n self.ctx.bImageWidth = $(this).width();\n self.onResize();\n });\n self.ctx.$container.append(bgImg);\n bgImg.attr(''src'', imageUrl);\n \n self.onDataUpdated();\n}\n\nself.onDataUpdated = function() {\n updateLabels();\n}\n\nself.onResize = function() {\n if (self.ctx.bImageHeight && self.ctx.bImageWidth) {\n var backgroundRect = {};\n var imageRatio = self.ctx.bImageWidth / self.ctx.bImageHeight;\n var componentRatio = self.ctx.width / self.ctx.height;\n if (componentRatio >= imageRatio) {\n backgroundRect.top = 0;\n backgroundRect.bottom = 1.0;\n backgroundRect.xRatio = imageRatio / componentRatio;\n backgroundRect.yRatio = 1;\n var offset = (1 - backgroundRect.xRatio) / 2;\n backgroundRect.left = offset;\n backgroundRect.right = 1 - offset;\n } else {\n backgroundRect.left = 0;\n backgroundRect.right = 1.0;\n backgroundRect.xRatio = 1;\n backgroundRect.yRatio = componentRatio / imageRatio;\n var offset = (1 - backgroundRect.yRatio) / 2;\n backgroundRect.top = offset;\n backgroundRect.bottom = 1 - offset;\n }\n for (var l = 0; l < self.ctx.labels.length; l++) {\n var label = self.ctx.labels[l];\n var labelLeft = backgroundRect.left*100 + (label.config.x*backgroundRect.xRatio);\n var labelTop = backgroundRect.top*100 + (label.config.y*backgroundRect.yRatio);\n var fontSize = self.ctx.height * backgroundRect.yRatio * label.config.font.size / 100;\n label.element.css(''top'', labelTop + ''%'');\n label.element.css(''left'', labelLeft + ''%'');\n label.element.css(''fontSize'', fontSize + ''px'');\n if (!label.visible) {\n label.element.css(''display'', ''block'');\n label.visible = true;\n }\n }\n } \n}\n\n\nfunction isNumber(n) {\n return !isNaN(parseFloat(n)) && isFinite(n);\n}\n\nfunction padValue(val, dec, int) {\n var i = 0;\n var s, strVal, n;\n\n val = parseFloat(val);\n n = (val < 0);\n val = Math.abs(val);\n\n if (dec > 0) {\n strVal = val.toFixed(dec).toString().split(''.'');\n s = int - strVal[0].length;\n\n for (; i < s; ++i) {\n strVal[0] = ''0'' + strVal[0];\n }\n\n strVal = (n ? ''-'' : '''') + strVal[0] + ''.'' + strVal[1];\n }\n\n else {\n strVal = Math.round(val).toString();\n s = int - strVal.length;\n\n for (; i < s; ++i) {\n strVal = ''0'' + strVal;\n }\n\n strVal = (n ? ''-'' : '''') + strVal;\n }\n\n return strVal;\n}\n\nfunction updateLabels() {\n for (var l = 0; l < self.ctx.labels.length; l++) {\n var label = self.ctx.labels[l];\n var text = label.config.pattern;\n var replaceInfo = label.config.replaceInfo;\n var updated = false;\n for (var v = 0; v < replaceInfo.variables.length; v++) {\n var variableInfo = replaceInfo.variables[v];\n var txtVal = '''';\n if (variableInfo.dataKeyIndex > -1) {\n var varData = self.ctx.data[variableInfo.dataKeyIndex].data;\n if (varData.length > 0) {\n var val = varData[varData.length-1][1];\n if (isNumber(val)) {\n txtVal = padValue(val, variableInfo.valDec, 0);\n updated = true;\n } else {\n txtVal = val;\n updated = true;\n }\n }\n }\n text = text.split(variableInfo.variable).join(txtVal);\n }\n if (updated || !label.htmlSet) {\n label.element.html(text);\n if (!label.htmlSet) {\n label.htmlSet = true;\n }\n }\n }\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"Settings\",\n \"required\": [\"backgroundImageUrl\"],\n \"properties\": {\n \"backgroundImageUrl\": {\n \"title\": \"Background image\",\n \"type\": \"string\",\n \"default\": \"data:image/svg+xml;base64,PHN2ZyBpZD0ic3ZnMiIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMTAwIiB3aWR0aD0iMTAwIiB2ZXJzaW9uPSIxLjEiIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgdmlld0JveD0iMCAwIDEwMCAxMDAiPgogPGcgaWQ9ImxheWVyMSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAtOTUyLjM2KSI+CiAgPHJlY3QgaWQ9InJlY3Q0Njg0IiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBoZWlnaHQ9Ijk5LjAxIiB3aWR0aD0iOTkuMDEiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiB5PSI5NTIuODYiIHg9Ii40OTUwNSIgc3Ryb2tlLXdpZHRoPSIuOTkwMTAiIGZpbGw9IiNlZWUiLz4KICA8dGV4dCBpZD0idGV4dDQ2ODYiIHN0eWxlPSJ3b3JkLXNwYWNpbmc6MHB4O2xldHRlci1zcGFjaW5nOjBweDt0ZXh0LWFuY2hvcjptaWRkbGU7dGV4dC1hbGlnbjpjZW50ZXIiIGZvbnQtd2VpZ2h0PSJib2xkIiB4bWw6c3BhY2U9InByZXNlcnZlIiBmb250LXNpemU9IjEwcHgiIGxpbmUtaGVpZ2h0PSIxMjUlIiB5PSI5NzAuNzI4MDkiIHg9IjQ5LjM5NjQ3NyIgZm9udC1mYW1pbHk9IlJvYm90byIgZmlsbD0iIzY2NjY2NiI+PHRzcGFuIGlkPSJ0c3BhbjQ2OTAiIHg9IjUwLjY0NjQ3NyIgeT0iOTcwLjcyODA5Ij5JbWFnZSBiYWNrZ3JvdW5kIDwvdHNwYW4+PHRzcGFuIGlkPSJ0c3BhbjQ2OTIiIHg9IjQ5LjM5NjQ3NyIgeT0iOTgzLjIyODA5Ij5pcyBub3QgY29uZmlndXJlZDwvdHNwYW4+PC90ZXh0PgogIDxyZWN0IGlkPSJyZWN0NDY5NCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgaGVpZ2h0PSIxOS4zNiIgd2lkdGg9IjY5LjM2IiBzdHJva2U9IiMwMDAiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgeT0iOTkyLjY4IiB4PSIxNS4zMiIgc3Ryb2tlLXdpZHRoPSIuNjM5ODYiIGZpbGw9Im5vbmUiLz4KIDwvZz4KPC9zdmc+Cg==\"\n },\n \"labels\": {\n \"title\": \"Labels\",\n \"type\": \"array\",\n \"items\": {\n \"title\": \"Label\",\n \"type\": \"object\",\n \"required\": [\"pattern\"],\n \"properties\": {\n \"pattern\": {\n \"title\": \"Pattern ( for ex. ''Text ${keyName} units.'' or ''${#} units'' )\",\n \"type\": \"string\",\n \"default\": \"${#0}\"\n },\n \"x\": {\n \"title\": \"X (Percentage relative to background)\",\n \"type\": \"number\",\n \"default\": 50\n },\n \"y\": {\n \"title\": \"Y (Percentage relative to background)\",\n \"type\": \"number\",\n \"default\": 50\n },\n \"backgroundColor\": {\n \"title\": \"Backround color\",\n \"type\": \"string\",\n \"default\": \"rgba(0,0,0,0)\"\n },\n \"font\": {\n \"type\": \"object\",\n \"properties\": {\n \"family\": {\n \"title\": \"Font family\",\n \"type\": \"string\",\n \"default\": \"RobotoDraft\"\n },\n \"size\": {\n \"title\": \"Relative font size (percents)\",\n \"type\": \"number\",\n \"default\": 6\n },\n \"style\": {\n \"title\": \"Style\",\n \"type\": \"string\",\n \"default\": \"normal\"\n },\n \"weight\": {\n \"title\": \"Weight\",\n \"type\": \"string\",\n \"default\": \"500\"\n },\n \"color\": {\n \"title\": \"color\",\n \"type\": \"string\",\n \"default\": \"#fff\"\n }\n }\n }\n }\n }\n }\n }\n },\n \"form\": [\n {\n \"key\": \"backgroundImageUrl\",\n \"type\": \"image\"\n },\n {\n \"key\": \"labels\",\n \"items\": [\n \"labels[].pattern\",\n \"labels[].x\",\n \"labels[].y\",\n {\n \"key\": \"labels[].backgroundColor\",\n \"type\": \"color\"\n },\n \"labels[].font.family\",\n \"labels[].font.size\",\n {\n \"key\": \"labels[].font.style\",\n \"type\": \"rc-select\",\n \"multiple\": false,\n \"items\": [\n {\n \"value\": \"normal\",\n \"label\": \"Normal\"\n },\n {\n \"value\": \"italic\",\n \"label\": \"Italic\"\n },\n {\n \"value\": \"oblique\",\n \"label\": \"Oblique\"\n }\n ]\n\n },\n {\n \"key\": \"labels[].font.weight\",\n \"type\": \"rc-select\",\n \"multiple\": false,\n \"items\": [\n {\n \"value\": \"normal\",\n \"label\": \"Normal\"\n },\n {\n \"value\": \"bold\",\n \"label\": \"Bold\"\n },\n {\n \"value\": \"bolder\",\n \"label\": \"Bolder\"\n },\n {\n \"value\": \"lighter\",\n \"label\": \"Lighter\"\n },\n {\n \"value\": \"100\",\n \"label\": \"100\"\n },\n {\n \"value\": \"200\",\n \"label\": \"200\"\n },\n {\n \"value\": \"300\",\n \"label\": \"300\"\n },\n {\n \"value\": \"400\",\n \"label\": \"400\"\n },\n {\n \"value\": \"500\",\n \"label\": \"500\"\n },\n {\n \"value\": \"600\",\n \"label\": \"600\"\n },\n {\n \"value\": \"700\",\n \"label\": \"800\"\n },\n {\n \"value\": \"800\",\n \"label\": \"800\"\n },\n {\n \"value\": \"900\",\n \"label\": \"900\"\n }\n ]\n },\n {\n \"key\": \"labels[].font.color\",\n \"type\": \"color\"\n }\n ]\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"var\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"backgroundImageUrl\":\"data:image/svg+xml;base64,PHN2ZyBpZD0ic3ZnMiIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMTAwIiB3aWR0aD0iMTAwIiB2ZXJzaW9uPSIxLjEiIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgdmlld0JveD0iMCAwIDEwMCAxMDAiPgogPGcgaWQ9ImxheWVyMSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAtOTUyLjM2KSI+CiAgPHJlY3QgaWQ9InJlY3Q0Njg0IiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBoZWlnaHQ9Ijk5LjAxIiB3aWR0aD0iOTkuMDEiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiB5PSI5NTIuODYiIHg9Ii40OTUwNSIgc3Ryb2tlLXdpZHRoPSIuOTkwMTAiIGZpbGw9IiNlZWUiLz4KICA8dGV4dCBpZD0idGV4dDQ2ODYiIHN0eWxlPSJ3b3JkLXNwYWNpbmc6MHB4O2xldHRlci1zcGFjaW5nOjBweDt0ZXh0LWFuY2hvcjptaWRkbGU7dGV4dC1hbGlnbjpjZW50ZXIiIGZvbnQtd2VpZ2h0PSJib2xkIiB4bWw6c3BhY2U9InByZXNlcnZlIiBmb250LXNpemU9IjEwcHgiIGxpbmUtaGVpZ2h0PSIxMjUlIiB5PSI5NzAuNzI4MDkiIHg9IjQ5LjM5NjQ3NyIgZm9udC1mYW1pbHk9IlJvYm90byIgZmlsbD0iIzY2NjY2NiI+PHRzcGFuIGlkPSJ0c3BhbjQ2OTAiIHg9IjUwLjY0NjQ3NyIgeT0iOTcwLjcyODA5Ij5JbWFnZSBiYWNrZ3JvdW5kIDwvdHNwYW4+PHRzcGFuIGlkPSJ0c3BhbjQ2OTIiIHg9IjQ5LjM5NjQ3NyIgeT0iOTgzLjIyODA5Ij5pcyBub3QgY29uZmlndXJlZDwvdHNwYW4+PC90ZXh0PgogIDxyZWN0IGlkPSJyZWN0NDY5NCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgaGVpZ2h0PSIxOS4zNiIgd2lkdGg9IjY5LjM2IiBzdHJva2U9IiMwMDAiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgeT0iOTkyLjY4IiB4PSIxNS4zMiIgc3Ryb2tlLXdpZHRoPSIuNjM5ODYiIGZpbGw9Im5vbmUiLz4KIDwvZz4KPC9zdmc+Cg==\",\"labels\":[{\"pattern\":\"Value: ${#0:2} units.\",\"x\":20,\"y\":47,\"font\":{\"color\":\"#515151\",\"family\":\"Roboto\",\"size\":6,\"style\":\"normal\",\"weight\":\"500\"}}]},\"title\":\"Label widget\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'Label widget' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'cdf0fc46-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'cards', 'simple_card', + '{"type":"latest","sizeX":5,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#container {\n overflow: auto;\n}\n\n.tbDatasource-container {\n width: 100%;\n height: 100%;\n overflow: hidden;\n}\n\n.tbDatasource-table {\n width: 100%;\n height: 100%;\n border-collapse: collapse;\n white-space: nowrap;\n font-weight: 100;\n text-align: right;\n}\n\n.tbDatasource-table td {\n padding: 12px;\n position: relative;\n box-sizing: border-box;\n}\n\n.tbDatasource-data-key {\n opacity: 0.7;\n font-weight: 400;\n font-size: 3.500rem;\n}\n\n.tbDatasource-value {\n font-size: 5.000rem;\n}","controllerScript":"self.onInit = function() {\n self.ctx.units = self.ctx.settings.units || self.ctx.units;\n self.ctx.valueDec = (typeof self.ctx.settings.valueDec !== ''undefined'' && self.ctx.settings.valueDec !== null)\n ? self.ctx.settings.valueDec : self.ctx.decimals;\n \n self.ctx.labelPosition = self.ctx.settings.labelPosition || ''left'';\n \n if (self.ctx.datasources.length > 0) {\n var tbDatasource = self.ctx.datasources[0];\n var datasourceId = ''tbDatasource'' + 0;\n self.ctx.$container.append(\n \"
\"\n );\n \n self.ctx.datasourceContainer = $(''#'' + datasourceId,\n self.ctx.$container);\n \n var tableId = ''table'' + 0;\n self.ctx.datasourceContainer.append(\n \"
\"\n );\n var table = $(''#'' + tableId, self.ctx.$container);\n if (self.ctx.labelPosition === ''top'') {\n table.css(''text-align'', ''left'');\n }\n \n if (tbDatasource.dataKeys.length > 0) {\n var dataKey = tbDatasource.dataKeys[0];\n var labelCellId = ''labelCell'' + 0;\n var cellId = ''cell'' + 0;\n if (self.ctx.labelPosition === ''left'') {\n table.append(\n \"\" +\n dataKey.label +\n \"\");\n } else {\n table.append(\n \"\" +\n dataKey.label +\n \"\");\n }\n self.ctx.labelCell = $(''#'' + labelCellId, table);\n self.ctx.valueCell = $(''#'' + cellId, table);\n self.ctx.valueCell.html(0 + '' '' + self.ctx.units);\n }\n }\n \n $.fn.textWidth = function(){\n var html_org = $(this).html();\n var html_calc = '''' + html_org + '''';\n $(this).html(html_calc);\n var width = $(this).find(''span:first'').width();\n $(this).html(html_org);\n return width;\n }; \n \n self.onResize();\n}\n\nself.onDataUpdated = function() {\n \n function isNumber(n) {\n return !isNaN(parseFloat(n)) && isFinite(n);\n }\n \n function padValue(val, dec, int) {\n var i = 0;\n var s, strVal, n;\n \n val = parseFloat(val);\n n = (val < 0);\n val = Math.abs(val);\n \n if (dec > 0) {\n strVal = val.toFixed(dec).toString().split(''.'');\n s = int - strVal[0].length;\n \n for (; i < s; ++i) {\n strVal[0] = ''0'' + strVal[0];\n }\n \n strVal = (n ? ''-'' : '''') + strVal[0] + ''.'' + strVal[1];\n }\n \n else {\n strVal = Math.round(val).toString();\n s = int - strVal.length;\n \n for (; i < s; ++i) {\n strVal = ''0'' + strVal;\n }\n \n strVal = (n ? ''-'' : '''') + strVal;\n }\n \n return strVal;\n }\n \n if (self.ctx.valueCell && self.ctx.data.length > 0) {\n var cellData = self.ctx.data[0];\n if (cellData.data.length > 0) {\n var tvPair = cellData.data[cellData.data.length -\n 1];\n var value = tvPair[1];\n var txtValue;\n if (isNumber(value)) {\n txtValue = padValue(value, self.ctx.alueDec, 0) + '' '' + self.ctx.units;\n } else {\n txtValue = value;\n }\n self.ctx.valueCell.html(txtValue);\n var targetWidth;\n var minDelta;\n if (self.ctx.labelPosition === ''left'') {\n targetWidth = self.ctx.datasourceContainer.width() - self.ctx.labelCell.width();\n minDelta = self.ctx.width/16 + self.ctx.padding;\n } else {\n targetWidth = self.ctx.datasourceContainer.width();\n minDelta = self.ctx.padding;\n }\n var delta = targetWidth - self.ctx.valueCell.textWidth();\n var fontSize = self.ctx.valueFontSize;\n if (targetWidth > minDelta) {\n while (delta < minDelta && fontSize > 6) {\n fontSize--;\n self.ctx.valueCell.css(''font-size'', fontSize+''px'');\n delta = targetWidth - self.ctx.valueCell.textWidth();\n }\n }\n }\n } \n \n}\n\nself.onResize = function() {\n var labelFontSize;\n if (self.ctx.labelPosition === ''top'') {\n self.ctx.padding = self.ctx.height/20;\n labelFontSize = self.ctx.height/4;\n self.ctx.valueFontSize = self.ctx.height/2;\n } else {\n self.ctx.padding = self.ctx.width/50;\n labelFontSize = self.ctx.height/2.5;\n self.ctx.valueFontSize = height/2;\n if (self.ctx.width/self.ctx.height <= 2.7) {\n labelFontSize = self.ctx.width/7;\n self.ctx.valueFontSize = self.ctx.width/6;\n }\n }\n self.ctx.padding = Math.min(12, self.ctx.padding);\n \n if (self.ctx.labelCell) {\n self.ctx.labelCell.css(''font-size'', labelFontSize+''px'');\n self.ctx.labelCell.css(''padding'', self.ctx.padding+''px'');\n }\n if (self.ctx.valueCell) {\n self.ctx.valueCell.css(''font-size'', self.ctx.valueFontSize+''px'');\n self.ctx.valueCell.css(''padding'', self.ctx.padding+''px'');\n } \n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"Settings\",\n \"properties\": {\n \"labelPosition\": {\n \"title\": \"Label position\",\n \"type\": \"string\",\n \"default\": \"left\"\n }\n },\n \"required\": []\n },\n \"form\": [\n {\n \"key\": \"labelPosition\",\n \"type\": \"rc-select\",\n \"multiple\": false,\n \"items\": [\n {\n \"value\": \"left\",\n \"label\": \"Left\"\n },\n {\n \"value\": \"top\",\n \"label\": \"Top\"\n }\n ]\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.2392660816082064,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#ff5722\",\"color\":\"rgba(255, 255, 255, 0.87)\",\"padding\":\"16px\",\"settings\":{\"labelPosition\":\"top\"},\"title\":\"Simple card\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"units\":\"°C\",\"decimals\":0,\"useDashboardTimewindow\":true,\"showLegend\":false}"}', + 'Simple card' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'd12897a2-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', 'lcd_bar_gauge', + '{"type":"latest","sizeX":2,"sizeY":3.5,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Humidity\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#babab2\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\"linear\",\"refreshAnimationTime\":700,\"startAnimationType\":\"linear\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Roboto\",\"style\":\"normal\",\"weight\":\"400\",\"size\":16},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"neonGlowBrightness\":0,\"dashThickness\":1.5,\"decimals\":0,\"showUnitTitle\":true,\"defaultColor\":\"#444444\",\"gaugeType\":\"verticalBar\",\"units\":\"%\"},\"title\":\"LCD bar gauge\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'LCD bar gauge' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'd4041e6a-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', + 'vertical_bar_justgage', + '{"type":"latest","sizeX":2,"sizeY":3.5,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#f57c00\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#999999\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Roboto\",\"style\":\"normal\",\"weight\":\"500\",\"size\":12,\"color\":\"#666666\"},\"minMaxFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#666666\"},\"neonGlowBrightness\":0,\"decimals\":0,\"dashThickness\":1.5,\"gaugeColor\":\"#eeeeee\",\"showTitle\":false,\"gaugeType\":\"verticalBar\"},\"title\":\"Vertical bar - justGage\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'Vertical bar - justGage' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'd6d4e8ea-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'cards', 'html_value_card', + '{"type":"latest","sizeX":7.5,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"","controllerScript":"self.onInit = function() {\n self.ctx.varsRegex = /\\$\\{([^\\}]*)\\}/g;\n self.ctx.htmlSet = false;\n \n var cssParser = new cssjs();\n cssParser.testMode = false;\n var namespace = ''html-value-card-'' + hashCode(self.ctx.settings.cardCss);\n cssParser.cssPreviewNamespace = namespace;\n cssParser.createStyleElement(namespace, self.ctx.settings.cardCss);\n self.ctx.$container.addClass(namespace);\n self.ctx.html = self.ctx.settings.cardHtml;\n self.ctx.replaceInfo = processHtmlPattern(self.ctx.html, self.ctx.data);\n \n updateHtml();\n \n function hashCode(str) {\n var hash = 0;\n var i, char;\n if (str.length === 0) return hash;\n for (i = 0; i < str.length; i++) {\n char = str.charCodeAt(i);\n hash = ((hash << 5) - hash) + char;\n hash = hash & hash;\n }\n return hash;\n }\n \n function processHtmlPattern(pattern, data) {\n var match = self.ctx.varsRegex.exec(pattern);\n var replaceInfo = {};\n replaceInfo.variables = [];\n while (match !== null) {\n var variableInfo = {};\n variableInfo.dataKeyIndex = -1;\n var variable = match[0];\n var label = match[1];\n var valDec = 2;\n var splitVals = label.split('':'');\n if (splitVals.length > 1) {\n label = splitVals[0];\n valDec = parseFloat(splitVals[1]);\n }\n variableInfo.variable = variable;\n variableInfo.valDec = valDec;\n \n if (label.startsWith(''#'')) {\n var keyIndexStr = label.substring(1);\n var n = Math.floor(Number(keyIndexStr));\n if (String(n) === keyIndexStr && n >= 0) {\n variableInfo.dataKeyIndex = n;\n }\n }\n if (variableInfo.dataKeyIndex === -1) {\n for (var i = 0; i < data.length; i++) {\n var datasourceData = data[i];\n var dataKey = datasourceData.dataKey;\n if (dataKey.label === label) {\n variableInfo.dataKeyIndex = i;\n break;\n }\n }\n }\n replaceInfo.variables.push(variableInfo);\n match = self.ctx.varsRegex.exec(pattern);\n }\n return replaceInfo;\n } \n}\n\nself.onDataUpdated = function() {\n updateHtml();\n}\n\nself.onDestroy = function() {\n}\n\nfunction isNumber(n) {\n return !isNaN(parseFloat(n)) && isFinite(n);\n}\n\nfunction padValue(val, dec, int) {\n var i = 0;\n var s, strVal, n;\n\n val = parseFloat(val);\n n = (val < 0);\n val = Math.abs(val);\n\n if (dec > 0) {\n strVal = val.toFixed(dec).toString().split(''.'');\n s = int - strVal[0].length;\n\n for (; i < s; ++i) {\n strVal[0] = ''0'' + strVal[0];\n }\n\n strVal = (n ? ''-'' : '''') + strVal[0] + ''.'' + strVal[1];\n }\n\n else {\n strVal = Math.round(val).toString();\n s = int - strVal.length;\n\n for (; i < s; ++i) {\n strVal = ''0'' + strVal;\n }\n\n strVal = (n ? ''-'' : '''') + strVal;\n }\n\n return strVal;\n}\n\nfunction updateHtml() {\n var text = self.ctx.html;\n var updated = false;\n for (var v in self.ctx.replaceInfo.variables) {\n var variableInfo = self.ctx.replaceInfo.variables[v];\n var txtVal = '''';\n if (variableInfo.dataKeyIndex > -1) {\n var varData = self.ctx.data[variableInfo.dataKeyIndex].data;\n if (varData.length > 0) {\n var val = varData[varData.length-1][1];\n if (isNumber(val)) {\n txtVal = padValue(val, variableInfo.valDec, 0);\n } else {\n txtVal = val;\n }\n }\n }\n if (typeof variableInfo.lastVal === undefined ||\n variableInfo.lastVal !== txtVal) {\n updated = true;\n variableInfo.lastVal = txtVal;\n }\n text = text.split(variableInfo.variable).join(txtVal);\n }\n if (updated || !self.ctx.htmlSet) {\n self.ctx.$container.html(text);\n if (!self.ctx.htmlSet) {\n self.ctx.htmlSet = true;\n }\n }\n}\n\n","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"Settings\",\n \"required\": [\"cardHtml\"],\n \"properties\": {\n \"cardCss\": {\n \"title\": \"CSS\",\n \"type\": \"string\",\n \"default\": \".card {\\n font-weight: bold; \\n}\"\n },\n \"cardHtml\": {\n \"title\": \"HTML\",\n \"type\": \"string\",\n \"default\": \"
HTML code here
\"\n }\n }\n },\n \"form\": [\n {\n \"key\": \"cardCss\",\n \"type\": \"css\"\n }, \n {\n \"key\": \"cardHtml\",\n \"type\": \"html\"\n } \n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"My value\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"return Math.random() * 5.45;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"cardCss\":\".card {\\n width: 100%;\\n height: 100%;\\n border: 2px solid #ccc;\\n box-sizing: border-box;\\n}\\n\\n.card .content {\\n padding: 20px;\\n display: flex;\\n flex-direction: row;\\n align-items: center;\\n justify-content: space-around;\\n height: 100%;\\n box-sizing: border-box;\\n}\\n\\n.card .content .column {\\n display: flex;\\n flex-direction: column; \\n justify-content: space-around;\\n height: 100%;\\n}\\n\\n.card h1 {\\n text-transform: uppercase;\\n color: #999;\\n font-size: 20px;\\n font-weight: bold;\\n margin: 0;\\n padding-bottom: 10px;\\n line-height: 32px;\\n}\\n\\n.card .value {\\n font-size: 38px;\\n font-weight: 200;\\n}\\n\\n.card .description {\\n font-size: 20px;\\n color: #999;\\n}\\n\",\"cardHtml\":\"
\\n
\\n
\\n

Value title

\\n
\\n ${My value:2} units.\\n
\\n
\\n Value description text\\n
\\n
\\n \\n
\\n
\"},\"title\":\"HTML Value Card\",\"dropShadow\":false}"}', + 'HTML Value Card' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'e3ca1868-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'gpio_widgets', + 'raspberry_pi_gpio_panel', + '{"type":"latest","sizeX":7,"sizeY":10.5,"resources":[],"templateHtml":"
\n
\n
\n
\n {{ cell.label }}\n
\n {{cell.pin}}\n \n \n \n \n {{cell.pin}}\n
\n {{ cell.label }}\n
\n
\n \n \n \n
\n
\n
\n
","templateCss":".error {\n font-size: 14px !important;\n color: maroon;/*rgb(250,250,250);*/\n background-color: transparent;\n padding: 6px;\n}\n\n.error span {\n margin: auto;\n}\n\n.gpio-panel {\n padding-top: 10px;\n white-space: nowrap;\n}\n\n.gpio-panel tb-led-light > div {\n margin: auto;\n}\n\n.led-panel {\n margin: 0;\n width: 66px;\n min-width: 66px;\n}\n\n.led-container {\n width: 48px;\n min-width: 48px;\n}\n\n.pin {\n margin-top: auto;\n margin-bottom: auto;\n color: white;\n font-size: 12px;\n width: 16px;\n min-width: 16px;\n}\n\n.led-panel.col-0 .pin {\n margin-left: auto;\n padding-left: 2px;\n text-align: right;\n}\n\n.led-panel.col-1 .pin {\n margin-right: auto;\n \n text-align: left;\n}\n\n.gpio-left-label {\n margin-right: 8px;\n}\n\n.gpio-right-label {\n margin-left: 8px;\n}","controllerScript":"self.onInit = function() {\n var i, gpio;\n \n var scope = self.ctx.$scope;\n var settings = self.ctx.settings;\n \n scope.gpioList = [];\n scope.gpioByPin = {};\n for (var g = 0; g < settings.gpioList.length; g++) {\n gpio = settings.gpioList[g];\n scope.gpioList.push(\n {\n row: gpio.row,\n col: gpio.col,\n pin: gpio.pin,\n label: gpio.label,\n enabled: false,\n colorOn: tinycolor(gpio.color).lighten(20).toHexString(),\n colorOff: tinycolor(gpio.color).darken().toHexString()\n }\n );\n scope.gpioByPin[gpio.pin] = scope.gpioList[scope.gpioList.length-1];\n }\n\n scope.ledPanelBackgroundColor = settings.ledPanelBackgroundColor || tinycolor(''green'').lighten(2).toRgbString();\n\n scope.gpioCells = {};\n var rowCount = 0;\n for (i = 0; i < scope.gpioList.length; i++) {\n gpio = scope.gpioList[i];\n scope.gpioCells[gpio.row+''_''+gpio.col] = gpio;\n rowCount = Math.max(rowCount, gpio.row+1);\n }\n \n scope.prefferedRowHeight = 32;\n scope.rows = [];\n for (i = 0; i < rowCount; i++) {\n var row = [];\n for (var c =0; c<2;c++) {\n if (scope.gpioCells[i+''_''+c]) {\n row[c] = scope.gpioCells[i+''_''+c];\n } else {\n row[c] = null;\n }\n }\n scope.rows.push(row);\n } \n \n self.onResize();\n}\n\nself.onDataUpdated = function() {\n var changed = false;\n for (var d = 0; d < self.ctx.data.length; d++) {\n var cellData = self.ctx.data[d];\n var dataKey = cellData.dataKey;\n var gpio = self.ctx.$scope.gpioByPin[dataKey.label];\n if (gpio) {\n var enabled = false;\n if (cellData.data.length > 0) {\n var tvPair = cellData.data[cellData.data.length - 1];\n enabled = (tvPair[1] === true || tvPair[1] === ''true'');\n }\n if (gpio.enabled != enabled) {\n changed = true;\n gpio.enabled = enabled;\n }\n }\n }\n if (changed) {\n self.ctx.$scope.$digest();\n } \n}\n\nself.onResize = function() {\n var rowCount = self.ctx.$scope.rows.length;\n var prefferedRowHeight = (self.ctx.height - 35)/rowCount;\n prefferedRowHeight = Math.min(32, prefferedRowHeight);\n prefferedRowHeight = Math.max(12, prefferedRowHeight);\n self.ctx.$scope.prefferedRowHeight = prefferedRowHeight;\n \n var ratio = prefferedRowHeight/32;\n \n var leftLabels = $(''.gpio-left-label'', self.ctx.$container);\n leftLabels.css(''font-size'', 16*ratio+''px'');\n var rightLabels = $(''.gpio-right-label'', self.ctx.$container);\n rightLabels.css(''font-size'', 16*ratio+''px'');\n var pins = $(''.pin'', self.ctx.$container);\n var pinsFontSize = Math.max(9, 12*ratio);\n pins.css(''font-size'', pinsFontSize+''px''); \n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"Settings\",\n \"properties\": {\n \"gpioList\": {\n \"title\": \"Gpio leds\",\n \"type\": \"array\",\n \"minItems\" : 1,\n \"items\": {\n \"title\": \"Gpio led\",\n \"type\": \"object\",\n \"properties\": {\n \"pin\": {\n \"title\": \"Pin\",\n \"type\": \"number\"\n },\n \"label\": {\n \"title\": \"Label\",\n \"type\": \"string\"\n },\n \"row\": {\n \"title\": \"Row\",\n \"type\": \"number\"\n },\n \"col\": {\n \"title\": \"Column\",\n \"type\": \"number\"\n },\n \"color\": {\n \"title\": \"Color\",\n \"type\": \"string\",\n \"default\": \"red\"\n }\n },\n \"required\": [\"pin\", \"label\", \"row\", \"col\", \"color\"]\n }\n },\n \"ledPanelBackgroundColor\": {\n \"title\": \"LED panel background color\",\n \"type\": \"string\",\n \"default\": \"#008a00\"\n } \n },\n \"required\": [\"gpioList\", \n \"ledPanelBackgroundColor\"]\n },\n \"form\": [\n {\n \"key\": \"gpioList\",\n \"items\": [\n \"gpioList[].pin\",\n \"gpioList[].label\",\n \"gpioList[].row\",\n \"gpioList[].col\",\n {\n \"key\": \"gpioList[].color\",\n \"type\": \"color\"\n }\n ]\n },\n {\n \"key\": \"ledPanelBackgroundColor\",\n \"type\": \"color\"\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"gpioList\":[{\"pin\":1,\"label\":\"3.3V\",\"row\":0,\"col\":0,\"color\":\"#fc9700\",\"_uniqueKey\":0},{\"pin\":2,\"label\":\"5V\",\"row\":0,\"col\":1,\"color\":\"#fb0000\",\"_uniqueKey\":1},{\"pin\":3,\"label\":\"GPIO 2 (I2C1_SDA)\",\"row\":1,\"col\":0,\"color\":\"#02fefb\",\"_uniqueKey\":2},{\"color\":\"#fb0000\",\"pin\":4,\"label\":\"5V\",\"row\":1,\"col\":1},{\"color\":\"#02fefb\",\"pin\":5,\"label\":\"GPIO 3 (I2C1_SCL)\",\"row\":2,\"col\":0},{\"color\":\"#000000\",\"pin\":6,\"label\":\"GND\",\"row\":2,\"col\":1},{\"color\":\"#00fd00\",\"pin\":7,\"label\":\"GPIO 4 (GPCLK0)\",\"row\":3,\"col\":0},{\"color\":\"#fdfb00\",\"pin\":8,\"label\":\"GPIO 14 (UART_TXD)\",\"row\":3,\"col\":1},{\"color\":\"#000000\",\"pin\":9,\"label\":\"GND\",\"row\":4,\"col\":0},{\"color\":\"#fdfb00\",\"pin\":10,\"label\":\"GPIO 15 (UART_RXD)\",\"row\":4,\"col\":1},{\"color\":\"#00fd00\",\"pin\":11,\"label\":\"GPIO 17\",\"row\":5,\"col\":0},{\"color\":\"#00fd00\",\"pin\":12,\"label\":\"GPIO 18\",\"row\":5,\"col\":1},{\"color\":\"#00fd00\",\"pin\":13,\"label\":\"GPIO 27\",\"row\":6,\"col\":0},{\"color\":\"#000000\",\"pin\":14,\"label\":\"GND\",\"row\":6,\"col\":1},{\"color\":\"#00fd00\",\"pin\":15,\"label\":\"GPIO 22\",\"row\":7,\"col\":0},{\"color\":\"#00fd00\",\"pin\":16,\"label\":\"GPIO 23\",\"row\":7,\"col\":1},{\"color\":\"#fc9700\",\"pin\":17,\"label\":\"3.3V\",\"row\":8,\"col\":0},{\"color\":\"#00fd00\",\"pin\":18,\"label\":\"GPIO 24\",\"row\":8,\"col\":1},{\"color\":\"#fd01fd\",\"pin\":19,\"label\":\"GPIO 10 (SPI_MOSI)\",\"row\":9,\"col\":0},{\"color\":\"#000000\",\"pin\":20,\"label\":\"GND\",\"row\":9,\"col\":1},{\"color\":\"#fd01fd\",\"pin\":21,\"label\":\"GPIO 9 (SPI_MISO)\",\"row\":10,\"col\":0},{\"color\":\"#00fd00\",\"pin\":22,\"label\":\"GPIO 25\",\"row\":10,\"col\":1},{\"color\":\"#fd01fd\",\"pin\":23,\"label\":\"GPIO 11 (SPI_SCLK)\",\"row\":11,\"col\":0},{\"color\":\"#fd01fd\",\"pin\":24,\"label\":\"GPIO 8 (SPI_CE0)\",\"row\":11,\"col\":1},{\"color\":\"#000000\",\"pin\":25,\"label\":\"GND\",\"row\":12,\"col\":0},{\"color\":\"#fd01fd\",\"pin\":26,\"label\":\"GPIO 7 (SPI_CE1)\",\"row\":12,\"col\":1},{\"color\":\"#ffffff\",\"pin\":27,\"label\":\"ID_SD\",\"row\":13,\"col\":0},{\"color\":\"#ffffff\",\"pin\":28,\"label\":\"ID_SC\",\"row\":13,\"col\":1},{\"color\":\"#00fd00\",\"pin\":29,\"label\":\"GPIO 5\",\"row\":14,\"col\":0},{\"color\":\"#000000\",\"pin\":30,\"label\":\"GND\",\"row\":14,\"col\":1},{\"color\":\"#00fd00\",\"pin\":31,\"label\":\"GPIO 6\",\"row\":15,\"col\":0},{\"color\":\"#00fd00\",\"pin\":32,\"label\":\"GPIO 12\",\"row\":15,\"col\":1},{\"color\":\"#00fd00\",\"pin\":33,\"label\":\"GPIO 13\",\"row\":16,\"col\":0},{\"color\":\"#000000\",\"pin\":34,\"label\":\"GND\",\"row\":16,\"col\":1},{\"color\":\"#00fd00\",\"pin\":35,\"label\":\"GPIO 19\",\"row\":17,\"col\":0},{\"color\":\"#00fd00\",\"pin\":36,\"label\":\"GPIO 16\",\"row\":17,\"col\":1},{\"color\":\"#00fd00\",\"pin\":37,\"label\":\"GPIO 26\",\"row\":18,\"col\":0},{\"color\":\"#00fd00\",\"pin\":38,\"label\":\"GPIO 20\",\"row\":18,\"col\":1},{\"color\":\"#000000\",\"pin\":39,\"label\":\"GND\",\"row\":19,\"col\":0},{\"color\":\"#00fd00\",\"pin\":40,\"label\":\"GPIO 21\",\"row\":19,\"col\":1}],\"ledPanelBackgroundColor\":\"#008a00\"},\"title\":\"Raspberry Pi GPIO Panel\",\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"7\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.22518255793320163,\"funcBody\":\"var period = time % 1500;\\nreturn period < 500;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"11\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.7008206860666621,\"funcBody\":\"var period = time % 1500;\\nreturn period >= 500 && period < 1000;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"12\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.42600325102193426,\"funcBody\":\"var period = time % 1500;\\nreturn period >= 1000;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"13\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.48362241571415243,\"funcBody\":\"var period = time % 1500;\\nreturn period < 500;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"29\",\"color\":\"#607d8b\",\"settings\":{},\"_hash\":0.7217670147518815,\"funcBody\":\"var period = time % 1500;\\nreturn period >= 500 && period < 1000;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}}}"}', + 'Raspberry Pi GPIO Panel' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'e7acbd64-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'radar_chart_js', + '{"type":"latest","sizeX":7,"sizeY":5,"resources":[{"url":"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"}],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n var barData = {\n labels: [],\n datasets: []\n };\n\n var backgroundColor = tinycolor(self.ctx.data[0].dataKey.color);\n backgroundColor.setAlpha(0.2);\n var borderColor = tinycolor(self.ctx.data[0].dataKey.color);\n borderColor.setAlpha(1);\n var dataset = {\n label: self.ctx.datasources[0].name,\n data: [],\n backgroundColor: backgroundColor.toRgbString(),\n borderColor: borderColor.toRgbString(),\n pointBackgroundColor: borderColor.toRgbString(),\n pointBorderColor: borderColor.darken().toRgbString(),\n borderWidth: 1\n }\n \n barData.datasets.push(dataset);\n \n for (var i = 0; i < self.ctx.data.length; i++) {\n var dataKey = self.ctx.data[i].dataKey;\n barData.labels.push(dataKey.label);\n dataset.data.push(0);\n }\n\n var ctx = $(''#radarChart'', self.ctx.$container);\n self.ctx.chart = new Chart(ctx, {\n type: ''radar'',\n data: barData,\n options: {\n responsive: false,\n maintainAspectRatio: false\n }\n });\n \n self.onResize();\n}\n\nself.onDataUpdated = function() {\n for (var i = 0; i < self.ctx.data.length; i++) {\n var cellData = self.ctx.data[i];\n if (cellData.data.length > 0) {\n var tvPair = cellData.data[cellData.data.length - 1];\n var value = tvPair[1];\n self.ctx.chart.data.datasets[0].data[i] = parseFloat(value);\n }\n } \n self.ctx.chart.update();\n}\n\nself.onResize = function() {\n if (self.ctx.height >= 70) {\n self.ctx.chart.resize();\n }\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Radar - Chart.js\"}"}', + 'Radar - Chart.js' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'ee579e40-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', + 'neon_gauge_justgage', + '{"type":"latest","sizeX":5,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#000000\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":32},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"neonGlowBrightness\":70,\"dashThickness\":1,\"decimals\":1,\"gaugeType\":\"arc\"},\"title\":\"Neon gauge - justGage\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'Neon gauge - justGage' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'f26ff52c-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', + 'simple_gauge_justgage', + '{"type":"latest","sizeX":2,"sizeY":2,"resources":[],"templateHtml":"\n","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"\nself.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#ef6c00\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Roboto\",\"style\":\"normal\",\"weight\":\"500\",\"size\":32,\"color\":\"#666666\"},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"neonGlowBrightness\":0,\"dashThickness\":0,\"decimals\":0,\"gaugeColor\":\"#eeeeee\",\"gaugeType\":\"donut\"},\"title\":\"Simple gauge - justGage\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'Simple gauge - justGage' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'f56c6418-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'maps', 'route_map', + '{"type":"timeseries","sizeX":8.5,"sizeY":6,"resources":[],"templateHtml":"","templateCss":".error {\n color: red;\n}\n.tb-labels {\n color: #222;\n font: 12px/1.5 \"Helvetica Neue\", Arial, Helvetica, sans-serif;\n text-align: center;\n width: 100px;\n white-space: nowrap;\n}","controllerScript":"self.onInit = function() {\n self.ctx.map = new TbMapWidget(''google-map'', true, self.ctx);\n}\n\nself.onDataUpdated = function() {\n self.ctx.map.update();\n}\n\nself.onResize = function() {\n self.ctx.map.resize();\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"title\": \"Route Map Configuration\",\n \"type\": \"object\",\n \"properties\": {\n \"gmApiKey\": {\n \"title\": \"Google Maps API Key\",\n \"type\": \"string\"\n },\n \"gmDefaultMapType\": {\n \"title\": \"Default map type\",\n \"type\": \"string\",\n \"default\": \"roadmap\"\n },\n \"defaultZoomLevel\": {\n \"title\": \"Default map zoom level (1 - 20)\",\n \"type\": \"number\"\n },\n \"fitMapBounds\": {\n \"title\": \"Fit map bounds to cover all routes\",\n \"type\": \"boolean\",\n \"default\": true\n },\n \"routesSettings\": {\n \"title\": \"Routes\",\n \"type\": \"array\",\n \"items\": {\n \"title\": \"Route settings\",\n \"type\": \"object\",\n \"properties\": {\n \"latKeyName\": {\n \"title\": \"Latitude key name\",\n \"type\": \"string\",\n \"default\": \"lat\"\n },\n \"lngKeyName\": {\n \"title\": \"Longitude key name\",\n \"type\": \"string\",\n \"default\": \"lng\"\n },\n \"showLabel\": {\n \"title\": \"Show label\",\n \"type\": \"boolean\",\n \"default\": true\n }, \n \"label\": {\n \"title\": \"Label\",\n \"type\": \"string\"\n },\n \"tooltipPattern\": {\n \"title\": \"Pattern ( for ex. ''Text ${keyName} units.'' or ''${#} units'' )\",\n \"type\": \"string\",\n \"default\": \"Latitude: ${lat:7}
Longitude: ${lng:7}\"\n },\n \"color\": {\n \"title\": \"Color\",\n \"type\": \"string\"\n },\n \"useColorFunction\": {\n \"title\": \"Use color function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"colorFunction\": {\n \"title\": \"Color function: f(data)\",\n \"type\": \"string\"\n },\n \"markerImage\": {\n \"title\": \"Custom marker image\",\n \"type\": \"string\"\n },\n \"markerImageSize\": {\n \"title\": \"Custom marker image size (px)\",\n \"type\": \"number\",\n \"default\": 34\n },\n \"useMarkerImageFunction\": {\n \"title\": \"Use marker image function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"markerImageFunction\": {\n \"title\": \"Marker image function: f(data, images)\",\n \"type\": \"string\"\n },\n \"markerImages\": {\n \"title\": \"Marker images\",\n \"type\": \"array\",\n \"items\": {\n \"title\": \"Marker image\",\n \"type\": \"string\"\n }\n },\n \"strokeWeight\": {\n \"title\": \"Stroke weight\",\n \"type\": \"number\",\n \"default\": 2\n },\n \"strokeOpacity\": {\n \"title\": \"Stroke opacity\",\n \"type\": \"number\",\n \"default\": 1.0\n }\n }\n }\n }\n },\n \"required\": [\n \"gmApiKey\"\n ]\n },\n \"form\": [\n \"gmApiKey\",\n {\n \"key\": \"gmDefaultMapType\",\n \"type\": \"rc-select\",\n \"multiple\": false,\n \"items\": [\n {\n \"value\": \"roadmap\",\n \"label\": \"Roadmap\"\n },\n {\n \"value\": \"satellite\",\n \"label\": \"Satellite\"\n },\n {\n \"value\": \"hybrid\",\n \"label\": \"Hybrid\"\n },\n {\n \"value\": \"terrain\",\n \"label\": \"Terrain\"\n }\n ]\n }, \n \"defaultZoomLevel\",\n \"fitMapBounds\",\n {\n \"key\": \"routesSettings\",\n \"items\": [\n \"routesSettings[].latKeyName\",\n \"routesSettings[].lngKeyName\",\n \"routesSettings[].showLabel\",\n \"routesSettings[].label\",\n \"routesSettings[].tooltipPattern\",\n {\n \"key\": \"routesSettings[].color\",\n \"type\": \"color\"\n },\n \"routesSettings[].useColorFunction\",\n {\n \"key\": \"routesSettings[].colorFunction\",\n \"type\": \"javascript\"\n },\n {\n \"key\": \"routesSettings[].markerImage\",\n \"type\": \"image\"\n },\n \"routesSettings[].markerImageSize\",\n \"routesSettings[].useMarkerImageFunction\",\n {\n \"key\": \"routesSettings[].markerImageFunction\",\n \"type\": \"javascript\"\n },\n {\n \"key\": \"routesSettings[].markerImages\",\n \"items\": [\n {\n \"key\": \"routesSettings[].markerImages[]\",\n \"type\": \"image\"\n }\n ]\n },\n \"routesSettings[].strokeWeight\",\n \"routesSettings[].strokeOpacity\"\n ]\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"latitude\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.3467277073670627,\"funcBody\":\"var lats = [37.7696499,\\n37.7699074,\\n37.7699536,\\n37.7697242,\\n37.7695189,\\n37.7696889,\\n37.7697153,\\n37.7701244,\\n37.7700604,\\n37.7705491,\\n37.7715705,\\n37.771752,\\n37.7707533,\\n37.769866];\\n\\nvar i = Math.floor((time/3 % 14000) / 1000);\\n\\nreturn lats[i];\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"longitude\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.058309787276281666,\"funcBody\":\"var lons = [-122.4261215,\\n-122.4219157,\\n-122.4199623,\\n-122.4179074,\\n-122.4155876,\\n-122.4155521,\\n-122.4163203,\\n-122.4193876,\\n-122.4210496,\\n-122.422284,\\n-122.4232717,\\n-122.4235138,\\n-122.4247605,\\n-122.4258812];\\n\\nvar i = Math.floor((time/3 % 14000) / 1000);\\n\\nreturn lons[i];\"}],\"intervalSec\":60},{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Speed\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.14288960550237473,\"funcBody\":\"var value = prevValue;\\nif (time % 500 < 100) {\\n value = value + Math.random() * 40 - 20;\\n if (value < 45) {\\n \\tvalue = 45;\\n } else if (value > 130) {\\n \\tvalue = 130;\\n }\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":30000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"gmApiKey\":\"AIzaSyDoEx2kaGz3PxwbI9T7ccTSg5xjdw8Nw8Q\",\"fitMapBounds\":true,\"routesSettings\":[{\"latKeyName\":\"latitude\",\"lngKeyName\":\"longitude\",\"showLabel\":true,\"color\":\"#1976d2\",\"strokeWeight\":4,\"strokeOpacity\":0.65,\"label\":\"First route\",\"tooltipPattern\":\"Latitude: ${latitude:7}
Longitude: ${longitude:7}
Speed: ${Speed} MPH
See advanced settings for details\",\"useColorFunction\":true,\"markerImageSize\":34,\"useMarkerImageFunction\":true,\"markerImageFunction\":\"var speed = data[''Speed''];\\nvar res = {\\n url: images[0],\\n size: 55\\n};\\nif (typeof speed !== undefined) {\\n var percent = (speed - 45)/85;\\n var index = Math.floor(3 * percent);\\n res.url = images[index];\\n}\\nreturn res;\",\"markerImages\":[\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABdCAYAAAAyj+FzAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAH3gAAB94BHQKrYQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAACAASURBVHic7b13uB3VdTb+rrX3zJx6i7qQUAEJIQlRBAZc6BgLDDYmIIExLjgJcQk/YkKc4gIGHH+fDSHg2CGOHRuCQ4ltbBODJIroIIoQIJCQdNXLvVe3nT4ze6/1/XHOlYWQAJuWP37refYz58yd3d6zyt5rr1mX8B7S5Xo5/0nPYaNFM1PY0gGqOhfAgQCNBGlWFFUAYEIeihigbhFdZQwt85BV5Gj9r/718R2XX365vFdzoHe7w6d77xnPkn4YpAtU0YiizNJcmPNkMQFkDiSlowHt2HNtGlTSJ6B+pTpsKTfKgTj3Pi8SMtFtEZnFs8d8dPu7OZ93BcCHtt0+OiL+FJjOiqy5K5dtLwD4PBHGvy0dKLYo8B+1+lAldv50FfmFzWX+84i2M3a8Le2/Dr1jAKqCHtl2y1wC/pEMP9ZRLBaYzF8CCN+pPluUkOKfB6qlmk/dBwTyt8eOv2AZCPpOdPaOAPjA1h9/SJX+TyGXuz0TZi4EcPBeOk+U+RErZh2YyMAyQJEoZUjFgtkCAEScgDyx1hmInTglqDj2U1X0WILaPbWvwHO1WummeuLONhaXHTf2wsfe7rm+rQDe133j/i5xPyrmCr+OouhSKPbdQ5fLiezTIYUBQGMJBgYWxMYSISZhbxgQT8wGAgDiwWxUvCiBxKhSKOqdh4OyV5+6XiEfK/kjVOXQ13apG+I0+adKpXaG0/Si0yZdvPbtmvPbAuCNT98YTBhT/8fAmEpHoXgKgPe/6gFGP0nwG8s2YykcaRCAYYQ5tKTkDVuArDEwMRF5AICS4VZ1AQBSr6oEgL36CBAvlKqIsyLOKQl5TZH4uN+TawDuY6o64lWTJX20v1S633uJNvfmvnbRERelb3XubxnAX26+5gDy6Y9HtrU/wERff1XjSt0WwULDmZEMawPOgilgQ4FaGCEygaXQMQyRMaxiUijUkAEAImIGAFURAOrVA1AmI1ZExGuqoqkVFefhyGtKDql4X4eHc6LxJof0VIVM3nVc4uXaHUPlo0Tpc2fv/zer38r83xKAd6y74iImO31EMf9REA7cpdVBY8NbA5+dFNqsCTQipkitBjAUsLUZNd4qm8AyjDMmJAIRhDzDEBEbJkBVAyJWQJ14AEaciIeSGicOgBeBWNHEeXLkXIM8UvFI4bVBCVJNfdk7STd5xOcp0LZzjIqV/eXq/4i61edM/eaN7yqAqpfzf62Nf5LP5lbko/DbCuxU4saEN1mN2kKTzQbIkuEIEWfVagRDEVkOyXCkVq0aDg2p9YYNAySVerU0WN1R27Jjo6ulMQ1V+ggAOgsjNRNEus/IiUFnYUy2kM23AcrivXh2RiTxjhx5iSmVWEWdpmhQ4qvwSBBrXVPfqDmuVsT7C3aZvKslyZcr9dpxdr81F8ynO/w7DuD1q/8y6kDw2872ticN0deG7wvQHXHmdxGK+1ibQag5ikweliIElNUAEayNYBCSRQRiYzf2rNtx11O/rC5d9dj+1aQyM2Pyz3WGozaNisYNWY7SYtgWA0A5KUVO4qAn3t4+lOzYt+Grh+bDwstHzvjA2tPfd1Z+39FTRhGpi7VBKrE4nyBFDKcNJL5OCerqUEXdVeEQb0mk8lECjR0euxe9cqBUOnoQ6RkXT78hfscAvH71X0Z5kf8Z0dH2CgNf2NkI0d0ZbmtElMtFVEAQ5BFIlkKb00AzFJqCGooQcJjv7t868P3/ubayZvua48ZlJt57xLjjB/cpTssXokK7IQNrbeoZ3pIRJm1aYSUW9cwixglZ7xNU40ppY7mr+sy2ezt7G1s+vP+EGfd/+fS/Ko5pH9/pJK04X6MUDSRapcTXkXJN46QKp1UkqNVqvpxVyLzhOajihh1DpVkmrJ7+uak/bbztAF6/+i8j62p3j20vbgXR+cP3LYU/Djg/KcsdEnIWERcRIk+hzWtEOYSch2U76tk1T6+84Tf/NCdni2tOmbRgy6T26WOiKDBhGFEQhrBhiNAyjDGiQp4DFgI8AChg1BGBXOC9p8QJ0kas3jvEcUxxnLgNpTW9izfdOqGWlve7+OOXrThk6qEHKtKehq9xIlWkvoaYytrwFYqlglgrcZxW+oXSz+ycpOLmnsHypDTIfuTNcuKbAvD2288x22dn7hrVnt/ATBftBE/CH2aCtqkZU6CI2hHZomS4YCPK+5AKHFB2ZNe2Nev/739/e9qY3KRnPzHtQp/LtnfkMhnKZDMa2oDCTIjQhghDC2MCCQITAyYxpmkhAIAZDDA7l4bOSeR9YpLEwfkUjXqMOE0QN2LU4waq9aGBX6/+d7O9sXnu3579jbVTx02dlEilL0FDG1pJG64cJX5IGr6MupY5duU1npIv7sTQ4196ytUDx8+sf+TN6MQ3AyBd8+L8W0a15zYw0d8O3ww4vC7ijlkZU5QctVPE7QhNEVlTRNYUjHcy7tu3fuuVSqXBF8z66962fMeIfDaHfD4nmUyWsrk8BdaYIAh9EFoxzExEysYoAQ5A0ioAEIpIBGZmAM459iKaJo6cT209TnyjWkOSNLRWi1GtV9A3sGPg56uvG1vIZ9N/OO9rM8jS9oavSOwqaEhZYh3khq9K3fdpXWsbvdR3MoYCV/UOVadcOvv2C/AG9IYAfue5j1/U0R5mIhNctxM8yvxLyMVpOduJyLRRnto1MkXK23axlB27sXtT1z//8vqDTt3vk/fMGnX4xGyhiEI2Qi6X1Ww2S7lCIQ3DkCxzQEQKYADANgCbW6UHvwcRaO6fAwCjAewLYAKAcao6UkRIBEniEtRqNVOrVKjeSFCP61oaqurKvqe237P2lnkXn/X/PT9l3OT9Eql2V90QN1wZdRqSuhukhi9T3Q2s9ki+NDzHWppeUqnG/qsH/+b7fzSA33ruI7ODIDh/RCH6KkEZAEINfhia4n4ZO0KzphN5005Z06aRaeOAcjP++4Ff3P/86hWTLjr08i3FfEeurS3LUTanhVwe+XxOwjAw1loLoB/ASgBrAdSAV232Gc0NyJGt70+27mlrzNT6nAEwDcBMACO892kcx1KvN6hUqWu9Xka9XsfgUP/Qjcu+Nf3g6bO7zj7urBNT1F+quxLXfUkaMmDrviQ13+8THdqYqvuLZpfq+qrJNXFDbrp87t0v/cEAXr5iduiTMQvHd2QnKDC9+bC9NUfF9kwwgvNmBGW5Q3O2SFkzAkaCg/71Nz9+2MTZ6rlzLs4Vi0WbyWS5o63N5fM5G0VRaoxpA7ChBVw3ANMq1AKoHUAewCwARwHYvzWctQCeaNUrt4pvgeha17Gtevt47+M4jrVSqZlSqepqjQpVyyX/8xU3VBHF2T//+OeOFbgXaq5fa75ENR3SarzDxDToYz846FTORbPRV7oHG9sm+qEPX3TEM3vc9pm9AfiBP53+T6Pbwo0Cd4aog4p/yXK+lDX5IDIFZDinGS7CckEM+JB//u9/e3Z8NGPTgjl/Maq9s8N2FNtcPpc1bW1tFIZhaIxJATwFYA2AtAVWh4hERBQByIgIE1Gsql8gou8AeAjAfQAeVdUvEtE9reFFIpIloiyATgARgCqALQAGmHmUtTYTRWHDhhaGYE0YYmbHEXZj//rBRc/fXTly5qGHEus2FUceCbxP4DShRJ2mvuIFboyqG5kNcNuWVM965MbNd71pAC99+vADA+MnR6F+TeAg6h1TeE/I2bbAFjVLBbJcpIDzZNke8qNf//yxKblZWz42+9Pj2opFbutop7ZCQdva2hAEQZGZXwGwDEBDRCJV7VTVfVV1BDNPUtXZqnomER2tqi8S0REAzgJwUqvMI6JBAM+p6pdU9f1ElGu1E6lqUVVZVYWI6gA2EFFijJmSiUIPsDbXmGT3b59V6Kv0dd334uLGYTPmHK7Q7lRi65DCawqviXWSrEm1PlvgWMh9KPbut+/77Ohtj/97d98bA6igo7aM+O/Ogp0l8BNFPQhyY2RyE0MqcC7Ia2jyGpksBYj2//WDCx9uk/EDZ8783JhiW5HbigXpaG9HNpvNMXMGwAoR6SWiUKS5KhERS0QqIgmAHcz8sqrOA7AdwCcB9AK4CcBvAdwP4EVV3V9VPwGgC8B4Zv4PIqqoqgPQYObEOadExC1A60RUJaLxURQaZqoRW0NEsm/xgI6u7rV9L295vmvGlKmHQ32vk0QdxfA+oYTq+Vgbi70mR4p6BEaKlTid98S/9f4MV7wBgF/66AEnFbPUz+z/VNTBiywLgxxCFDgwGQqR5wznOeR8+6p1657r6uopfu7wv4mKbW0oFvIoFovIZDIBEXkReUlVG6o6Fs2N/EjvfSczj2Hm/YnoY6r6Ae/9w0T0cVXdSkTfE5FsC8iTAZwI4DAAjxDRj0TkUABTACxS1csAzG39MHlmzqvqGCLKt1xZA0Q0QERtQRBkDZMngrcmNAeMmB08uHpxNsrz2pFtbft4TWInDZtSLE5T8i7uSKRS8XDjBX4fYbnusI2jMkt/tGP9rnjxrl+gICP4Riagrzb1ssKa4CkrYRhwwBFHYGSUOZJKo8oPP/vCoV846opSoZCnQj7HxUJRMplMgGblR5h5wHtfbE1oZAvIHBFtVtX7RKTQ4pSrnHOXAThQRK4BcIaqNkTkRRF5UVUTVf1462/TVPVSEfm2974qIm3MvBhAl6pGAEYAaBcR45zLiUiPiDxKRC6bzZpsNhtGUaj5fIG/dNTltYeeWja3ltbVcGgMZX1IWbUUqDUBbBA+OYxDPuDLSORq6KsN76s48MvzZnwwlzNDgaFzAIBAi0LKtGVtEQHlOaQCQpOHoWDWL+9+ZODCuV99cnTbmM5cIY+2JudZIpronHukxUWemavOuZIxpuG9H8fM8wDMJaJHVfV0ANcDOIyIPg5ghTHm+0S0UETWq2oCoA/AI6r6C2PMgyKyD4BPM/MggJ8COIGIFqnqV1T1YADbVXUjEfUaYxrOOcPMBVXdCmCutbZirQGIlIBwavucl2577NaJM6ftO1nJ9aY+YfEpvDryknamSNdAMQ1AGwxdc/DqDjz9k/7Nw5i96ixBSK/MhTRxJ7oUbracmWAoVGNCtRSCYOxLazfcN7VjdjK+beK4KAqpkMtpJpNRABNVdT2AowHUvffjAYgxZpNz7hUiuk9VT1LVWFX/iojuBfA1IrpfVRcS0Xne+6tUX33+M/zdew8AzxljLvPefxTA3xPRIufcpQA8EYUAFhPRSCKaKSL7EFGgqjtU1RDRZmaeGIbh1sh78s7LxM59R09um7585fqNdtqUMZOMMc4igE0DthSppcYWL80VTNbyX1QCPgNN1fJqDvzi0tnjQviObGia3Ee0JEAml+E8DOUo4pxaE4GUJz3yxJr9/vSIv+8uFAu2kM8jl8vBGNNJRE+q6grn3AZV3QRgi6q2AZjHzHNE5FEAp3vvv8HM8wFQSywvADAPwDgAi0TkPwDcBWDhcFHVh9FcXH9ARE4BMI6ZvyEiHwYwSVW/CeB0IlpERJeo6hwiepmIlnrvVzLzemZex8yDzDwZqlUikGGm6R0H66+evuPYafuNynvFkCCF4xjiBd67otN4C4GmEDAqTuVnR3++beWT/z5YfRUHio8/0dEe7DynJTUvswmmEiwxWcCDwGyee37j4ydNO6ucy+YmZMJQM5kMWWvHqmqPc24eADCzENEGAMvTNH2AiM5Q1W1E9GkR2cLM3yOiS0TkO0R0lao+zMy/8N7PBHAmEZ2C3YiIoKrdqnqjqq5i5j/x3n8bTQt8iapeKyKbjDGfFpEhAGOccw8EQdBhjPmQqk723rP3PrTWvhxF0Xgi6vHeayaTyx075fS7nlvxcPGgg8ZNIjHeSKRMdbEUIEHwEuCOA4DOvB25vSRnAfghMGxEFNRb7ZoM0HFNadFeIjvRgMFkhEDKbEl8Oqq7u3bs+/c9cXQUWo2iCGEYsqrG3vvHAPwEwL2qulZETnXO/Zm1FqoKVf2Bqh6qqr8SkW3e++tU9T4i+ntVnem9vw7ARQA6ReQ5AL9yzl3vnLsewK8APIfmovkiIrpWVWeo6t977x/w3l8nIluI6Dcicqiq/quqgpnJOfdnIvJR59wmEVlCRD9S1QeJKLHWmmw2hyAM9bhpp47q7q4d733aSVBlkBoNQGxgYPdVRZ82N5In9lS7dp42GgA483hMyUY0RXgwXzAjQgUtshp1WhOR5YgDzoiB0U2baqsPLB7z0oxxBxWz2Rxls1lh5gNVdbn3/rwWR68moi5VPZWZt4nIvgBGquoRAH5BRH+OprH4oYh8XlVPQXMvfIOI/BJAFxF1qupxRPRBIjpKVSe3dOtdInKbqj5PRIe3RHayiHydiMYDOIuZfyIin0HTfI4kIgAYa4y5UUQaAI4QkY8ZY5YR0aGq0kcE8k5NNS4t665u6G9r47xDCi8pqabsNbFe9WkoRvU0upYl8GunnqebX7kZQ00O9DipLbKjRfQTPWnXYyBTBxMBBiIML2IVkt20sf6B46d9rJjJ5chaQ0EQRAC2pWm6VlVXq+rZIvIXSZKELcX/Y1U9RlW/AWC8iJyqql9V1aOcc99W1SXMfAmAh1X1qy3O+rKIHCMiGRGptUqude9iIrqWiC4brisiDxHRt1X1KFX9qnPuowDGe++vUNUPishNLQkIiOjPVPVs7/02EVkLYHsYhtYYg0wm1FNmnZPftKF2lFPJisCIkhE1DFiFaNLr1i5R+PntGR5lFMcBLWfCxxbhrgkjgqMAjCKgkrWFX48KZ7RHJm8CziJLOXJpUNu4omAuOfbKOMxkKBOGHIbhHBG576qrrtLHH3/8QmaOdtdd/5tIROLTTjvtyc9//vN3BUGQs9aOA3CyiDxXr9dRrzfo2gf/Ljt1TpyYIMnWtQ4nVW2kNd+bri41fOlMADkQerb1p4/f+WGcaS9X8HOLUQIwCgCUdFGi6ehBt7k+3k4DqQ8cOd2+mQdPnP6xijHB+MAYhGEoqppL03T/J5544iRmpvnz5z+4Zs2a1dOnT5/+8ssvr5o5c+aMWq1WSdM0VdXORYsWHW+tXXbmmWcONV2jQG9v744dO3b0jR07dvSIESNG3HbbbbNFpHPBggWPtMTvVUREWL58ee2VV145bcSIEU+ddNJJ1RY4unLlytXTpk2bEoZh2N/f37dw4cKTrLUdxWLxvnnz5pnf/e53unDhwhPa2tpWnnfeecekabopCIIMEYGIyBjGCfufvmbpltuKY6a4LKkzCh8PpZu913g0oIsAOhOKMQTElyvYPrsY43IRP6uK8wCAYHrUo+gpiXoaG+LR0X5VaNgxNEAHz5pz6PIgMGBmBTCKiJZVKpUjjDEmTdPG/PnzPwSgLCJHoLlY/omqXgLgWSJauHjx4uNPP/30obPPPnsAwGNoLl+O32Xdt/a3v/3txnK5HM6fP/+3aJ2JAAi89zkAUwGcdOqpp+YvvPBCnH322fEJJ5yQA3CH9/5YY8yft0C+SkTmP/roo72NRqPjhhtuODCTyRTPOuusRy+88MJVd9xxx8cWLFiwiog+oqp3ARgVBMEO7xVzJ70/v2jdHbNGqu/16uq98WakmuQgANhsU98MRQwMP7N0iYxhUuybD/n3WzqlAMROROElzfY3NrXHrtTNFHTkMvkiGQNiZhGZ7ZzbPDx5IoKIXK2qZzDzd9F0T/0pEV2qqoeKyN8BwLZt27ap6hmq+l0RmQXgZhH5iohcpaqrwzA0RATn3DXOueta5buqeoWqnqWqT9dqte8DwPbt2zeKyBGq+l1m/giA7wL4map+jYj2S5LEA0AYhp0AvsvMp5577rn3Axi/YcOGxaoKEdkCYBYzqzGEMMgUWILRjXSopzfekFUf5wUKYXYQCoZhykcM08C+DMUMw7Rva8sHqHZCJFD1VtTDaYLuoe3xrLGH/Yu1NiZVtcYAQEVVy7vpmPNU9VHv/RUArgZQ9d5f473/qYj8OwBMmDBhPIBnnXNfAfAj59w5AK4F8DURmcfM1JrY/4jIrSJyq/f+XlV9vmVMPlEoFC4GgM7OznEicmPrB3hJRC4Tkc+IyI+897cFQWBay5lrVfVKVX30lFNOOUZV/aJFiz7YMi79RFQiIgbg2NrazHEHf7+70q1eGiwkROoteQkhOmIYp8DQBGUcYIVwOJMepCCAkBCooCAnUPVwXoU1rrXVoyi7nwgoDO1QyymwzTn34d7e3p8B+NsWFx4AYLP3/l4iuoKIHhaR/yaiLw1z6rp169Z57+cR0bUiAiIaVNU7ReR5Y0xcrVbPbf0ek1U1DwCq2qOqG4jofhHZUi6XAeC7IkIAvqCqIKItaG4LZ4jInxERvPevtK5fY+b7W+0eBGD78uXLx6nqd51z85i5G0Bore1rNJJsxuan1EumFo3w3mtKSupAMASNRJEACBk6ixWphWCaKs1tqegVUIWyiBcPIYhRQlLKhQccNDtW9YEIh0TkiciJyGFtbW29LfCCxx577PtHHHHEhdbabd77bzLzFap6jPf+X5o46Jf333//qWh6kP+P934HMx8F4HQA53rvkc/nl9frdYjIQbsw99SWy6opPvl8BQC6u7u3ENFfq+poVb1IRK4iIvHeX7dy5UpKkuR8Zka9Xv9WNps9n4j2B/DNkSNHnrV9+/ZRIvIhIjpMVZeoqlfVEcyQ6WNmpQ8+nyva9m4IO/XeQ1XFE6UKfYkUhyrTEVDEFkAWO4NuZAuAsPnDKlgFzih8ku0cU5y4NQiCxFrLAPYDUCOizxpjrgAAY4y54YYbvtwS5f1E5B9UdSgIgloURR8BIESEO++8c8qmTZtetNYeHYahdnR0wHv/pIhsrVarvX19fQsA5H71q1/dYq01pVKpkCRJXCqVaGBgwDcaDdfX1zcRwDELFy788JIlS96XJEnBOQcADSIKmfkSIsKwpXfO/bmItBljLlHVa6dNm/bIE088sR+AMUT0WRG5kIgmWWtfIWPcuPZJDJ9r90hIRVTEq5KAlBIIdYH0UCg6FMhZUvDvjSDVnZBhUhUSUijICxHCbDFXZGOMqKoH0KmqQ/l8/ptdXV0/rlar38rn8zs5hJmJmUM0jyPb4/j3h/ze+ylLly6dgr2QaepX3Hnnnefv7ZmdoyUamyTJWABoHvTtmbq6un4xa9asSQCuA7DSWvtSo9E4zHt/dbFYvKLRaKwF0E5EwoBENlKVMOPFkcJDCRBVUlEloLQTLgWz1987FAhImCECJVEh8Z6cdzBk20ITkIg4Y4xX1ZFoHuJM3XfffT/S29uLLVu2oFKp7HQ9/W8ia+2RzHyGqv6TiPzjsccei97e3kxbW9uZACYTURVNb7mIiIYmJIOwLUWqTqQVIqFEDFHV6nC7orDMBB22LOzhWbRC0LJRLalqGYqyQWAJVDPGVJIkqQPYrKq9AGCMmQoAaZpix44d2Lx5M/r7+5Gmbzn4822jVatWvei9/9M0Ted77/9j5syZawAk27ZtswCgqt0AtohIzRhTssZWDdvQkA4RtETaxAOqZSWWnXgR1Kr8/kTbG2ThtaAE9QQSZWIQ2EilFteyhoJCa4lxYMvf9xry3qNUKqFUKiEMQxQKBeRyudcVsXeC0jRFrVZDtVrFzTffnOnp6Tl2/Pjx944ePXrt9OnTzyGirY888sjLCxYsOERExhPRDGvtswACrz4m60pOqIMIBIX4ZqCYAWsZLXumAtid6z8A5DSvlgkKFkcMiBERqHUDiUu8994SkQCoEFF+jyPfhZIkQX9/P/r7+xEEAbLZLKIoQhRFbzugzjnEcYxGo4FGo/EqCejp6Tnv5ptvfk2dH/zgB8sWLFgAVS0CqHjvyTlnq2mFYF3VORnJICKwI2IFI0Qi7TCtLaYCVgnbAdoA6GRhaoPXhipIVJkEUCXP7CrleBAd2RHsvYcxpopmfMreaICZN6LpQWYRmZSmaeeuk7LWIggCWGsRhiGstWBmWGuxqwUFABEZ9ilCROCcQ5qmcM7BOYckSYbd/XuiTczcT80YHHjvZ6MZZ4O+vr5hx+14Va1Qa/M9WB0Asa+SUCcIRuAtg5QEBKDYrEJrwdhiIXhBRQyIJkMxQxQvkELh4RUq4kCJ2VHdOLiOx+YmmTC0trWwnQOgsvtoiegFInKdnZ3rRo0aJT09PTw0NAQAm0VkzvBzw5N/B0mMMU+pqhk7dmxXsVjkzZs35xuNhojICDSPRpPt27c/WSgU5hLRC95722g0aOPgWnbcW5VUBYCSJYBBChgQzWnt2J4BsJyheFkVr7Q6Hc2kZYU6ARSejCjZFN259UOrc6reOucMEfWpqnXOPQIAhULhN8PgMXNl3rx5Y4IgOIuZz46i6KyTTz55JBFVmXnFO4nYrmSMeTKKooEPfvCDs40x8621Z3d2dp566qmnxsxcArC1s7PzkVWrVi1X1QBAv/eeiYg2DK0upOgpiCBQIlIBBOrBOgTCCAAQ0jUQrGS1WF1vUPewLlTlKoQCOARewOqVUgzmtlXWTWuKiqiIVAAgjuOtuy1bgtNOO21ET0/PhO9973sQEXznO99BT0/PxJNPPrkDQAO/97C8k7RBVaO5c+ce19nZmb3yyisxZcoU/NVf/RVWrFjx/kMOOWQ9M3dXKpVRjUYjbKmGinOOnPPYWt04PZGhjHoQCZigAQsFpFwbxqlRpx6k6LI6gK5Kpz8zm20d0JHWQFAYTSUlALDexSNdEB+Y+nQxpZRlppSZ4ZybdPvttz9QqVSOt9Y+SkR+xYoVxx522GF4/PHHceCBB2LZsmWYPn06nnrqqQOZ+REiekZERr+T6BFR37hx47rWr18/NwxDvPLKKygWi3jhhRdw5JFHolarzXvuuee60jSdYFordxFJnHNI0rghiGc4jb3xUDEQEngyYEBrwx7KcuJHZzux1t79KZQ++iv5AHTnCadVBZGQhULh1SsIMfoe7KlsGRqTm5Q1xmkQBJtV9dijjz766f06bwAAEgVJREFUnpUrVy4EgIMPPjh300034bjjjsOaNWtQqVQgIjjqqKOwZMkSzJs3b/Xy5cstgFUA3rZF954cr6eccsrYxx57DJ/85CexcOFCDA0N4cQTT0S1WsWjjz4azp49+4l6vc5Tp049TVU3eu/hVXVbZUN/TH33k8c4DVRIiMFEohCjCIdXLC6VY+44DV+zACCEXiiWgnCkEp1EpKsEqqTEIsTq1Axg+eCy/kczp+QmqDZfuXpRVedNmjRpx9VXX32hiEBEsHTpUtx5551YsGABnHM47LDDcNNNN+GAAw7Al770pc8NPzdsUXe1rsOA7n4dBmjXK3NzgbHrZ2beWQDg7rvvxq233oqLL74YS5YswY4dO/Dkk09i7ty5uOCCCz4bx/FPRGSUiNydph71ap2W9T9eGGgsr4iqZSVVsLJ6Z5lIlU5srfmWAlgHtE7lDjgP5SjgAWb6MBTtoroMgpwoERTwniiJhwq5aPrxB+YOWwuQIaKEmWd573NBEHSoKosIpk+fjltvvRWqitWrV6O7uxvLli3DV77yFRQKhVeBtzcgd/2+exmm3bl3dy4kIowfPx4LFy5EpVLBpk2b0Nvbi+7ublx22WWw1ro4jgsARgJYVq/XUG/Uk2fK95+ypXxfrESGGUIEMhYGTP1ovQOYOr2+kcjvVt+K9c130cp4slyX4nDnBqYbRCAGkTZXUELIVtPeezeUu3rjOEaSJFDVpwEcmKbpLcMTnDhxIm644QYEQQDTPDvBNddcg3322ec1IL1e8d6/qryZOruDffTRR+PrX/866vU6kiTBAQccgOuvvx5hGKI15hki8lTz76lura/fUUt6F4siJIKCiREAakhB6BnGp1ST9lwbngJ2CfE99Zd4cPzIcDqg4xl4wQl64EE+BlyicCnYanHz4RMumviR9vO7C4UC5fN5JqKzVfXlKIomtzzGr5nwGwGwOxe+ngi/ntjuXowxe/s+0Gg0+ohofxG5o1KpoFqv6+LBn496dssPt6dcmWAtlCOCNRDKgJgxEopDoLRl60Cy5p5P4Hhgl/A2NbgmTuUGBeCBOUTokVZAtyiIFJSk5QmJlJKeyvaeer2u9XpdVPVxVZ1Zr9dv25PI7Q7M3sDbEwe+0Q+wt/b21vdwqdVqv1XVaar6eJwkqNdj9JY3bW9IKU5cZRwUDNPcuagBE2G7Kg5RAKnI9SD832HcdgJIARYOVdyknXtjoTpBoaRsTPOMHQy7fMutQy/qQzOr1arW63VNvd+kTc/NfO/9I3vTXXub0N5E9/U+v57Yvp7+VFWkabpYVc8DMJSm6aZyqcSNRk1fxOMHPb/5v+pQtWwgUBCxErGCiOJhXHYMuRkU4r7XAHj3aYhTAaC4rakI9dNkMMSWPBhMSsRKmjRKIyuuZ3Bzfe32crnGlVJJReQ+Vc3HcdyuqgPD4re3ib1ZHfhmVcDuYO4JxNaYetI0HYvmMen91WqVqo1YNqVdW2uutz9NSp3KTNpcxMEYgjEYVNULmvVxiwLVu09D/BoAAcAZXL6j7F9SBVRgiUwPkRJYCQaqrEoMWrrqp4WN2ZfmxXGtWq7UqFwuJyJyP4A5cRw/qKryelywNw7ck+58I336ZvtR1Uaj0XgewMEicl+5XPblcpXqtXJtk33x1KUr/6MAbnKdgQKsDFUVMTtUYFWBvpLvohRX7orZqyJU192K6tSz9Qv5HPcQaCpBZyvjRSiyEFIVkDioiBbL1W3LglGduWJ9LKDExnAtCIJEVU/w3t/MzIfsbiD2dn0jHbkrF+1qSPZkXHY3MMNX59ydaB5ePdNoNLZUqlVfrpSxOvO4earr5xvqvm8iGfggBFNIyiGYQwwQ4xwABqqLhmo+c885eJVf7NUx0gDE4iv9Q/JYc1+MDABvDJQs2DDYhlBmxD2Da6YNxOulW9dsr1TLWiqVtF6vrwawXFU/7Zz7TwB/FCf+MUuW1ylJmqY/F5GzVXVZvV5fWy6XaahU5q26asuA22L7hlbvR4a8NVAYKFsgMBACJZDm7mNHSZ41HpfujtdrovS7bkV58p/oRwpZ8zIIhwM0C0SLoBipCmqNnaHAhq3L7MT9D9mfhjIrrYRt3nu0fG9VAKd673+Npq8t82a5cW9ADdOb4bZdljfbRWSpNt9BeSJJknVDQ0MYHBqiwXRHd9+IriPvffpa4YBCE0I5grCFMRlSGFoF4DMt3ffDUtXLPfPxyzcEEADGnoNH01gWFLNmChQhgTJEOqiKQIQEAiPNU09+Zf3jfZNnH3yY9mVWasoFL16sMWVm3gzgNO/9KiJaq6qTdlfyewNv9+f+QNCGPz8qIgLgaFVdVK83egcGBk25UtWBel9f/4Q1x931yFUbYLWNIxgOoDYgDSJYE6IB8CEEjFKg1D2QdscVfHn9r/EaB+YeAdx8B9z0+Sgz8HxgeR6AMVB6hgzaVMk3Q/2JSQHvJOra+GTXlMPmfEi6o+d87NpTLyTeN5j5ZWae6b3fV0RuIaKZqmr3ZJ33BNzuAO4G0B7vMfOQiNyqzcBN8t7fN1QuN0pDJVQqJe2v9u2oTt9w0l0P/uNz3iQjghA2CMmEGXgOCSYDIqJuAk4AgHrDf7We6u/uPx97zO6x13fl1tyOtfucqRcXM+ZFAHNAmA2iu4gwRkBKos0jAVXy4vKvrHvslWlHHHZk2m1eQKJ5VfXOOauqG4Mg6FXVj4nIalVdpKoHqSrtsrzYed1VXAHsDaQ9caAQ0S0iMoqIPkBEDzWSZHWlXI6HBkvBUKWsQ2nf5uSA7SfeueTqFxPUxtpQAxMSmxBqAhKTBZhoBYALAUCBW3ZU/D6Lz8E1e8NprwACwKQv4nf1fvlUMWsJwEgC5oDpIVJ0EhGrJ6sAICCXuvYVqx8uzXj/YZPSWFbWelyHeA/nPRLvqwxa3XRN4COqugrNKPwx2ozifxVww1y3K4CvA95WAHdQ8xWHDwJY4b1/tlwupwNDVVTKQ9rfP6j19h3dsv+Ow29bdEWvUmO0CWBshowJCTZL3kQAW1pPTb1noPTK9oG0no7Cp9b/7LWi+6YAXP8zuMnn4rFG4kfnQ3MYgIgIU5jxDCmKCigBpE1xZlEfvPDSErffrFkU7BNQpSutxQ1PLo6zSerFi9RV/CvMXFXVQ1R1H1VdhGaIbxnAzgQ5u4vtLsUx8yMA7mPmbQAOJKI2VV2XJMlLtVqtViqVaLBUlUqpn0vloTofOhBVMptzv1h4dd4Yn7cR1GSJwwhiQhIbIjUBthBwJoC8ElzvUHqzKL5+/+l4zQuGu9Kbyplw4m04Ix/xjI68+W6r2gZifdI1dFSaEEtdOW2AJYG6hnqXEMaOnL7ptGO/+L5kjVks2/JjM5nIZKJAoihLmUyIIAjIGANjTEBEHSIyWUQ6RWSdqm5V1YqIpC3RDImoQETjiGgKM5eIaKOIDKpq4r2Hcw6NRgO1egzvUq3V6l5Hxhuys9OPP7T0lke7tj41nQNiG0FtBmojeBMR2yzIRNhKQh9U6L6kkMGq/7t6Ii8uXoDfvRE2bzprx0n/hc93FLiQi8x1zYq0CdAHvcdkV4V3Dupi9b6OgosR+wRGvU3PPuXSHcXcPiMGnvAvcJIZlwsjG2UzMESUzWa16SExZGxLGFS9sVbFK5SUAGBYWYoIMzN5BbnUgSCaph5xXCfvvSZJouVaw1NWejrfL3NK1a07frHwmpFsXcgRvA3hTRahNeRsHmKaXpZtIDoa0P0AoBb7SwZqEt+/AP/6ZnD5g/LGnHwbvtlZCAYzAYbzJwwo4U5xOl0aUB8jcDHUxUSuoQ4pJE0gmbCt9vFTLm4UM2NHDCxNlidDweiQOAyCUDkwFLBBEFhSZrVEqkDzHLEVAiA6PFBFE0pFkjhS9YjjVJ1Lkfg0sZ3SO+rI8NBSo7vvznuuz8S+lDMhwBbWhmRtVr3JgmwAmAhqAlolij+h5svfqMW4ZKiaFu49F1e/WUz+4MxFJ92GS3MR246M+bYSGEAizD8mJ4d6p+oa8L4OcQnUJzA+hhWnqU+gUdA2cPKxnylNHj/rmOrW9N7+F5JGOiQjyXIYcgC2zRejiVXFw5Np5Y3xMGxgxBMJPMSlFHtPUI1NG/eNmhNm8uODUzZse+nB+x78WVs9KXXaDMgYspyBNyG8iQATwIRZwIawYPOCQj4LICSFDNX9V6qJ5O5bgH/8Q/D4o3JnnfhzfC6yvM/IdvPXADpaLd0KoaJPNS+xmjSF1QYkTeEkVfYpGR8j9Q5WRKvjRkztPf5DC3j0iCkn+AQvlDdUu6rbXaPWn5KrCEEErTwXTTKALbDmRgSaGxNk26bmppoQc7p7ux546PE7ZHvfutHGUJ4DOGMRmEi9sSQcwgYR2GTgOCRvDFXVaJUU81sA9PcM+X92Trru+yT+8w/F4o/O3nbyrTiaGF8cUwgOIMZRreZegerDgB6YJiQSw0uqgYsh3sFrjMB5eE1gfAovHka9pjaM+ke2TxiaNnWujBkzOcxnO/KFXKHNBpnRAODSRm+lVh6q1odqPT0bkjXrnuW+oS3tLo1HsKGADIQDsAnhjEFAFgmHsDYCmYBSG4BMRgMQvQTQcYBOBwBVPN5TStd6hxvuPx9L/xgc3lL6u5N+hpGwuHl0u33a2N/nDiTSXxBIRHWCNMilMdQ7DSVF6h1YUxXvyKhD6h0CCKCCVLxa9YASKYlyK/AOIJAyCUFBDGImB4KlEEoMbywCCtQbQ8QhxFiEJqDYWLDJakBEm4g1UKFPDI/Rq16xY9AdZQzOXzgf/X8sBm85AeM5t8P0eXwtItYRbfZToOavCyDxKj81RCPgaKJ3iL1TAw9xCVgdvHcw6uBVm/pNvQIKpwJV2pkKBQCEFKoMYoKFITVGQQxPBsZYeLIwNoQQw3BAjiNEzNioQKzAebQzkJRW9lXcbXEqctx5uOryYUv1R9LblkP1+JsxjS1+MDJn7wkDuhKEHACQQqD4OUgExJPFq/EpqTglcXDqEXoPJYETDwbgROBVAQY7ABCIJQKYYQBYZogaWGMAMkhhEJiQPLMaG5BTlvWUsgXjvJahAxS1RqpfH6i5eYjxhfs/i7clj+rbm8VXQSf/HB8T4LOj2uwzgaF/0GZ2oeHuVqjq48zIQzHee4QiSLUZgwN4kDYdt0Kkqq38BM1XhYnAMMwKGDQ979y0rERIRbENQJWIPgDorF0m2Ei9Xt0/5N4njH+//zzc9XamRH5H0iAffiOC9gLOVeD8kXl7bxjyxYC+OqMv0VaoPsCEukAigNqg1EEEFlWBQKHUFC9SBoOYiEUhRDoIaInBiSgyBDpJoeN2m9qG2Mv1/SV3iir+s1zFbc9chLc97vgdzWR+uYIfugUnC/C3keUlHQXTaQiX7LUCox9en1XwIBENCqTcvM1FVe0gSAcMzYVgxN6a8IrrBit+IHFyrCF850Orcf/ll781Pfd69K7l0j/mJxhtLb4+ot2uDy3t1T30Vihxeml/2U1WxpVLPol3PA088O7/MwI6/ib819j2YDOb154vvBVSxfXdA+nEBz6Ns4G3T8e9Eb3mUOkdJsW++NT2UjpHVO/V5vrvrRfVh7f3pTNLdZyLdxE84N0HEEtOgMsRzukdcBUV2vRWwYOnbTuG3HZXw4J3wki8Eb2uQ/WdojW/RLz/n+CluKaZTMhzm4eJwB9aFHADFf1X7+X6h/4MG9+LubzrHDhM934KLyhoaSPB3/yx3Nco42+811UPfBbvWvD67vSu/0eb3enEn/K17RkeNExXvPHTvyfxeuVQQ0be9zn50hs//c7Re8aBw3T/Z+TScl3niuBm9cCbLLeXGjr3mA3yl+/1+N9zAEHQ6oA/rxLLBPF49o1Fl54vxVJ08Ge/kwvkN0vvPYAAHv8K6ur8BbVEnlNF6XUArNQS/ziJv2jJ5/Cm07W/k/SeWOE9UddvUJ5+pimpYhODTtyT1Y29fsOrv2fxhXj+vR3t7+l/BQcO0z2fc0ucEyeil+7OfV7xFYXI4gvx4Hs9zl3pPbfCeyA67cfmFiaziVX/BgCUcL1XGf27z/vz8S7vNN6I3t23oN8caW0//+lcF/0PC+4VIBJgZm2aPw3/y8AD/peJ8DAtOQEuZLfAQ0sK7Q0rbv6SE/Yen/L/017ojH8LZ5/xb+Hs93ocr0f/D6s769KBP+5xAAAAAElFTkSuQmCC\",\"data:image/png;base64,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\",\"data:image/png;base64,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\"],\"colorFunction\":\"var speed = data[''Speed''];\\nif (typeof speed !== undefined) {\\n var percent = (speed - 45)/85;\\n if (percent < 0.5) {\\n percent *=2*100; \\n return tinycolor.mix(''green'', ''yellow'', amount = percent).toHexString();\\n } else {\\n percent = (percent - 0.5)*2*100;\\n return tinycolor.mix(''yellow'', ''red'', amount = percent).toHexString();\\n }\\n}\\nreturn ''green'';\"}]},\"title\":\"Route Map\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"useDashboardTimewindow\":true,\"showLegend\":false}"}', + 'Route Map' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'fb474880-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'analogue_gauges', + 'temperature_gauge_canvas_gauges', + '{"type":"latest","sizeX":7,"sizeY":3,"resources":[],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbAnalogueLinearGauge(self.ctx, ''linearGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.getSettingsSchema = function() {\n return TbAnalogueLinearGauge.settingsSchema;\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 30 - 15;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"maxValue\":100,\"defaultColor\":\"#e64a19\",\"barStrokeWidth\":2.5,\"colorBar\":\"rgba(255, 255, 255, 0.4)\",\"colorBarEnd\":\"rgba(221, 221, 221, 0.38)\",\"showUnitTitle\":true,\"minorTicks\":2,\"valueBox\":true,\"valueInt\":3,\"colorPlate\":\"#fff\",\"colorMajorTicks\":\"#444\",\"colorMinorTicks\":\"#666\",\"colorNeedleShadowUp\":\"rgba(2,255,255,0.2)\",\"colorNeedleShadowDown\":\"rgba(188,143,143,0.45)\",\"colorValueBoxRect\":\"#888\",\"colorValueBoxRectEnd\":\"#666\",\"colorValueBoxBackground\":\"#babab2\",\"colorValueBoxShadow\":\"rgba(0,0,0,1)\",\"highlightsWidth\":10,\"animation\":true,\"animationDuration\":1500,\"animationRule\":\"linear\",\"showBorder\":false,\"majorTicksCount\":8,\"numbersFont\":{\"family\":\"Arial\",\"size\":18,\"style\":\"normal\",\"weight\":\"normal\",\"color\":\"#263238\"},\"titleFont\":{\"family\":\"Roboto\",\"size\":24,\"style\":\"normal\",\"weight\":\"normal\",\"color\":\"#78909c\"},\"unitsFont\":{\"family\":\"Roboto\",\"size\":26,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#37474f\"},\"valueFont\":{\"family\":\"Roboto\",\"size\":40,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#444\",\"shadowColor\":\"rgba(0,0,0,0.3)\"},\"minValue\":-60,\"highlights\":[{\"from\":-60,\"to\":-40,\"color\":\"#90caf9\"},{\"from\":-40,\"to\":-20,\"color\":\"rgba(144, 202, 249, 0.66)\"},{\"from\":-20,\"to\":0,\"color\":\"rgba(144, 202, 249, 0.33)\"},{\"from\":0,\"to\":20,\"color\":\"rgba(244, 67, 54, 0.2)\"},{\"from\":20,\"to\":40,\"color\":\"rgba(244, 67, 54, 0.4)\"},{\"from\":40,\"to\":60,\"color\":\"rgba(244, 67, 54, 0.6)\"},{\"from\":60,\"to\":80,\"color\":\"rgba(244, 67, 54, 0.8)\"},{\"from\":80,\"to\":100,\"color\":\"#f44336\"}],\"unitTitle\":\"Temperature\",\"units\":\"°C\",\"colorBarProgress\":\"#90caf9\",\"colorBarProgressEnd\":\"#f44336\",\"colorBarStroke\":\"#b0bec5\",\"valueDec\":1},\"title\":\"Temperature gauge - Canvas Gauges\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'Temperature gauge - Canvas Gauges' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'f8d616e4-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'maps', 'google_maps', + '{"type":"latest","sizeX":8.5,"sizeY":6,"resources":[],"templateHtml":"","templateCss":".error {\n color: red;\n}\n.tb-labels {\n color: #222;\n font: 12px/1.5 \"Helvetica Neue\", Arial, Helvetica, sans-serif;\n text-align: center;\n width: 100px;\n white-space: nowrap;\n}","controllerScript":"self.onInit = function() {\n self.ctx.map = new TbMapWidget(''google-map'', false, self.ctx);\n}\n\nself.onDataUpdated = function() {\n self.ctx.map.update();\n}\n\nself.onResize = function() {\n self.ctx.map.resize();\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"title\": \"Google Map Configuration\",\n \"type\": \"object\",\n \"properties\": {\n \"gmApiKey\": {\n \"title\": \"Google Maps API Key\",\n \"type\": \"string\"\n },\n \"gmDefaultMapType\": {\n \"title\": \"Default map type\",\n \"type\": \"string\",\n \"default\": \"roadmap\"\n },\n \"defaultZoomLevel\": {\n \"title\": \"Default map zoom level (1 - 20)\",\n \"type\": \"number\"\n },\n \"fitMapBounds\": {\n \"title\": \"Fit map bounds to cover all markers\",\n \"type\": \"boolean\",\n \"default\": true\n },\n \"markersSettings\": {\n \"title\": \"Markers\",\n \"type\": \"array\",\n \"items\": {\n \"title\": \"Marker settings\",\n \"type\": \"object\",\n \"properties\": {\n \"latKeyName\": {\n \"title\": \"Latitude key name\",\n \"type\": \"string\",\n \"default\": \"lat\"\n },\n \"lngKeyName\": {\n \"title\": \"Longitude key name\",\n \"type\": \"string\",\n \"default\": \"lng\"\n }, \n \"showLabel\": {\n \"title\": \"Show label\",\n \"type\": \"boolean\",\n \"default\": true\n }, \n \"label\": {\n \"title\": \"Label\",\n \"type\": \"string\"\n },\n \"tooltipPattern\": {\n \"title\": \"Pattern ( for ex. ''Text ${keyName} units.'' or ''${#} units'' )\",\n \"type\": \"string\",\n \"default\": \"Latitude: ${lat:7}
Longitude: ${lng:7}\"\n },\n \"color\": {\n \"title\": \"Color\",\n \"type\": \"string\"\n },\n \"useColorFunction\": {\n \"title\": \"Use color function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"colorFunction\": {\n \"title\": \"Color function: f(data)\",\n \"type\": \"string\"\n },\n \"markerImage\": {\n \"title\": \"Custom marker image\",\n \"type\": \"string\"\n },\n \"markerImageSize\": {\n \"title\": \"Custom marker image size (px)\",\n \"type\": \"number\",\n \"default\": 34\n },\n \"useMarkerImageFunction\": {\n \"title\": \"Use marker image function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"markerImageFunction\": {\n \"title\": \"Marker image function: f(data, images)\",\n \"type\": \"string\"\n },\n \"markerImages\": {\n \"title\": \"Marker images\",\n \"type\": \"array\",\n \"items\": {\n \"title\": \"Marker image\",\n \"type\": \"string\"\n }\n }\n }\n }\n }\n },\n \"required\": [\n \"gmApiKey\"\n ]\n },\n \"form\": [\n \"gmApiKey\",\n {\n \"key\": \"gmDefaultMapType\",\n \"type\": \"rc-select\",\n \"multiple\": false,\n \"items\": [\n {\n \"value\": \"roadmap\",\n \"label\": \"Roadmap\"\n },\n {\n \"value\": \"satellite\",\n \"label\": \"Satellite\"\n },\n {\n \"value\": \"hybrid\",\n \"label\": \"Hybrid\"\n },\n {\n \"value\": \"terrain\",\n \"label\": \"Terrain\"\n }\n ]\n },\n \"defaultZoomLevel\",\n \"fitMapBounds\",\n {\n \"key\": \"markersSettings\",\n \"items\": [\n \"markersSettings[].latKeyName\",\n \"markersSettings[].lngKeyName\",\n \"markersSettings[].showLabel\",\n \"markersSettings[].label\",\n \"markersSettings[].tooltipPattern\",\n {\n \"key\": \"markersSettings[].color\",\n \"type\": \"color\"\n },\n \"markersSettings[].useColorFunction\",\n {\n \"key\": \"markersSettings[].colorFunction\",\n \"type\": \"javascript\"\n },\n {\n \"key\": \"markersSettings[].markerImage\",\n \"type\": \"image\"\n },\n \"markersSettings[].markerImageSize\",\n \"markersSettings[].useMarkerImageFunction\",\n {\n \"key\": \"markersSettings[].markerImageFunction\",\n \"type\": \"javascript\"\n },\n {\n \"key\": \"markersSettings[].markerImages\",\n \"items\": [\n {\n \"key\": \"markersSettings[].markerImages[]\",\n \"type\": \"image\"\n }\n ]\n }\n ]\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"latitude\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.05427416942713381,\"funcBody\":\"var value = prevValue || 15.833293;\\nif (time % 5000 < 500) {\\n value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"longitude\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.680594833308841,\"funcBody\":\"var value = prevValue || -90.454350;\\nif (time % 5000 < 500) {\\n value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"}]},{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"lat\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.05012157428742059,\"funcBody\":\"var value = prevValue || 14.450463;\\nif (time % 4000 < 500) {\\n value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"lng\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.6742359401617628,\"funcBody\":\"var value = prevValue || -84.845334;\\nif (time % 4000 < 500) {\\n value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"}]},{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"temperature\",\"color\":\"#607d8b\",\"settings\":{},\"_hash\":0.799863043034289,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"gmApiKey\":\"AIzaSyDoEx2kaGz3PxwbI9T7ccTSg5xjdw8Nw8Q\",\"markersSettings\":[{\"label\":\"First point\",\"color\":\"#1e88e5\",\"latKeyName\":\"latitude\",\"lngKeyName\":\"longitude\",\"showLabel\":true,\"tooltipPattern\":\"Latitude: ${latitude:7}
Longitude: ${longitude:7}
Temperature: ${temperature} °C
See advanced settings for details\",\"useColorFunction\":true,\"colorFunction\":\"var temperature = data[''temperature''];\\nif (typeof temperature !== undefined) {\\n var percent = (temperature + 60)/120 * 100;\\n return tinycolor.mix(''blue'', ''red'', amount = percent).toHexString();\\n}\\nreturn ''blue'';\",\"markerImages\":[],\"useMarkerImageFunction\":false},{\"label\":\"Second point\",\"color\":\"#fdd835\",\"latKeyName\":\"lat\",\"lngKeyName\":\"lng\",\"showLabel\":true,\"tooltipPattern\":\"Latitude: ${lat:7}
Longitude: ${lng:7}
Temperature: ${temperature} °C
See advanced settings for details\",\"markerImageSize\":34,\"markerImages\":[\"data:image/png;base64,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\",\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAB/CAYAAAD4mHJdAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAACWAAAAlgB7MGOJQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAA3vSURBVGiB7Vt7cFzVef+dc+/d90OrJyO/JSO/4ncxxfULMCYIAyEW08amJJgmM4GmnZjJdNq4gcSGzLQxk3bsaWcaaIHyR8CJrWAbpjgG/AhINsbYxkaSDY6xJFvSrrS7Wu3uvfecr3+cu1pbXhkJs/4nujNndufec77f+d7fd+4uw8gvIxwOfocBaz0e91yXyx0BgKyZiWUz5kcEvBKPJ18EYI+C5rWvkpKSyZGS8LGHGtbQR8ePUUdnB50/f57OfnqWWlpbaN++39O99fdQpCR0NBKJTBwJTfZFE4LBYLmh8+YXXvifKctWrEBPTze9+cbu8/3JVMoWNjwer3/ZsuUTvV4P239gP36yceNZW9CtyWQyei262hcB+7zurU/99Ge3r1nTgJdfevFsqr8/Wlc3rWbGzFkV8+fPr1iwYEEJgLadO3cmbr/jjohh6KXHPjxamsmar39pjoPBYHl5aUnnqZY2/b1Dh9LdPd39kUgk6PP5PD6fH36/Dz6fDx6PF+fOfdZ9+pPTgbq6Ou+aBx+0k/0DVYlEIjYcbX4tYM5pxeK/WKIDwM7Gxt0TJox/dtLESXC53JuHzvV4PBVHDjfvAYDZs+fonMsV16R9rYeM8XG1tbUAgMrKsrDP659DRJ5gMNhbaH5NTU0IAMaPHw9IPv5LAxORy+31AgBcLsO41lwAcLu9BgAYLheIkftLAxfzGgMeAx4DHgMeAx4DHgMeAx4DHgMeAx4DHgMeAx4D/lME1ke7gDF8ltbOHe3W923oEwYi1jxftWfZWgAziwacZkd2pfyN96XN5IIu7dMtIKA9/TI+zqCnFps2Alg5UlojFnVqIHZUlO2sl4RyC4CU+SEEylux8Z/iyc7mrxw4U7UnYwvGpXMYKIgNGdwXC/76C48oRw3sDWfnCgIkARJXcpwbvpA1e6T0Rq5jDr8EAHKA6OpjUOJwfeXAJAEhAXAGgEPKq+dIMVJqowDO4RAAC0rHV21u5LijAJaABAOIAY5Oh15iFMgj1zEpcUuuXjpIWeCouxjAtnIZcGKA5AVFbRfazPUC50QrKe8+Qy8qiqjBYIODA5DgBd1pBO9WRg9sy7yOhXBca+icYrgTOUGOiKnIVdCdisAxJGBTPsYW0nHRrJqgfNmGVtiqaeR1xchF7Vgz40q/BUNmISlcL7CUgJAMnOUiVwEdF0PURIAAVHaC8ucbAiwcQAb1KQpwXMjFrhtYMcOVO8lhOB457ujcKZd9hBguSYwcelTupKyaQWKYJFEU4xJw/Dhfcw29ilSBcNjEoTucFnSnkeOOvvTJpcVC1cYoGB5NAGEQTukjMAzHoghJghyWCRjenYoTuZjKx8xJiwU4LrSZ6waWpIoBjTuRqxDHRUkSUMWAJAZp6QU5FqOw65HHapG3bGVcBTZXDI5VnFaFgBL1yC34uoBJqEJeIwD2MMY1ilZidAFEMlDOqm9UdpJ0ZawumI+LU9ArwhyqWxyNz14XsBAMUnLVH0ttGB0XococdCGWE3XhOV85MF1WV2OY3omK0S2SkxgYAZYYJoAUpcqEEjG/Ru80isA1ysMXYNCnCum4aKUPgTu90w3sFinXL6nO/MadCAhiKloxBjFMeSuK0S1Kylv1cE1bUVoYyHwhoI6bCswpjjuxK5u2G2lcti2jzNCRTluioHEVw52EBA5/2LKsLBL+h2gs/o+Fjpa+MqtmjCbkqQJSYFF3T3zRsPMvA75i7UiBA4FApa6z5+fNnbd6/frHADghk7QdlhAHdMY0KXkZAHAuozaRMDRtKYMdAYDVq1fjcHPTD860nZlsS3qsv7+/+6pNDr0RDAanGTrf85Onnq75/uNPIJ1O4+dbnj34Ot6B4eFLqksqUeEvgcflAREhZabR09+Li/EorLQ4eFv317D2oW8t0XUdu3a9jud/9auztqD6ZDLZOixwOByeouv8D1u3brtpxYrb0XS4Kfbj3//8VHC8d0nDLXfj67OWIeQJgDGADfoOAxHQl05i14l92PHBXiTPp/c/OrFh9vwF8yMnjp/A5s2bOqXEbX19fX+8CriqqspvmunDTz/10xkr71qFnY07Tr1i7aqsLg2Vb6h/GOPCpdAYgTPlNLmF5AzpvBRp74viX3a/hO6+ge47+hZG61fVTz9y+DCee27Lx15fYFFHR8cAcNkPuw2DPXfP1+vvvf+BB7Br967WX9Mbk70eCn33zlWoCrsgKAFBCdgy/2nLBCyZgCUSMGUSpkzC0G1MrKzE0XMt/la9I0QnM+cWL15cmkwmK1tOnwpksuabg8YVifjnhEOlj69dtw6nT51Kv2q96fYG4fG7gbJwFhn7cxicIJgEZwAfEiokGASpWG1KhvIwg1/91ti1N9DEJ7ZOzKxdt87T1Nz8A67jv2Kx/o85AJDk//zXjzzCAeA/D7zU6PZjkkuXcBuEjN2OrGiHabfDFB2w7HZYoh3mVaMDWWdu1m6Hy5Bw6RIuP6b87+HXdgDAww8/zIXgGwFADwQCFYFA4BuLFi3CoUN/6LRmyL/y6gSXTtC4QDTVgQo/B5iEJFJ6Rt64lI6Vfi3JYBFHd1JA5wIunUNIQvpr/C+bm5u65s9fWBnwe9dISWVc0/DNhQsX6gDwTuuhd3WNYOSGTjjSehGp7EVYsguWuJQfssu51wVTXIIpLsGWlzBgXsSRM5dg6Hk6uk787Zb39gHA7NlzDM7xoM4Yli5fvgJSSiRmmbP9HNA0Qm4D6axEc6uJ6eOzuCloQuOOjlneqiUx2BK4lDBwut2DTFaHoXFYGilaHEjMMOdKKXHb4tvw/nvvL9UZ+Lyb6+pw/PjxpOZhsziX0DigcYLG1QaEBD69ZKA7wRHx2/C7BDSNwEi9AEmZGmJJA/1Z9SJM12hwvcYBzgmaj89obW3pr62dGmCcz+cuQ68GgEtdl7oYU40CZwSeW+As1rmy5KzNkbY1WILDlOp71ubgnKA7czVO4NyhwQhcFS7o6urq5pzDMLRqnXEtCACpdCrFHOHlAsTgYEq0nCnj0jnBY6i8KCTLBxbmzB2yPkczmU4lAYAxHtKFECYAPeDzBQZD4GU+motMueXklECWc7QkSaVDGoTAVetz8AGfLwQAQoisbtt2N4BJZaVlpZQjkntdS8w5UFOFni0YLMGhWfny1rbVPVuoOVKyK9ZeTrMsUl7qAHdzkPyktzeG2tqbw8KihCQlPjVUl2hLBkswmDZD1mJIWxwDWTXSFkfWUs8sZ64QzlqHjiRA2tQ7ZcqUYCwWgyT6hBNjb+3ZvQehUIi52tje3M6FyHHIYNkOqM2RsTjS2cuAs+pe1uYKPLcBkduA+m60sH1+v5/t3fsWGGP/x6VkjR98cAQAMNc7bXJepAyWzWHaimjW4siYDGmTY8DkGMhqapgcaVM9yw5ugMOyeX4DkmGub1otABz/6DiI2O94IpE4E+3p+aCzsxP333PfAvOi2G8JBtMRbU68GZMj44Ao0BzXmgOsRk7spq1oWILB6rQP3nt3/byLnZ2IxWKH4/H4pxoAeFzuC21tretW3rUKnk5mtWiflzAGxhgDQ66IYyrnOnqzBFfDZjAdLk1HMnkpMWRNLldmFomamtrIL/71F+iPJ/8mnc2e4QDQm0jsOXfu3L6TJ0/ivtX3T607M26P6SzMWI5eB7ktPHLPc/MV5xwTjpe9sfLOu2pOHD+JCxc+fyeWSLyZdzCoWsvjNpqef/6F8KTJU/DDLT/a3jM90eDWCS5dqmDvxF7NCRSAOikQhCuMUXHMEDjm3v7jb/+oIRrtxpMbnuzNmvatiUSi7QpgAAiFQneXlZbs3rGjUauorMSmLc+8dShy7HbDELqeA3bC4GCScHxWSMDOgVuaPb2t+t3vPfK9O1P9A/j7v3vC7ov318fj8bdyWFf8YCSbzZ7VNHb+tVdfrV911ypt/bcfq52J2uTBg+//LhWwZ0nJYTtWf6WrcccDGFgLdn5nwkPVD9Q/MLOzsxNPbvhhNpUc+G5vPL7jcqxBjonozwEsBzD5lVde9jy5YcPqTZufKX90/WOwbRv7330nsffDt08dSB41EkZyHPfwmwBAZuTFsBm48GeuWfai2oUzp02fFjKzJhp3NuLFF/+765e//Pfd31q71gLwGYC3GWNNAMCIaBKAJwBUO3uQnZ2d/MyZNv1vn/j+LUuXLq/Z/MyzCIfDTmxW8Y+IVFyWqjKRQkDYNqKxGDb97GkcOXLk7LZt/9F8c12dqKqqYM4LYALQCWAbI6J/A1AGgKK9vSBhoa8vEe+N9TwejcZYU1MTfrN9O6puqkJDw0NYtnwFpk6dCsZUMrFtG22trTiw/11s3/4aotEo1jQ04NZFt6KsrJTCoZKtJaWRiGG4KBKJ5BJWnw4gDedAx+0yMJCywLnQGWOSMabV1NbikUfX40J7B367sxFbt25DMhGHZZkgAC7DhWAojOpx4zF3wS0YP64aVZUVYCoQSN2la4bhIsNlcOS73H5GRBUAHgcwBYABAD09PZROp1gq2V8WTybq4vH4xEQ8oSWSSfSnUkinM7As9RdUw9Dh9XoR8PsQCgYRCodESTj0x1Aw2OrxBXsDgYBdXl6eM2IB4CyAbZcb12wASwBMB1Dq7C4ACJZIJHstM5PWdC2TTmcom80wEtySAFwupum6wbxeDxeCuT0et8/v94UBTTrSJABRAKcAHGCMnbrKjy/bRBjAHAATAFQ5NuAF4IFqAtyOKzKo83MLgAkgA2AAQB+ADgCfAzjBGIsPxfh/6wbDK7xbMFYAAAAASUVORK5CYII=\",\"data:image/png;base64,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\",\"data:image/png;base64,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\"],\"useMarkerImageFunction\":true,\"markerImageFunction\":\"var res = {\\n url: images[0],\\n size: 40\\n}\\nvar temperature = data[''temperature''];\\nif (typeof temperature !== undefined) {\\n var percent = (temperature + 60)/120;\\n var index = Math.floor(4 * percent);\\n res.url = images[index];\\n}\\nreturn res;\",\"useColorFunction\":false}],\"fitMapBounds\":true,\"gmDefaultMapType\":\"roadmap\"},\"title\":\"Google Maps\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"useDashboardTimewindow\":true,\"showLegend\":false}"}', + 'Google Maps' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( 'ff0a8d4c-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'analogue_gauges', + 'temperature_radial_gauge_canvas_gauges', + '{"type":"latest","sizeX":6,"sizeY":5,"resources":[],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbAnalogueRadialGauge(self.ctx, ''radialGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.getSettingsSchema = function() {\n return TbAnalogueRadialGauge.settingsSchema;\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temperature\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"maxValue\":60,\"startAngle\":67.5,\"ticksAngle\":225,\"showBorder\":true,\"defaultColor\":\"#e65100\",\"needleCircleSize\":7,\"highlights\":[{\"from\":-60,\"to\":-50,\"color\":\"#42a5f5\"},{\"from\":-50,\"to\":-40,\"color\":\"rgba(66, 165, 245, 0.83)\"},{\"from\":-40,\"to\":-30,\"color\":\"rgba(66, 165, 245, 0.66)\"},{\"from\":-30,\"to\":-20,\"color\":\"rgba(66, 165, 245, 0.5)\"},{\"from\":-20,\"to\":-10,\"color\":\"rgba(66, 165, 245, 0.33)\"},{\"from\":-10,\"to\":0,\"color\":\"rgba(66, 165, 245, 0.16)\"},{\"from\":0,\"to\":10,\"color\":\"rgba(229, 115, 115, 0.16)\"},{\"from\":10,\"to\":20,\"color\":\"rgba(229, 115, 115, 0.33)\"},{\"from\":20,\"to\":30,\"color\":\"rgba(229, 115, 115, 0.5)\"},{\"from\":30,\"to\":40,\"color\":\"rgba(229, 115, 115, 0.66)\"},{\"from\":40,\"to\":50,\"color\":\"rgba(229, 115, 115, 0.83)\"},{\"from\":50,\"to\":60,\"color\":\"#e57373\"}],\"showUnitTitle\":true,\"colorPlate\":\"#cfd8dc\",\"colorMajorTicks\":\"#444\",\"colorMinorTicks\":\"#666\",\"minorTicks\":2,\"valueInt\":3,\"valueDec\":1,\"highlightsWidth\":15,\"valueBox\":true,\"animation\":true,\"animationDuration\":1000,\"animationRule\":\"bounce\",\"colorNeedleShadowUp\":\"rgba(2, 255, 255, 0)\",\"colorNeedleShadowDown\":\"rgba(188, 143, 143, 0.78)\",\"units\":\"°C\",\"majorTicksCount\":12,\"numbersFont\":{\"family\":\"Roboto\",\"size\":20,\"style\":\"normal\",\"weight\":\"normal\",\"color\":\"#263238\"},\"titleFont\":{\"family\":\"Roboto\",\"size\":24,\"style\":\"normal\",\"weight\":\"normal\",\"color\":\"#263238\"},\"unitsFont\":{\"family\":\"Roboto\",\"size\":28,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#616161\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"size\":30,\"style\":\"normal\",\"weight\":\"normal\",\"shadowColor\":\"rgba(0, 0, 0, 0.49)\",\"color\":\"#444\"},\"colorValueBoxRect\":\"#888\",\"colorValueBoxRectEnd\":\"#666\",\"colorValueBoxBackground\":\"#babab2\",\"colorValueBoxShadow\":\"rgba(0,0,0,1)\",\"unitTitle\":\"Temperature\",\"minValue\":-60},\"title\":\"Temperature radial gauge - Canvas Gauges\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'Temperature radial gauge - Canvas Gauges' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( '01baee42-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'cards', 'attributes_card', + '{"type":"latest","sizeX":7.5,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#container {\n overflow: auto;\n}\n\n.tbDatasource-container {\n margin: 5px;\n padding: 8px;\n}\n\n.tbDatasource-title {\n font-size: 1.200rem;\n font-weight: 500;\n padding-bottom: 10px;\n}\n\n.tbDatasource-table {\n width: 100%;\n box-shadow: 0 0 10px #ccc;\n border-collapse: collapse;\n white-space: nowrap;\n font-size: 1.000rem;\n color: #757575;\n}\n\n.tbDatasource-table td {\n position: relative;\n border-top: 1px solid rgba(0, 0, 0, 0.12);\n border-bottom: 1px solid rgba(0, 0, 0, 0.12);\n padding: 0px 18px;\n box-sizing: border-box;\n}","controllerScript":"self.onInit = function() {\n \n self.ctx.datasourceTitleCells = [];\n self.ctx.valueCells = [];\n self.ctx.labelCells = [];\n \n for (var i=0; i < self.ctx.datasources.length; i++) {\n var tbDatasource = self.ctx.datasources[i];\n\n var datasourceId = ''tbDatasource'' + i;\n self.ctx.$container.append(\n \"
\"\n );\n\n var datasourceContainer = $(''#'' + datasourceId,\n self.ctx.$container);\n\n datasourceContainer.append(\n \"
\" +\n tbDatasource.name + \"
\"\n );\n \n var datasourceTitleCell = $(''.tbDatasource-title'', datasourceContainer);\n self.ctx.datasourceTitleCells.push(datasourceTitleCell);\n \n var tableId = ''table'' + i;\n datasourceContainer.append(\n \"
\"\n );\n var table = $(''#'' + tableId, self.ctx.$container);\n\n for (var a = 0; a < tbDatasource.dataKeys.length; a++) {\n var dataKey = tbDatasource.dataKeys[a];\n var labelCellId = ''labelCell'' + a;\n var cellId = ''cell'' + a;\n table.append(\"\" + dataKey.label +\n \"\");\n var labelCell = $(''#'' + labelCellId, table);\n self.ctx.labelCells.push(labelCell);\n var valueCell = $(''#'' + cellId, table);\n self.ctx.valueCells.push(valueCell);\n }\n } \n \n self.onResize();\n}\n\nself.onDataUpdated = function() {\n for (var i = 0; i < self.ctx.valueCells.length; i++) {\n var cellData = self.ctx.data[i];\n if (cellData && cellData.data && cellData.data.length > 0) {\n var tvPair = cellData.data[cellData.data.length -\n 1];\n var value = tvPair[1];\n self.ctx.valueCells[i].html(value);\n }\n } \n}\n\nself.onResize = function() {\n var datasoirceTitleFontSize = self.ctx.height/8;\n if (self.ctx.width/self.ctx.height <= 1.5) {\n datasoirceTitleFontSize = self.ctx.width/12;\n }\n datasoirceTitleFontSize = Math.min(datasoirceTitleFontSize, 20);\n for (var i = 0; i < self.ctx.datasourceTitleCells.length; i++) {\n self.ctx.datasourceTitleCells[i].css(''font-size'', datasoirceTitleFontSize+''px'');\n }\n var valueFontSize = self.ctx.height/9;\n var labelFontSize = self.ctx.height/9;\n if (self.ctx.width/self.ctx.height <= 1.5) {\n valueFontSize = self.ctx.width/15;\n labelFontSize = self.ctx.width/15;\n }\n valueFontSize = Math.min(valueFontSize, 18);\n labelFontSize = Math.min(labelFontSize, 18);\n\n for (i = 0; i < self.ctx.valueCells; i++) {\n self.ctx.valueCells[i].css(''font-size'', valueFontSize+''px'');\n self.ctx.valueCells[i].css(''height'', valueFontSize*2.5+''px'');\n self.ctx.valueCells[i].css(''padding'', ''0px '' + valueFontSize + ''px'');\n self.ctx.labelCells[i].css(''font-size'', labelFontSize+''px'');\n self.ctx.labelCells[i].css(''height'', labelFontSize*2.5+''px'');\n self.ctx.labelCells[i].css(''padding'', ''0px '' + labelFontSize + ''px'');\n } \n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Random\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Attributes card\"}"}', + 'Attributes card' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( '044283a0-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', + 'digital_thermometer', + '{"type":"latest","sizeX":3,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < -60) {\\n\\tvalue = 60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#000000\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":60,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":1,\"levelColors\":[\"#304ffe\",\"#7e57c2\",\"#ff4081\",\"#d32f2f\"],\"refreshAnimationType\":\"<>\",\"refreshAnimationTime\":700,\"startAnimationType\":\"<>\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":18},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"dashThickness\":1.5,\"decimals\":0,\"minValue\":-60,\"units\":\"°C\",\"gaugeColor\":\"#333333\",\"neonGlowBrightness\":35,\"gaugeType\":\"donut\"},\"title\":\"Digital thermometer\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'Digital thermometer' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( '0758880a-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'gpio_widgets', + 'raspberry_pi_gpio_control', + '{"type":"rpc","sizeX":6,"sizeY":10.5,"resources":[],"templateHtml":"
\n
\n
\n
\n {{ cell.label }}\n
\n {{cell.pin}}\n \n \n \n \n {{cell.pin}}\n
\n {{ cell.label }}\n
\n
\n \n \n \n
\n
\n
\n {{rpcErrorText}}\n \n
","templateCss":".error {\n font-size: 14px !important;\n color: maroon;/*rgb(250,250,250);*/\n background-color: transparent;\n padding: 6px;\n}\n\n.error span {\n margin: auto;\n}\n\n.gpio-panel {\n padding-top: 10px;\n white-space: nowrap;\n}\n\n.switch-panel {\n margin: 0;\n height: 32px;\n width: 66px;\n min-width: 66px;\n}\n\n.switch-panel md-switch {\n margin: 0;\n width: 36px;\n min-width: 36px;\n}\n\n.switch-panel md-switch > div.md-container {\n margin: 0;\n}\n\n.switch-panel.col-0 md-switch {\n margin-left: 8px;\n margin-right: 4px;\n}\n\n.switch-panel.col-1 md-switch {\n margin-left: 4px;\n margin-right: 8px;\n}\n\n.gpio-row {\n height: 32px;\n}\n\n.pin {\n margin-top: auto;\n margin-bottom: auto;\n color: white;\n font-size: 12px;\n width: 16px;\n min-width: 16px;\n}\n\n.switch-panel.col-0 .pin {\n margin-left: auto;\n padding-left: 2px;\n text-align: right;\n}\n\n.switch-panel.col-1 .pin {\n margin-right: auto;\n \n text-align: left;\n}\n\n.gpio-left-label {\n margin-right: 8px;\n}\n\n.gpio-right-label {\n margin-left: 8px;\n}","controllerScript":"self.onInit = function() {\n \n var i, gpio;\n var scope = self.ctx.$scope;\n var settings = self.ctx.settings;\n scope.gpioList = [];\n for (var g = 0; g < settings.gpioList.length; g++) {\n gpio = settings.gpioList[g];\n scope.gpioList.push(\n {\n row: gpio.row,\n col: gpio.col,\n pin: gpio.pin,\n label: gpio.label,\n enabled: false\n }\n );\n }\n\n scope.requestTimeout = settings.requestTimeout || 1000;\n\n scope.switchPanelBackgroundColor = settings.switchPanelBackgroundColor || tinycolor(''green'').lighten(2).toRgbString();\n\n scope.gpioStatusRequest = {\n method: \"getGpioStatus\",\n paramsBody: \"{}\"\n };\n \n if (settings.gpioStatusRequest) {\n scope.gpioStatusRequest.method = settings.gpioStatusRequest.method || scope.gpioStatusRequest.method;\n scope.gpioStatusRequest.paramsBody = settings.gpioStatusRequest.paramsBody || scope.gpioStatusRequest.paramsBody;\n }\n \n scope.gpioStatusChangeRequest = {\n method: \"setGpioStatus\",\n paramsBody: \"{\\n \\\"pin\\\": \\\"{$pin}\\\",\\n \\\"enabled\\\": \\\"{$enabled}\\\"\\n}\"\n };\n \n if (settings.gpioStatusChangeRequest) {\n scope.gpioStatusChangeRequest.method = settings.gpioStatusChangeRequest.method || scope.gpioStatusChangeRequest.method;\n scope.gpioStatusChangeRequest.paramsBody = settings.gpioStatusChangeRequest.paramsBody || scope.gpioStatusChangeRequest.paramsBody;\n }\n \n scope.parseGpioStatusFunction = \"return body[pin] === true;\";\n \n if (settings.parseGpioStatusFunction && settings.parseGpioStatusFunction.length > 0) {\n scope.parseGpioStatusFunction = settings.parseGpioStatusFunction;\n }\n \n scope.parseGpioStatusFunction = new Function(\"body, pin\", scope.parseGpioStatusFunction);\n \n function requestGpioStatus() {\n self.ctx.controlApi.sendTwoWayCommand(scope.gpioStatusRequest.method, \n scope.gpioStatusRequest.paramsBody, \n scope.requestTimeout)\n .then(\n function success(responseBody) {\n for (var g = 0; g < scope.gpioList.length; g++) {\n var gpio = scope.gpioList[g];\n var enabled = scope.parseGpioStatusFunction.apply(this, [responseBody, gpio.pin]);\n gpio.enabled = enabled; \n }\n }\n );\n }\n \n function changeGpioStatus(gpio) {\n var pin = gpio.pin + '''';\n var enabled = !gpio.enabled;\n enabled = enabled === true ? ''true'' : ''false'';\n var paramsBody = scope.gpioStatusChangeRequest.paramsBody;\n var requestBody = JSON.parse(paramsBody.replace(\"\\\"{$pin}\\\"\", pin).replace(\"\\\"{$enabled}\\\"\", enabled));\n self.ctx.controlApi.sendTwoWayCommand(scope.gpioStatusChangeRequest.method, \n requestBody, scope.requestTimeout)\n .then(\n function success(responseBody) {\n var enabled = scope.parseGpioStatusFunction.apply(this, [responseBody, gpio.pin]);\n gpio.enabled = enabled;\n }\n );\n }\n \n scope.gpioCells = {};\n var rowCount = 0;\n for (i = 0; i < scope.gpioList.length; i++) {\n gpio = scope.gpioList[i];\n scope.gpioCells[gpio.row+''_''+gpio.col] = gpio;\n rowCount = Math.max(rowCount, gpio.row+1);\n }\n \n scope.prefferedRowHeight = 32;\n scope.rows = [];\n for (i = 0; i < rowCount; i++) {\n var row = [];\n for (var c =0; c<2;c++) {\n if (scope.gpioCells[i+''_''+c]) {\n row[c] = scope.gpioCells[i+''_''+c];\n } else {\n row[c] = null;\n }\n }\n scope.rows.push(row);\n }\n\n scope.gpioClick = function($event, gpio) {\n changeGpioStatus(gpio);\n };\n\n requestGpioStatus(); \n \n self.onResize();\n}\n\nself.onResize = function() {\n var scope = self.ctx.$scope;\n var rowCount = scope.rows.length;\n var prefferedRowHeight = (self.ctx.height - 35)/rowCount;\n prefferedRowHeight = Math.min(32, prefferedRowHeight);\n prefferedRowHeight = Math.max(12, prefferedRowHeight);\n scope.prefferedRowHeight = prefferedRowHeight;\n var ratio = prefferedRowHeight/32;\n var switches = $(''md-switch'', self.ctx.$container);\n switches.css(''height'', 30*ratio+''px'');\n switches.css(''width'', 36*ratio+''px'');\n switches.css(''min-width'', 36*ratio+''px'');\n $(''.md-container'', switches).css(''height'', 24*ratio+''px'');\n $(''.md-container'', switches).css(''width'', 36*ratio+''px'');\n var bars = $(''.md-bar'', self.ctx.$container);\n bars.css(''height'', 14*ratio+''px'');\n bars.css(''width'', 34*ratio+''px'');\n var thumbs = $(''.md-thumb'', self.ctx.$container);\n thumbs.css(''height'', 20*ratio+''px'');\n thumbs.css(''width'', 20*ratio+''px'');\n \n var leftLabels = $(''.gpio-left-label'', self.ctx.$container);\n leftLabels.css(''font-size'', 16*ratio+''px'');\n var rightLabels = $(''.gpio-right-label'', self.ctx.$container);\n rightLabels.css(''font-size'', 16*ratio+''px'');\n var pins = $(''.pin'', self.ctx.$container);\n var pinsFontSize = Math.max(9, 12*ratio);\n pins.css(''font-size'', pinsFontSize+''px''); \n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"Settings\",\n \"properties\": {\n \"gpioList\": {\n \"title\": \"Gpio switches\",\n \"type\": \"array\",\n \"minItems\" : 1,\n \"items\": {\n \"title\": \"Gpio switch\",\n \"type\": \"object\",\n \"properties\": {\n \"pin\": {\n \"title\": \"Pin\",\n \"type\": \"number\"\n },\n \"label\": {\n \"title\": \"Label\",\n \"type\": \"string\"\n },\n \"row\": {\n \"title\": \"Row\",\n \"type\": \"number\"\n },\n \"col\": {\n \"title\": \"Column\",\n \"type\": \"number\"\n }\n },\n \"required\": [\"pin\", \"label\", \"row\", \"col\"]\n }\n },\n \"requestTimeout\": {\n \"title\": \"RPC request timeout\",\n \"type\": \"number\",\n \"default\": 500\n },\n \"switchPanelBackgroundColor\": {\n \"title\": \"Switches panel background color\",\n \"type\": \"string\",\n \"default\": \"#008a00\"\n },\n \"gpioStatusRequest\": {\n \"title\": \"GPIO status request\",\n \"type\": \"object\",\n \"properties\": {\n \"method\": {\n \"title\": \"Method name\",\n \"type\": \"string\",\n \"default\": \"getGpioStatus\"\n },\n \"paramsBody\": {\n \"title\": \"Method body\",\n \"type\": \"string\",\n \"default\": \"{}\"\n }\n },\n \"required\": [\"method\", \"paramsBody\"]\n },\n \"gpioStatusChangeRequest\": {\n \"title\": \"GPIO status change request\",\n \"type\": \"object\",\n \"properties\": {\n \"method\": {\n \"title\": \"Method name\",\n \"type\": \"string\",\n \"default\": \"setGpioStatus\"\n },\n \"paramsBody\": {\n \"title\": \"Method body\",\n \"type\": \"string\",\n \"default\": \"{\\n \\\"pin\\\": \\\"{$pin}\\\",\\n \\\"enabled\\\": \\\"{$enabled}\\\"\\n}\"\n }\n },\n \"required\": [\"method\", \"paramsBody\"]\n },\n \"parseGpioStatusFunction\": {\n \"title\": \"Parse gpio status function\",\n \"type\": \"string\",\n \"default\": \"return body[pin] === true;\"\n } \n },\n \"required\": [\"gpioList\", \n \"requestTimeout\",\n \"switchPanelBackgroundColor\",\n \"gpioStatusRequest\",\n \"gpioStatusChangeRequest\",\n \"parseGpioStatusFunction\"]\n },\n \"form\": [\n \"gpioList\",\n \"requestTimeout\",\n {\n \"key\": \"switchPanelBackgroundColor\",\n \"type\": \"color\"\n },\n {\n \"key\": \"gpioStatusRequest\",\n \"items\": [\n \"gpioStatusRequest.method\",\n {\n \"key\": \"gpioStatusRequest.paramsBody\",\n \"type\": \"json\"\n }\n ]\n },\n {\n \"key\": \"gpioStatusChangeRequest\",\n \"items\": [\n \"gpioStatusChangeRequest.method\",\n {\n \"key\": \"gpioStatusChangeRequest.paramsBody\",\n \"type\": \"json\"\n }\n ]\n },\n {\n \"key\": \"parseGpioStatusFunction\",\n \"type\": \"javascript\"\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"targetDeviceAliases\":[],\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"parseGpioStatusFunction\":\"return body[pin] === true;\",\"gpioStatusChangeRequest\":{\"method\":\"setGpioStatus\",\"paramsBody\":\"{\\n \\\"pin\\\": \\\"{$pin}\\\",\\n \\\"enabled\\\": \\\"{$enabled}\\\"\\n}\"},\"requestTimeout\":500,\"switchPanelBackgroundColor\":\"#008a00\",\"gpioStatusRequest\":{\"method\":\"getGpioStatus\",\"paramsBody\":\"{}\"},\"gpioList\":[{\"pin\":7,\"label\":\"GPIO 4 (GPCLK0)\",\"row\":3,\"col\":0,\"_uniqueKey\":0},{\"pin\":11,\"label\":\"GPIO 17\",\"row\":5,\"col\":0,\"_uniqueKey\":1},{\"pin\":12,\"label\":\"GPIO 18\",\"row\":5,\"col\":1,\"_uniqueKey\":2},{\"_uniqueKey\":3,\"pin\":13,\"label\":\"GPIO 27\",\"row\":6,\"col\":0},{\"_uniqueKey\":4,\"pin\":15,\"label\":\"GPIO 22\",\"row\":7,\"col\":0},{\"_uniqueKey\":5,\"pin\":16,\"label\":\"GPIO 23\",\"row\":7,\"col\":1},{\"_uniqueKey\":6,\"pin\":18,\"label\":\"GPIO 24\",\"row\":8,\"col\":1},{\"_uniqueKey\":7,\"pin\":22,\"label\":\"GPIO 25\",\"row\":10,\"col\":1},{\"_uniqueKey\":8,\"pin\":29,\"label\":\"GPIO 5\",\"row\":14,\"col\":0},{\"_uniqueKey\":9,\"pin\":31,\"label\":\"GPIO 6\",\"row\":15,\"col\":0},{\"_uniqueKey\":10,\"pin\":32,\"label\":\"GPIO 12\",\"row\":15,\"col\":1},{\"_uniqueKey\":11,\"pin\":33,\"label\":\"GPIO 13\",\"row\":16,\"col\":0},{\"_uniqueKey\":12,\"pin\":35,\"label\":\"GPIO 19\",\"row\":17,\"col\":0},{\"_uniqueKey\":13,\"pin\":36,\"label\":\"GPIO 16\",\"row\":17,\"col\":1},{\"_uniqueKey\":14,\"pin\":37,\"label\":\"GPIO 26\",\"row\":18,\"col\":0},{\"_uniqueKey\":15,\"pin\":38,\"label\":\"GPIO 20\",\"row\":18,\"col\":1},{\"_uniqueKey\":16,\"pin\":40,\"label\":\"GPIO 21\",\"row\":19,\"col\":1}]},\"title\":\"Raspberry Pi GPIO Control\"}"}', + 'Raspberry Pi GPIO Control' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( '09d408f2-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'gpio_widgets', + 'basic_gpio_control', + '{"type":"rpc","sizeX":4,"sizeY":2,"resources":[],"templateHtml":"
\n
\n
\n
\n {{ cell.label }}\n
\n {{cell.pin}}\n \n \n \n \n {{cell.pin}}\n
\n {{ cell.label }}\n
\n
\n \n \n \n
\n
\n
\n {{rpcErrorText}}\n \n
","templateCss":".error {\n font-size: 14px !important;\n color: maroon;/*rgb(250,250,250);*/\n background-color: transparent;\n padding: 6px;\n}\n\n.error span {\n margin: auto;\n}\n\n.gpio-panel {\n padding-top: 10px;\n white-space: nowrap;\n}\n\n.switch-panel {\n margin: 0;\n height: 32px;\n width: 66px;\n min-width: 66px;\n}\n\n.switch-panel md-switch {\n margin: 0;\n width: 36px;\n min-width: 36px;\n}\n\n.switch-panel md-switch > div.md-container {\n margin: 0;\n}\n\n.switch-panel.col-0 md-switch {\n padding-left: 8px;\n padding-right: 4px;\n}\n\n.switch-panel.col-1 md-switch {\n padding-left: 4px;\n padding-right: 8px;\n}\n\n.gpio-row {\n height: 32px;\n}\n\n.pin {\n margin-top: auto;\n margin-bottom: auto;\n color: white;\n font-size: 12px;\n width: 16px;\n min-width: 16px;\n}\n\n.switch-panel.col-0 .pin {\n margin-left: auto;\n padding-left: 2px;\n text-align: right;\n}\n\n.switch-panel.col-1 .pin {\n margin-right: auto;\n \n text-align: left;\n}\n\n.gpio-left-label {\n margin-right: 8px;\n}\n\n.gpio-right-label {\n margin-left: 8px;\n}","controllerScript":"self.onInit = function() {\n \n var i, gpio;\n var scope = self.ctx.$scope;\n var settings = self.ctx.settings;\n scope.gpioList = [];\n for (var g = 0; g < settings.gpioList.length; g++) {\n gpio = settings.gpioList[g];\n scope.gpioList.push(\n {\n row: gpio.row,\n col: gpio.col,\n pin: gpio.pin,\n label: gpio.label,\n enabled: false\n }\n );\n }\n\n scope.requestTimeout = settings.requestTimeout || 1000;\n\n scope.switchPanelBackgroundColor = settings.switchPanelBackgroundColor || tinycolor(''green'').lighten(2).toRgbString();\n\n scope.gpioStatusRequest = {\n method: \"getGpioStatus\",\n paramsBody: \"{}\"\n };\n \n if (settings.gpioStatusRequest) {\n scope.gpioStatusRequest.method = settings.gpioStatusRequest.method || scope.gpioStatusRequest.method;\n scope.gpioStatusRequest.paramsBody = settings.gpioStatusRequest.paramsBody || scope.gpioStatusRequest.paramsBody;\n }\n \n scope.gpioStatusChangeRequest = {\n method: \"setGpioStatus\",\n paramsBody: \"{\\n \\\"pin\\\": \\\"{$pin}\\\",\\n \\\"enabled\\\": \\\"{$enabled}\\\"\\n}\"\n };\n \n if (settings.gpioStatusChangeRequest) {\n scope.gpioStatusChangeRequest.method = settings.gpioStatusChangeRequest.method || scope.gpioStatusChangeRequest.method;\n scope.gpioStatusChangeRequest.paramsBody = settings.gpioStatusChangeRequest.paramsBody || scope.gpioStatusChangeRequest.paramsBody;\n }\n \n scope.parseGpioStatusFunction = \"return body[pin] === true;\";\n \n if (settings.parseGpioStatusFunction && settings.parseGpioStatusFunction.length > 0) {\n scope.parseGpioStatusFunction = settings.parseGpioStatusFunction;\n }\n \n scope.parseGpioStatusFunction = new Function(\"body, pin\", scope.parseGpioStatusFunction);\n \n function requestGpioStatus() {\n self.ctx.controlApi.sendTwoWayCommand(scope.gpioStatusRequest.method, \n scope.gpioStatusRequest.paramsBody, \n scope.requestTimeout)\n .then(\n function success(responseBody) {\n for (var g = 0; g < scope.gpioList.length; g++) {\n var gpio = scope.gpioList[g];\n var enabled = scope.parseGpioStatusFunction.apply(this, [responseBody, gpio.pin]);\n gpio.enabled = enabled; \n }\n }\n );\n }\n \n function changeGpioStatus(gpio) {\n var pin = gpio.pin + '''';\n var enabled = !gpio.enabled;\n enabled = enabled === true ? ''true'' : ''false'';\n var paramsBody = scope.gpioStatusChangeRequest.paramsBody;\n var requestBody = JSON.parse(paramsBody.replace(\"\\\"{$pin}\\\"\", pin).replace(\"\\\"{$enabled}\\\"\", enabled));\n self.ctx.controlApi.sendTwoWayCommand(scope.gpioStatusChangeRequest.method, \n requestBody, scope.requestTimeout)\n .then(\n function success(responseBody) {\n var enabled = scope.parseGpioStatusFunction.apply(this, [responseBody, gpio.pin]);\n gpio.enabled = enabled;\n }\n );\n }\n \n scope.gpioCells = {};\n var rowCount = 0;\n for (i = 0; i < scope.gpioList.length; i++) {\n gpio = scope.gpioList[i];\n scope.gpioCells[gpio.row+''_''+gpio.col] = gpio;\n rowCount = Math.max(rowCount, gpio.row+1);\n }\n \n scope.prefferedRowHeight = 32;\n scope.rows = [];\n for (i = 0; i < rowCount; i++) {\n var row = [];\n for (var c =0; c<2;c++) {\n if (scope.gpioCells[i+''_''+c]) {\n row[c] = scope.gpioCells[i+''_''+c];\n } else {\n row[c] = null;\n }\n }\n scope.rows.push(row);\n }\n\n scope.gpioClick = function($event, gpio) {\n changeGpioStatus(gpio);\n };\n\n requestGpioStatus(); \n \n self.onResize();\n}\n\nself.onResize = function() {\n var scope = self.ctx.$scope;\n var rowCount = scope.rows.length;\n var prefferedRowHeight = (self.ctx.height - 35)/rowCount;\n prefferedRowHeight = Math.min(32, prefferedRowHeight);\n prefferedRowHeight = Math.max(12, prefferedRowHeight);\n scope.prefferedRowHeight = prefferedRowHeight;\n var ratio = prefferedRowHeight/32;\n var switches = $(''md-switch'', self.ctx.$container);\n switches.css(''height'', 30*ratio+''px'');\n switches.css(''width'', 36*ratio+''px'');\n switches.css(''min-width'', 36*ratio+''px'');\n $(''.md-container'', switches).css(''height'', 24*ratio+''px'');\n $(''.md-container'', switches).css(''width'', 36*ratio+''px'');\n var bars = $(''.md-bar'', self.ctx.$container);\n bars.css(''height'', 14*ratio+''px'');\n bars.css(''width'', 34*ratio+''px'');\n var thumbs = $(''.md-thumb'', self.ctx.$container);\n thumbs.css(''height'', 20*ratio+''px'');\n thumbs.css(''width'', 20*ratio+''px'');\n \n var leftLabels = $(''.gpio-left-label'', self.ctx.$container);\n leftLabels.css(''font-size'', 16*ratio+''px'');\n var rightLabels = $(''.gpio-right-label'', self.ctx.$container);\n rightLabels.css(''font-size'', 16*ratio+''px'');\n var pins = $(''.pin'', self.ctx.$container);\n var pinsFontSize = Math.max(9, 12*ratio);\n pins.css(''font-size'', pinsFontSize+''px''); \n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"Settings\",\n \"properties\": {\n \"gpioList\": {\n \"title\": \"Gpio switches\",\n \"type\": \"array\",\n \"minItems\" : 1,\n \"items\": {\n \"title\": \"Gpio switch\",\n \"type\": \"object\",\n \"properties\": {\n \"pin\": {\n \"title\": \"Pin\",\n \"type\": \"number\"\n },\n \"label\": {\n \"title\": \"Label\",\n \"type\": \"string\"\n },\n \"row\": {\n \"title\": \"Row\",\n \"type\": \"number\"\n },\n \"col\": {\n \"title\": \"Column\",\n \"type\": \"number\"\n }\n },\n \"required\": [\"pin\", \"label\", \"row\", \"col\"]\n }\n },\n \"requestTimeout\": {\n \"title\": \"RPC request timeout\",\n \"type\": \"number\",\n \"default\": 500\n },\n \"switchPanelBackgroundColor\": {\n \"title\": \"Switches panel background color\",\n \"type\": \"string\",\n \"default\": \"#008a00\"\n },\n \"gpioStatusRequest\": {\n \"title\": \"GPIO status request\",\n \"type\": \"object\",\n \"properties\": {\n \"method\": {\n \"title\": \"Method name\",\n \"type\": \"string\",\n \"default\": \"getGpioStatus\"\n },\n \"paramsBody\": {\n \"title\": \"Method body\",\n \"type\": \"string\",\n \"default\": \"{}\"\n }\n },\n \"required\": [\"method\", \"paramsBody\"]\n },\n \"gpioStatusChangeRequest\": {\n \"title\": \"GPIO status change request\",\n \"type\": \"object\",\n \"properties\": {\n \"method\": {\n \"title\": \"Method name\",\n \"type\": \"string\",\n \"default\": \"setGpioStatus\"\n },\n \"paramsBody\": {\n \"title\": \"Method body\",\n \"type\": \"string\",\n \"default\": \"{\\n \\\"pin\\\": \\\"{$pin}\\\",\\n \\\"enabled\\\": \\\"{$enabled}\\\"\\n}\"\n }\n },\n \"required\": [\"method\", \"paramsBody\"]\n },\n \"parseGpioStatusFunction\": {\n \"title\": \"Parse gpio status function\",\n \"type\": \"string\",\n \"default\": \"return body[pin] === true;\"\n } \n },\n \"required\": [\"gpioList\", \n \"requestTimeout\",\n \"switchPanelBackgroundColor\",\n \"gpioStatusRequest\",\n \"gpioStatusChangeRequest\",\n \"parseGpioStatusFunction\"]\n },\n \"form\": [\n \"gpioList\",\n \"requestTimeout\",\n {\n \"key\": \"switchPanelBackgroundColor\",\n \"type\": \"color\"\n },\n {\n \"key\": \"gpioStatusRequest\",\n \"items\": [\n \"gpioStatusRequest.method\",\n {\n \"key\": \"gpioStatusRequest.paramsBody\",\n \"type\": \"json\"\n }\n ]\n },\n {\n \"key\": \"gpioStatusChangeRequest\",\n \"items\": [\n \"gpioStatusChangeRequest.method\",\n {\n \"key\": \"gpioStatusChangeRequest.paramsBody\",\n \"type\": \"json\"\n }\n ]\n },\n {\n \"key\": \"parseGpioStatusFunction\",\n \"type\": \"javascript\"\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"targetDeviceAliases\":[],\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"parseGpioStatusFunction\":\"return body[pin] === true;\",\"gpioStatusChangeRequest\":{\"method\":\"setGpioStatus\",\"paramsBody\":\"{\\n \\\"pin\\\": \\\"{$pin}\\\",\\n \\\"enabled\\\": \\\"{$enabled}\\\"\\n}\"},\"requestTimeout\":500,\"switchPanelBackgroundColor\":\"#b71c1c\",\"gpioStatusRequest\":{\"method\":\"getGpioStatus\",\"paramsBody\":\"{}\"},\"gpioList\":[{\"pin\":1,\"label\":\"GPIO 1\",\"row\":0,\"col\":0,\"_uniqueKey\":0},{\"pin\":2,\"label\":\"GPIO 2\",\"row\":0,\"col\":1,\"_uniqueKey\":1},{\"pin\":3,\"label\":\"GPIO 3\",\"row\":1,\"col\":0,\"_uniqueKey\":2}]},\"title\":\"Basic GPIO Control\"}"}', + 'Basic GPIO Control' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( '0d10aca0-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', + 'horizontal_bar_justgage', + '{"type":"latest","sizeX":7,"sizeY":3,"resources":[],"templateHtml":"\n","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#999999\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Roboto\",\"style\":\"normal\",\"weight\":\"500\",\"size\":18,\"color\":\"#666666\"},\"minMaxFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#666666\"},\"neonGlowBrightness\":0,\"decimals\":0,\"dashThickness\":0,\"gaugeColor\":\"#eeeeee\",\"showTitle\":true,\"gaugeType\":\"horizontalBar\"},\"title\":\"Horizontal bar - justGage\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'Horizontal bar - justGage' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( '10500a0a-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', + 'gauge_justgage', + '{"type":"latest","sizeX":4,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#999999\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Roboto\",\"style\":\"normal\",\"weight\":\"500\",\"size\":36,\"color\":\"#666666\"},\"minMaxFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#666666\"},\"neonGlowBrightness\":0,\"decimals\":0,\"dashThickness\":0,\"gaugeColor\":\"#eeeeee\",\"showTitle\":true,\"gaugeType\":\"arc\"},\"title\":\"Gauge - justGage\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'Gauge - justGage' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( '13820124-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', 'lcd_gauge', + '{"type":"latest","sizeX":5,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Speed\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 180) {\\n\\tvalue = 180;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#babab2\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":180,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\"linear\",\"refreshAnimationTime\":700,\"startAnimationType\":\"linear\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":32},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"neonGlowBrightness\":0,\"dashThickness\":1.5,\"decimals\":0,\"unitTitle\":\"MPH\",\"showUnitTitle\":true,\"defaultColor\":\"#444444\",\"gaugeType\":\"arc\"},\"title\":\"LCD gauge\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'LCD gauge' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( '166c022c-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'maps', 'openstreetmap', + '{"type":"latest","sizeX":8.5,"sizeY":6,"resources":[],"templateHtml":"","templateCss":".leaflet-zoom-box {\n\tz-index: 9;\n}\n\n.leaflet-pane { z-index: 4; }\n\n.leaflet-tile-pane { z-index: 2; }\n.leaflet-overlay-pane { z-index: 4; }\n.leaflet-shadow-pane { z-index: 5; }\n.leaflet-marker-pane { z-index: 6; }\n.leaflet-tooltip-pane { z-index: 7; }\n.leaflet-popup-pane { z-index: 8; }\n\n.leaflet-map-pane canvas { z-index: 1; }\n.leaflet-map-pane svg { z-index: 2; }\n\n.leaflet-control {\n\tz-index: 9;\n}\n.leaflet-top,\n.leaflet-bottom {\n\tz-index: 11;\n}\n\n.tb-marker-label {\n border: none;\n background: none;\n box-shadow: none;\n}\n\n.tb-marker-label:before {\n border: none;\n background: none;\n}\n","controllerScript":"self.onInit = function() {\n self.ctx.map = new TbMapWidget(''openstreet-map'', false, self.ctx);\n}\n\nself.onDataUpdated = function() {\n self.ctx.map.update();\n}\n\nself.onResize = function() {\n self.ctx.map.resize();\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"title\": \"Google Map Configuration\",\n \"type\": \"object\",\n \"properties\": {\n \"defaultZoomLevel\": {\n \"title\": \"Default map zoom level (1 - 20)\",\n \"type\": \"number\"\n },\n \"fitMapBounds\": {\n \"title\": \"Fit map bounds to cover all markers\",\n \"type\": \"boolean\",\n \"default\": true\n },\n \"markersSettings\": {\n \"title\": \"Markers\",\n \"type\": \"array\",\n \"items\": {\n \"title\": \"Marker settings\",\n \"type\": \"object\",\n \"properties\": {\n \"latKeyName\": {\n \"title\": \"Latitude key name\",\n \"type\": \"string\",\n \"default\": \"lat\"\n },\n \"lngKeyName\": {\n \"title\": \"Longitude key name\",\n \"type\": \"string\",\n \"default\": \"lng\"\n }, \n \"showLabel\": {\n \"title\": \"Show label\",\n \"type\": \"boolean\",\n \"default\": true\n }, \n \"label\": {\n \"title\": \"Label\",\n \"type\": \"string\"\n },\n \"tooltipPattern\": {\n \"title\": \"Pattern ( for ex. ''Text ${keyName} units.'' or ''${#} units'' )\",\n \"type\": \"string\",\n \"default\": \"Latitude: ${lat:7}
Longitude: ${lng:7}\"\n },\n \"color\": {\n \"title\": \"Color\",\n \"type\": \"string\"\n },\n \"useColorFunction\": {\n \"title\": \"Use color function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"colorFunction\": {\n \"title\": \"Color function: f(data)\",\n \"type\": \"string\"\n },\n \"markerImage\": {\n \"title\": \"Custom marker image\",\n \"type\": \"string\"\n },\n \"markerImageSize\": {\n \"title\": \"Custom marker image size (px)\",\n \"type\": \"number\",\n \"default\": 34\n },\n \"useMarkerImageFunction\": {\n \"title\": \"Use marker image function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"markerImageFunction\": {\n \"title\": \"Marker image function: f(data, images)\",\n \"type\": \"string\"\n },\n \"markerImages\": {\n \"title\": \"Marker images\",\n \"type\": \"array\",\n \"items\": {\n \"title\": \"Marker image\",\n \"type\": \"string\"\n }\n }\n }\n }\n }\n },\n \"required\": [\n ]\n },\n \"form\": [\n \"defaultZoomLevel\",\n \"fitMapBounds\",\n {\n \"key\": \"markersSettings\",\n \"items\": [\n \"markersSettings[].latKeyName\",\n \"markersSettings[].lngKeyName\",\n \"markersSettings[].showLabel\",\n \"markersSettings[].label\",\n \"markersSettings[].tooltipPattern\",\n {\n \"key\": \"markersSettings[].color\",\n \"type\": \"color\"\n },\n \"markersSettings[].useColorFunction\",\n {\n \"key\": \"markersSettings[].colorFunction\",\n \"type\": \"javascript\"\n },\n {\n \"key\": \"markersSettings[].markerImage\",\n \"type\": \"image\"\n },\n \"markersSettings[].markerImageSize\",\n \"markersSettings[].useMarkerImageFunction\",\n {\n \"key\": \"markersSettings[].markerImageFunction\",\n \"type\": \"javascript\"\n },\n {\n \"key\": \"markersSettings[].markerImages\",\n \"items\": [\n {\n \"key\": \"markersSettings[].markerImages[]\",\n \"type\": \"image\"\n }\n ]\n }\n ]\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"latitude\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.05427416942713381,\"funcBody\":\"var value = prevValue || 15.833293;\\nif (time % 5000 < 500) {\\n value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"longitude\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.680594833308841,\"funcBody\":\"var value = prevValue || -90.454350;\\nif (time % 5000 < 500) {\\n value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"}]},{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"lat\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.05012157428742059,\"funcBody\":\"var value = prevValue || 14.450463;\\nif (time % 4000 < 500) {\\n value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"lng\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.6742359401617628,\"funcBody\":\"var value = prevValue || -84.845334;\\nif (time % 4000 < 500) {\\n value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"}]},{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"temperature\",\"color\":\"#607d8b\",\"settings\":{},\"_hash\":0.21553274887887564,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"markersSettings\":[{\"label\":\"First point\",\"color\":\"#1e88e5\",\"latKeyName\":\"latitude\",\"lngKeyName\":\"longitude\",\"showLabel\":true,\"tooltipPattern\":\"Latitude: ${latitude:7}
Longitude: ${longitude:7}
Temperature: ${temperature} °C
See advanced settings for details\",\"useColorFunction\":true,\"colorFunction\":\"var temperature = data[''temperature''];\\nif (typeof temperature !== undefined) {\\n var percent = (temperature + 60)/120 * 100;\\n return tinycolor.mix(''blue'', ''red'', amount = percent).toHexString();\\n}\\nreturn ''blue'';\"},{\"label\":\"Second point\",\"color\":\"#fdd835\",\"latKeyName\":\"lat\",\"lngKeyName\":\"lng\",\"showLabel\":true,\"tooltipPattern\":\"Latitude: ${lat:7}
Longitude: ${lng:7}
Temperature: ${temperature} °C
See advanced settings for details\",\"markerImageSize\":34,\"useMarkerImageFunction\":true,\"markerImages\":[\"data:image/svg+xml;base64,<svg id="svg6934" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="210.87mm" width="49.966mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 177.04375 747.16249" xmlns:dc="http://purl.org/dc/elements/1.1/">
 <defs id="defs6936">
  <linearGradient id="linearGradient4707" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 -717.77 -717.77 0 708.18 2168)">
   <stop id="stop4709" stop-color="#84d7f5" offset="0"/>
   <stop id="stop4711" stop-color="#6a99cd" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient4689" gradientUnits="userSpaceOnUse" gradientTransform="matrix(456.22 0 0 -456.22 480.07 3494.3)">
   <stop id="stop4691" stop-color="#cac9c8" offset="0"/>
   <stop id="stop4693" stop-color="#f6f6f6" offset=".75269"/>
   <stop id="stop4695" stop-color="#d4d3d2" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient4669" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1345.5 0 0 -1345.5 35.427 3065.9)">
   <stop id="stop4671" stop-color="#b3b3b2" offset="0"/>
   <stop id="stop4673" stop-color="#b3b3b2" offset=".1"/>
   <stop id="stop4675" stop-color="#feffff" offset=".24731"/>
   <stop id="stop4677" stop-color="#a3a3a1" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient4591" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 -717.77 -717.77 0 708.18 2168)">
   <stop id="stop4593" stop-color="#5fc7f3" offset="0"/>
   <stop id="stop4595" stop-color="#2752a6" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient4573" gradientUnits="userSpaceOnUse" gradientTransform="matrix(456.22 0 0 -456.22 480.07 3494.3)">
   <stop id="stop4575" stop-color="#a3a3a1" offset="0"/>
   <stop id="stop4577" stop-color="#ececec" offset=".75269"/>
   <stop id="stop4579" stop-color="#b3b3b2" offset="1"/>
  </linearGradient>
  <clipPath id="clipPath6097-3" clipPathUnits="userSpaceOnUse">
   <path id="path6099-1" clip-rule="evenodd" d="m382.32 190.03c0 48.239 145.89 87.391 325.89 87.391 179.91 0 325.8-39.152 325.8-87.391 0-48.332-145.89-87.48-325.8-87.48-180 0-325.89 39.148-325.89 87.48"/>
  </clipPath>
  <clipPath id="clipPath4703-4" clipPathUnits="userSpaceOnUse">
   <path id="path4705-9" d="m585.29 1531.7c-30.465 0-55.16 24.69-55.16 55.16v528.52c28.437 31.18 66.992 53.01 110.32 60.14v-588.66c0-30.47-24.695-55.16-55.16-55.16"/>
  </clipPath>
  <clipPath id="clipPath4685-6" clipPathUnits="userSpaceOnUse">
   <path id="path4687-8" d="m530.13 2115.4v3574.2c0 30.46 24.695 55.16 55.16 55.16s55.16-24.7 55.16-55.16v-3514c-43.328-7.13-81.883-28.96-110.32-60.14"/>
  </clipPath>
  <clipPath id="clipPath4665-6" clipPathUnits="userSpaceOnUse">
   <path id="path4667-4" d="m744.9 5941.9h-73.442c-154.37 0-279.96-125.59-279.96-279.96v-4205.5c-218.11-116.2-356.07-343.2-356.07-593.65-0.004-370.96 301.79-672.75 672.75-672.75 370.95 0 672.74 301.79 672.74 672.75 0 250.48-137.96 477.48-356.07 593.7v4205.5c0 154.37-125.59 279.96-279.96 279.96m0-88.58c105.26 0 191.39-86.12 191.39-191.38v-4261.2c209.29-88.85 356.07-296.25 356.07-537.94 0-322.63-261.54-584.18-584.17-584.18s-584.18 261.55-584.18 584.18c0 241.69 146.79 449.09 356.07 537.94v4261.2c0 105.26 86.125 191.38 191.39 191.38h73.442"/>
  </clipPath>
  <clipPath id="clipPath4651-8" clipPathUnits="userSpaceOnUse">
   <path id="path4653-7" d="m708.18 955.89c-135.48 0-252.59 49.869-308.14 122.24-22.008 28.67-34.359 60.88-34.359 94.91 0 119.92 153.34 217.14 342.5 217.14 164.4 0 301.74-73.44 334.88-171.39 4.98-14.75 7.61-30.06 7.61-45.75 0-53.92-30.99-103.24-82.295-141.21-62.812-46.478-156.09-75.939-260.2-75.939"/>
  </clipPath>
  <clipPath id="clipPath4635-1" clipPathUnits="userSpaceOnUse">
   <path id="path4637-7" d="m968.38 1031.8c51.305 37.97 82.295 87.29 82.295 141.21v-0.72c-0.28-53.63-31.21-102.69-82.295-140.49m-568.34 46.3c-22.008 28.67-34.359 60.88-34.359 94.91 0-34.03 12.351-66.24 34.359-94.91m650.63 94.91c0 15.69-2.63 31-7.61 45.75 4.91-14.53 7.53-29.6 7.61-45.04v-0.71"/>
  </clipPath>
  <radialGradient id="radialGradient4639-2" gradientUnits="userSpaceOnUse" cy="0" cx="0" gradientTransform="matrix(584.18 0 0 -584.18 708.18 862.75)" r="1">
   <stop id="stop4641-7" stop-color="#5fc7f3" offset="0"/>
   <stop id="stop4643-2" stop-color="#2752a6" offset="1"/>
  </radialGradient>
  <clipPath id="clipPath4619-2" clipPathUnits="userSpaceOnUse">
   <path id="path4621-6" d="m1050.7 1172.3v0.72 0.71-0.71-0.72"/>
  </clipPath>
  <clipPath id="clipPath4603-1" clipPathUnits="userSpaceOnUse">
   <path id="path4605-5" d="m1292.4 862.75c0-322.64-261.54-584.18-584.17-584.18s-584.18 261.54-584.18 584.18c0 322.63 261.55 584.18 584.18 584.18s584.17-261.55 584.17-584.18"/>
  </clipPath>
  <clipPath id="clipPath4587-0" clipPathUnits="userSpaceOnUse">
   <path id="path4589-9" d="m480.07 1400.7v585.95c0 49.45 19 94.67 50.067 128.72v-528.52c0-30.47 24.695-55.16 55.16-55.16s55.16 24.69 55.16 55.16v588.66c10.098 1.67 20.453 2.53 31.004 2.53h73.438c105.26 0 191.39-86.12 191.39-191.39v-585.93c-70.082 29.76-147.17 46.22-228.1 46.22-80.934 0-158.03-16.46-228.11-46.22"/>
  </clipPath>
  <clipPath id="clipPath4569-7" clipPathUnits="userSpaceOnUse">
   <path id="path4571-1" d="m936.28 1986.6c0 105.27-86.121 191.39-191.39 191.39h-73.438c-10.551 0-20.906-0.86-31.004-2.53v3514c0 30.46-24.695 55.16-55.16 55.16s-55.16-24.7-55.16-55.16v-3574.2c-31.067-34.05-50.067-79.27-50.067-128.72v3675.3c0 13.46 1.411 26.62 4.09 39.31 18.262 86.57 95.504 152.07 187.3 152.07h73.438c105.26 0 191.39-86.12 191.39-191.38v-3675.3"/>
  </clipPath>
 </defs>
 <g id="layer1" transform="translate(-362.76 -188.84)">
  <g fill="#fff">
   <path id="path4183" d="m451.28 936c-48.889 0-88.522-10.632-88.522-23.75 0-7.0864 11.571-13.449 29.918-17.8 0.0356 0.0298 0.0674 0.0585 0.1025 0.0897-18.22 4.335-29.7 10.663-29.7 17.71 0 13.069 39.489 23.664 88.201 23.664s88.2-10.595 88.2-23.664c0-7.0474-11.48-13.375-29.7-17.71 0.035-0.0312 0.0675-0.06 0.1025-0.0897 18.348 4.351 29.919 10.713 29.919 17.8 0 13.118-39.632 23.75-88.522 23.75"/>
   <path id="path4185" d="m451.28 935.92c-48.712 0-88.201-10.595-88.201-23.664 0-7.0474 11.48-13.375 29.7-17.71 0.0333 0.0289 0.0699 0.0611 0.103 0.0914-18.089 4.3174-29.482 10.611-29.482 17.619 0 13.021 39.345 23.578 87.88 23.578 48.536 0 87.88-10.557 87.88-23.578 0-7.0074-11.394-13.301-29.482-17.619 0.0325-0.0302 0.07-0.0625 0.1025-0.0914 18.22 4.335 29.7 10.663 29.7 17.71 0 13.069-39.489 23.664-88.2 23.664"/>
   <path id="path4187" d="m451.28 935.83c-48.535 0-87.88-10.557-87.88-23.578 0-7.0074 11.393-13.301 29.482-17.619 0.0351 0.0297 0.0679 0.0586 0.103 0.0899-17.959 4.3026-29.265 10.562-29.265 17.529 0 12.974 39.202 23.491 87.56 23.491s87.559-10.518 87.559-23.491c0-6.9672-11.305-13.226-29.265-17.529 0.0362-0.0312 0.0675-0.0601 0.10375-0.0899 18.089 4.3174 29.482 10.611 29.482 17.619 0 13.021-39.345 23.578-87.88 23.578"/>
   <path id="path4189" d="m451.28 935.74c-48.358 0-87.56-10.518-87.56-23.491 0-6.9672 11.306-13.226 29.265-17.529 0.0337 0.0288 0.0704 0.061 0.10362 0.0897-17.83 4.2867-29.047 10.511-29.047 17.439 0 12.926 39.058 23.406 87.239 23.406 48.18 0 87.239-10.48 87.239-23.406 0-6.9278-11.219-13.152-29.049-17.439 0.0337-0.0287 0.0712-0.061 0.10375-0.0897 17.96 4.3026 29.265 10.562 29.265 17.529 0 12.974-39.201 23.491-87.559 23.491"/>
   <path id="path4191" d="m451.28 935.66c-48.181 0-87.239-10.48-87.239-23.406 0-6.9278 11.218-13.152 29.047-17.439 0.0356 0.0312 0.0683 0.0601 0.104 0.0914-17.701 4.269-28.831 10.459-28.831 17.348 0 12.879 38.914 23.32 86.918 23.32 48.003 0 86.918-10.441 86.918-23.32 0-6.8886-11.13-13.079-28.831-17.348 0.0363-0.0312 0.0688-0.0601 0.10375-0.0914 17.83 4.2866 29.049 10.511 29.049 17.439 0 12.926-39.059 23.406-87.239 23.406"/>
   <path id="path4193" d="m451.28 935.57c-48.004 0-86.918-10.441-86.918-23.32 0-6.8886 11.129-13.079 28.831-17.348 0.0356 0.0312 0.0688 0.06 0.104 0.0902-17.569 4.2526-28.614 10.41-28.614 17.257 0 12.831 38.771 23.234 86.597 23.234 47.827 0 86.597-10.403 86.597-23.234 0-6.8476-11.045-13.005-28.614-17.257 0.035-0.0303 0.0687-0.059 0.10375-0.0902 17.701 4.269 28.831 10.459 28.831 17.348 0 12.879-38.915 23.32-86.918 23.32"/>
   <path id="path4195" d="m451.28 935.49c-47.827 0-86.597-10.403-86.597-23.234 0-6.8476 11.045-13.005 28.614-17.257 0.0336 0.0299 0.0712 0.0625 0.1045 0.0914-17.441 4.2349-28.398 10.357-28.398 17.166 0 12.784 38.627 23.147 86.277 23.147 47.649 0 86.277-10.364 86.277-23.147 0-6.8086-10.958-12.931-28.399-17.166 0.0337-0.0289 0.0712-0.0615 0.105-0.0914 17.569 4.2525 28.614 10.41 28.614 17.257 0 12.831-38.77 23.234-86.597 23.234"/>
   <path id="path4197" d="m451.28 935.4c-47.65 0-86.277-10.364-86.277-23.147 0-6.8086 10.957-12.931 28.398-17.166 0.0356 0.0308 0.0693 0.0595 0.10488 0.0908-17.31 4.2187-28.182 10.307-28.182 17.075 0 12.736 38.484 23.061 85.956 23.061s85.956-10.325 85.956-23.061c0-6.7685-10.871-12.856-28.181-17.075 0.035-0.0312 0.0688-0.06 0.10375-0.0908 17.441 4.2349 28.399 10.357 28.399 17.166 0 12.784-38.628 23.147-86.277 23.147"/>
   <path id="path4199" d="m451.28 935.31c-47.472 0-85.956-10.325-85.956-23.061 0-6.7685 10.872-12.856 28.182-17.075 0.0357 0.0304 0.0699 0.0601 0.1055 0.0904-17.184 4.2021-27.967 10.256-27.967 16.985 0 12.688 38.34 22.976 85.635 22.976 47.294 0 85.636-10.288 85.636-22.976 0-6.729-10.784-12.783-27.968-16.985 0.0362-0.0303 0.07-0.06 0.10625-0.0904 17.31 4.2188 28.181 10.307 28.181 17.075 0 12.736-38.484 23.061-85.956 23.061"/>
   <path id="path4201" d="m451.28 935.23c-47.295 0-85.635-10.288-85.635-22.976 0-6.729 10.783-12.783 27.967-16.985 0.0338 0.0289 0.0718 0.0625 0.1055 0.0914-17.054 4.1845-27.751 10.204-27.751 16.894 0 12.641 38.196 22.89 85.314 22.89s85.314-10.249 85.314-22.89c0-6.689-10.698-12.709-27.751-16.894 0.0337-0.0289 0.0712-0.0625 0.105-0.0914 17.184 4.2021 27.968 10.256 27.968 16.985 0 12.688-38.341 22.976-85.636 22.976"/>
   <path id="path4203" d="m451.28 935.14c-47.118 0-85.314-10.249-85.314-22.89 0-6.689 10.697-12.709 27.751-16.894 0.0356 0.0298 0.0697 0.0595 0.106 0.0897-16.925 4.169-27.537 10.154-27.537 16.804 0 12.594 38.053 22.804 84.994 22.804 46.94 0 84.993-10.21 84.993-22.804 0-6.6499-10.611-12.635-27.536-16.804 0.0362-0.0303 0.07-0.06 0.10625-0.0897 17.054 4.1845 27.751 10.204 27.751 16.894 0 12.641-38.196 22.89-85.314 22.89"/>
   <path id="path4205" d="m451.28 935.06c-46.94 0-84.994-10.21-84.994-22.804 0-6.6499 10.611-12.635 27.537-16.804 0.0356 0.0312 0.0703 0.0601 0.10587 0.0914-16.796 4.1514-27.322 10.102-27.322 16.712 0 12.546 37.909 22.717 84.673 22.717 46.763 0 84.673-10.171 84.673-22.717 0-6.6099-10.526-12.561-27.322-16.712 0.0362-0.0312 0.0712-0.0601 0.10625-0.0914 16.925 4.169 27.536 10.154 27.536 16.804 0 12.594-38.052 22.804-84.993 22.804"/>
   <path id="path4207" d="m451.28 934.97c-46.764 0-84.673-10.171-84.673-22.717 0-6.6099 10.525-12.561 27.322-16.712 0.0361 0.0297 0.0709 0.06 0.107 0.0899-16.669 4.1352-27.108 10.053-27.108 16.622 0 12.499 37.766 22.631 84.352 22.631 46.587 0 84.352-10.133 84.352-22.631 0-6.5699-10.439-12.487-27.108-16.622 0.0362-0.0299 0.0712-0.0601 0.10625-0.0899 16.796 4.1514 27.322 10.102 27.322 16.712 0 12.546-37.91 22.717-84.673 22.717"/>
   <path id="path4209" d="m451.28 934.88c-46.586 0-84.352-10.133-84.352-22.631 0-6.5699 10.439-12.487 27.108-16.622 0.0356 0.0312 0.0708 0.0615 0.10638 0.0913-16.541 4.1176-26.894 10-26.894 16.531 0 12.451 37.622 22.545 84.031 22.545s84.03-10.094 84.03-22.545c0-6.5312-10.352-12.414-26.894-16.531 0.0362-0.0298 0.0712-0.06 0.1075-0.0913 16.669 4.1352 27.108 10.053 27.108 16.622 0 12.499-37.765 22.631-84.352 22.631"/>
   <path id="path4211" d="m451.28 934.8c-46.409 0-84.031-10.094-84.031-22.545 0-6.5312 10.353-12.414 26.894-16.531 0.0361 0.0297 0.0718 0.06 0.1075 0.0899-16.414 4.1015-26.68 9.9501-26.68 16.441 0 12.404 37.478 22.459 83.71 22.459s83.71-10.055 83.71-22.459c0-6.4912-10.266-12.34-26.68-16.441 0.035-0.0299 0.0712-0.0601 0.10625-0.0899 16.541 4.1176 26.894 10 26.894 16.531 0 12.451-37.621 22.545-84.03 22.545"/>
   <path id="path4213" d="m451.28 934.71c-46.232 0-83.71-10.055-83.71-22.459 0-6.4912 10.266-12.34 26.68-16.441 0.0361 0.0312 0.0718 0.0615 0.10787 0.0912-16.288 4.084-26.467 9.8975-26.467 16.35 0 12.356 37.335 22.373 83.39 22.373 46.054 0 83.389-10.016 83.389-22.373 0-6.4526-10.179-12.266-26.468-16.35 0.0362-0.0297 0.0725-0.06 0.10875-0.0912 16.414 4.1015 26.68 9.9501 26.68 16.441 0 12.404-37.479 22.459-83.71 22.459"/>
   <path id="path4215" d="m451.28 934.62c-46.055 0-83.39-10.016-83.39-22.373 0-6.4526 10.179-12.266 26.467-16.35 0.0361 0.0303 0.0718 0.0601 0.10788 0.0914-16.159 4.0664-26.254 9.8461-26.254 16.259 0 12.309 37.191 22.288 83.069 22.288s83.069-9.979 83.069-22.288c0-6.4126-10.096-12.192-26.255-16.259 0.0362-0.0312 0.0725-0.0611 0.1075-0.0914 16.289 4.084 26.468 9.8975 26.468 16.35 0 12.356-37.335 22.373-83.389 22.373"/>
   <path id="path4217" d="m451.28 934.54c-45.878 0-83.069-9.979-83.069-22.288 0-6.4126 10.095-12.192 26.254-16.259 0.0361 0.0303 0.0722 0.06 0.10837 0.0898-16.031 4.0489-26.042 9.7965-26.042 16.169 0 12.261 37.047 22.201 82.748 22.201 45.7 0 82.748-9.94 82.748-22.201 0-6.3725-10.011-12.12-26.042-16.169 0.0362-0.0298 0.0725-0.0595 0.10875-0.0898 16.159 4.0664 26.255 9.8461 26.255 16.259 0 12.309-37.191 22.288-83.069 22.288"/>
   <path id="path4219" d="m451.28 934.45c-45.701 0-82.748-9.94-82.748-22.201 0-6.3725 10.011-12.12 26.042-16.169 0.0361 0.0304 0.0727 0.0616 0.10888 0.0914-15.906 4.0312-25.83 9.7441-25.83 16.078 0 12.214 36.904 22.115 82.427 22.115s82.427-9.9009 82.427-22.115c0-6.3335-9.9238-12.046-25.83-16.078 0.0362-0.0298 0.0725-0.061 0.10875-0.0914 16.031 4.0489 26.042 9.7965 26.042 16.169 0 12.261-37.048 22.201-82.748 22.201"/>
   <path id="path4221" d="m451.28 934.37c-45.524 0-82.427-9.9009-82.427-22.115 0-6.3335 9.9238-12.046 25.83-16.078 0.0362 0.0303 0.0727 0.0615 0.109 0.0913-15.779 4.0138-25.618 9.6915-25.618 15.986 0 12.166 36.76 22.029 82.106 22.029s82.107-9.8628 82.107-22.029c0-6.2949-9.84-11.973-25.619-15.986 0.0362-0.0297 0.0725-0.061 0.10875-0.0913 15.906 4.0312 25.83 9.7441 25.83 16.078 0 12.214-36.904 22.115-82.427 22.115"/>
   <path id="path4223" d="m451.28 934.28c-45.346 0-82.106-9.8628-82.106-22.029 0-6.2949 9.8394-11.973 25.618-15.986 0.0361 0.0304 0.0731 0.0601 0.10937 0.0899-15.652 3.9976-25.407 9.6416-25.407 15.896 0 12.119 36.617 21.942 81.786 21.942s81.786-9.8237 81.786-21.942c0-6.2549-9.755-11.899-25.406-15.896 0.0362-0.0297 0.0725-0.0595 0.10875-0.0899 15.779 4.0138 25.619 9.6915 25.619 15.986 0 12.166-36.761 22.029-82.107 22.029"/>
   <path id="path4225" d="m451.28 934.19c-45.17 0-81.786-9.8237-81.786-21.942 0-6.2549 9.7549-11.899 25.407-15.896 0.0361 0.0303 0.0736 0.0615 0.10975 0.0914-15.526 3.9799-25.196 9.5889-25.196 15.805 0 12.071 36.473 21.856 81.465 21.856s81.466-9.7852 81.466-21.856c0-6.2162-9.67-11.825-25.196-15.805 0.0362-0.0299 0.0738-0.0611 0.11-0.0914 15.651 3.9976 25.406 9.6416 25.406 15.896 0 12.119-36.616 21.942-81.786 21.942"/>
   <path id="path4227" d="m451.28 934.11c-44.992 0-81.465-9.7852-81.465-21.856 0-6.2162 9.67-11.825 25.196-15.805 0.0362 0.0302 0.0738 0.0615 0.11038 0.0912-15.398 3.9614-24.986 9.5376-24.986 15.714 0 12.024 36.33 21.77 81.145 21.77 44.814 0 81.144-9.7461 81.144-21.77 0-6.1762-9.5875-11.752-24.986-15.714 0.0362-0.0297 0.075-0.061 0.11125-0.0912 15.526 3.9799 25.196 9.5889 25.196 15.805 0 12.071-36.474 21.856-81.466 21.856"/>
   <path id="path4229" d="m451.28 934.02c-44.815 0-81.145-9.7461-81.145-21.77 0-6.1762 9.5879-11.752 24.986-15.714 0.0361 0.0289 0.0742 0.0601 0.11037 0.0904-15.273 3.9448-24.775 9.4858-24.775 15.624 0 11.976 36.186 21.685 80.824 21.685s80.823-9.709 80.823-21.685c0-6.1378-9.5025-11.679-24.775-15.624 0.0362-0.0303 0.0738-0.0615 0.11-0.0904 15.399 3.9614 24.986 9.5376 24.986 15.714 0 12.024-36.33 21.77-81.144 21.77"/>
  </g>
  <g>
   <path id="path4231" d="m451.28 933.94c-44.638 0-80.824-9.709-80.824-21.685 0-6.1378 9.5024-11.679 24.775-15.624 0.0386 0.0308 0.0722 0.0595 0.11138 0.0907-15.146 3.9278-24.566 9.4351-24.566 15.533 0 11.929 36.042 21.599 80.503 21.599 44.46 0 80.503-9.6699 80.503-21.599 0-6.0976-9.42-11.605-24.566-15.533 0.0387-0.0312 0.0725-0.06 0.11125-0.0907 15.272 3.9448 24.775 9.4858 24.775 15.624 0 11.976-36.185 21.685-80.823 21.685" fill="#feffff"/>
   <path id="path4233" d="m451.28 933.85c-44.46 0-80.503-9.6699-80.503-21.599 0-6.0976 9.42-11.605 24.566-15.533 0.0361 0.0303 0.0746 0.0615 0.11125 0.0914-15.022 3.9086-24.356 9.3828-24.356 15.441 0 11.881 35.898 21.513 80.182 21.513 44.283 0 80.182-9.6314 80.182-21.513 0-6.0586-9.3338-11.533-24.356-15.441 0.0362-0.0299 0.075-0.0611 0.11125-0.0914 15.146 3.9278 24.566 9.4351 24.566 15.533 0 11.929-36.042 21.599-80.503 21.599" fill="#feffff"/>
   <path id="path4235" d="m451.28 933.77c-44.284 0-80.182-9.6314-80.182-21.513 0-6.0586 9.3345-11.533 24.356-15.441 0.0366 0.0287 0.0752 0.0615 0.11187 0.0902-14.896 3.8921-24.147 9.3326-24.147 15.351 0 11.834 35.755 21.426 79.861 21.426s79.86-9.5923 79.86-21.426c0-6.0185-9.2512-11.459-24.146-15.351 0.0362-0.0287 0.075-0.0615 0.11125-0.0902 15.022 3.9086 24.356 9.3828 24.356 15.441 0 11.881-35.899 21.513-80.182 21.513" fill="#fefeff"/>
   <path id="path4237" d="m451.28 933.68c-44.106 0-79.861-9.5923-79.861-21.426 0-6.0185 9.2515-11.459 24.147-15.351 0.0385 0.0312 0.0732 0.0601 0.11175 0.0909-14.77 3.8755-23.938 9.2802-23.938 15.26 0 11.786 35.611 21.34 79.541 21.34 43.929 0 79.54-9.5537 79.54-21.34 0-5.98-9.1688-11.385-23.939-15.26 0.0387-0.0308 0.0737-0.0596 0.1125-0.0909 14.895 3.8921 24.146 9.3326 24.146 15.351 0 11.834-35.755 21.426-79.86 21.426" fill="#fefefe"/>
   <path id="path4239" d="m451.28 933.59c-43.929 0-79.541-9.5537-79.541-21.34 0-5.98 9.1679-11.385 23.938-15.26 0.0366 0.0303 0.0763 0.0615 0.11288 0.0913-14.646 3.8565-23.73 9.2276-23.73 15.169 0 11.739 35.468 21.255 79.22 21.255s79.219-9.5161 79.219-21.255c0-5.9414-9.085-11.312-23.73-15.169 0.0363-0.0298 0.0763-0.061 0.1125-0.0913 14.77 3.8755 23.939 9.2802 23.939 15.26 0 11.786-35.611 21.34-79.54 21.34" fill="#fefefe"/>
   <path id="path4241" d="m451.28 933.51c-43.752 0-79.22-9.5161-79.22-21.255 0-5.9414 9.0845-11.312 23.73-15.169 0.0385 0.0312 0.0738 0.0591 0.11275 0.0904-14.522 3.8399-23.522 9.1772-23.522 15.079 0 11.691 35.324 21.169 78.899 21.169 43.574 0 78.899-9.4776 78.899-21.169 0-5.9014-9.0012-11.239-23.522-15.079 0.0387-0.0312 0.0737-0.0591 0.1125-0.0904 14.645 3.8565 23.73 9.2276 23.73 15.169 0 11.739-35.468 21.255-79.219 21.255" fill="#fdfefe"/>
   <path id="path4243" d="m451.28 933.42c-43.575 0-78.899-9.4776-78.899-21.169 0-5.9014 9.001-11.239 23.522-15.079 0.0366 0.0297 0.0761 0.0625 0.11325 0.0914-14.395 3.8208-23.315 9.125-23.315 14.987 0 11.644 35.181 21.083 78.579 21.083s78.578-9.439 78.578-21.083c0-5.8622-8.92-11.166-23.315-14.987 0.0375-0.0289 0.0763-0.0616 0.11375-0.0914 14.521 3.8399 23.522 9.1772 23.522 15.079 0 11.691-35.325 21.169-78.899 21.169" fill="#fdfefe"/>
   <path id="path4245" d="m451.28 933.33c-43.398 0-78.579-9.439-78.579-21.083 0-5.8622 8.9204-11.166 23.315-14.987 0.0386 0.0312 0.0743 0.06 0.11337 0.0907-14.272 3.8042-23.107 9.0728-23.107 14.896 0 11.596 35.037 20.996 78.257 20.996s78.257-9.3999 78.257-20.996c0-5.8238-8.835-11.092-23.108-14.896 0.0388-0.0308 0.075-0.0595 0.11375-0.0907 14.395 3.8208 23.315 9.125 23.315 14.987 0 11.644-35.18 21.083-78.578 21.083" fill="#fdfdfe"/>
   <path id="path4247" d="m451.28 933.25c-43.221 0-78.257-9.3999-78.257-20.996 0-5.8238 8.836-11.092 23.107-14.896 0.037 0.0289 0.0776 0.0615 0.11425 0.0914-14.146 3.7851-22.901 9.0214-22.901 14.805 0 11.549 34.893 20.91 77.937 20.91 43.043 0 77.937-9.3613 77.937-20.91 0-5.7838-8.755-11.02-22.901-14.805 0.0362-0.0299 0.0775-0.0625 0.11375-0.0914 14.272 3.8042 23.108 9.0728 23.108 14.896 0 11.596-35.036 20.996-78.257 20.996" fill="#fdfdfd"/>
   <path id="path4249" d="m451.28 933.16c-43.044 0-77.937-9.3613-77.937-20.91 0-5.7838 8.7549-11.02 22.901-14.805 0.039 0.0312 0.0751 0.06 0.11475 0.0902-14.025 3.7686-22.695 8.9697-22.695 14.715 0 11.501 34.75 20.824 77.616 20.824s77.616-9.3223 77.616-20.824c0-5.7451-8.67-10.946-22.695-14.715 0.04-0.0303 0.0763-0.059 0.115-0.0902 14.146 3.7851 22.901 9.0214 22.901 14.805 0 11.549-34.894 20.91-77.937 20.91" fill="#fdfdfd"/>
   <path id="path4251" d="m451.28 933.08c-42.866 0-77.616-9.3223-77.616-20.824 0-5.7451 8.6704-10.946 22.695-14.715 0.0366 0.0299 0.0776 0.0625 0.11475 0.0914-13.9 3.75-22.489 8.9175-22.489 14.624 0 11.454 34.606 20.737 77.295 20.737s77.296-9.2837 77.296-20.737c0-5.706-8.5888-10.874-22.49-14.624 0.0375-0.0289 0.0788-0.0615 0.115-0.0914 14.025 3.7686 22.695 8.9697 22.695 14.715 0 11.501-34.75 20.824-77.616 20.824" fill="#fcfdfd"/>
   <path id="path4253" d="m451.28 932.99c-42.689 0-77.295-9.2837-77.295-20.737 0-5.706 8.5888-10.874 22.489-14.624 0.039 0.0312 0.0761 0.0595 0.11513 0.0907-13.777 3.7315-22.283 8.8652-22.283 14.533 0 11.406 34.462 20.652 76.974 20.652s76.974-9.2461 76.974-20.652c0-5.6675-8.5062-10.801-22.284-14.533 0.0387-0.0312 0.0762-0.0595 0.115-0.0907 13.901 3.75 22.49 8.9175 22.49 14.624 0 11.454-34.606 20.737-77.296 20.737" fill="#fcfdfd"/>
   <path id="path4255" d="m451.28 932.9c-42.512 0-76.974-9.2461-76.974-20.652 0-5.6675 8.5064-10.801 22.283-14.533 0.0391 0.0312 0.0768 0.0601 0.11575 0.0914-13.651 3.7139-22.079 8.8139-22.079 14.441 0 11.359 34.319 20.566 76.654 20.566 42.334 0 76.653-9.2075 76.653-20.566 0-5.6275-8.4262-10.728-22.078-14.441 0.0387-0.0312 0.0763-0.0601 0.115-0.0914 13.778 3.7315 22.284 8.8652 22.284 14.533 0 11.406-34.462 20.652-76.974 20.652" fill="#fcfcfd"/>
   <path id="path4257" d="m451.28 932.82c-42.335 0-76.654-9.2075-76.654-20.566 0-5.6275 8.4272-10.728 22.079-14.441 0.0371 0.0287 0.0791 0.0625 0.11625 0.0912-13.529 3.6954-21.874 8.7612-21.874 14.35 0 11.311 34.175 20.48 76.333 20.48 42.157 0 76.333-9.1689 76.333-20.48 0-5.5889-8.345-10.655-21.874-14.35 0.0363-0.0287 0.0788-0.0625 0.11625-0.0912 13.651 3.7139 22.078 8.8139 22.078 14.441 0 11.359-34.319 20.566-76.653 20.566" fill="#fcfcfc"/>
   <path id="path4259" d="m451.28 932.73c-42.158 0-76.333-9.1689-76.333-20.48 0-5.5889 8.3448-10.655 21.874-14.35 0.039 0.0303 0.0771 0.0601 0.11625 0.0914-13.405 3.6762-21.67 8.709-21.67 14.259 0 11.264 34.032 20.394 76.012 20.394s76.012-9.1299 76.012-20.394c0-5.5498-8.265-10.582-21.669-14.259 0.0387-0.0312 0.0762-0.0611 0.11625-0.0914 13.529 3.6954 21.874 8.7612 21.874 14.35 0 11.311-34.176 20.48-76.333 20.48" fill="#fbfcfc"/>
   <path id="path4261" d="m451.28 932.65c-41.98 0-76.012-9.1299-76.012-20.394 0-5.5498 8.2646-10.582 21.67-14.259 0.0395 0.0298 0.0776 0.06 0.11712 0.0898-13.284 3.6602-21.466 8.6578-21.466 14.169 0 11.216 33.888 20.308 75.691 20.308s75.692-9.0914 75.692-20.308c0-5.5112-8.1825-10.509-21.466-14.169 0.0387-0.0298 0.0775-0.06 0.1175-0.0898 13.404 3.6762 21.669 8.709 21.669 14.259 0 11.264-34.031 20.394-76.012 20.394" fill="#fbfcfc"/>
   <path id="path4263" d="m451.28 932.56c-41.803 0-75.691-9.0914-75.691-20.308 0-5.5112 8.1821-10.509 21.466-14.169 0.0396 0.0312 0.0781 0.0616 0.11775 0.0914-13.161 3.6411-21.263 8.605-21.263 14.078 0 11.169 33.745 20.221 75.371 20.221s75.37-9.0522 75.37-20.221c0-5.4726-8.1012-10.436-21.262-14.078 0.0387-0.0298 0.0775-0.0601 0.1175-0.0914 13.284 3.6602 21.466 8.6578 21.466 14.169 0 11.216-33.889 20.308-75.692 20.308" fill="#fbfbfb"/>
   <path id="path4265" d="m451.28 932.47c-41.626 0-75.371-9.0522-75.371-20.221 0-5.4726 8.1015-10.436 21.263-14.078 0.039 0.0312 0.0781 0.0615 0.11763 0.0913-13.039 3.6226-21.06 8.5528-21.06 13.986 0 11.12 33.601 20.136 75.05 20.136s75.049-9.0161 75.049-20.136c0-5.4336-8.02-10.364-21.059-13.986 0.0388-0.0297 0.0775-0.06 0.1175-0.0913 13.161 3.6411 21.262 8.605 21.262 14.078 0 11.169-33.745 20.221-75.37 20.221" fill="#fbfbfb"/>
   <path id="path4267" d="m451.28 932.39c-41.449 0-75.05-9.0161-75.05-20.136 0-5.4336 8.021-10.364 21.06-13.986 0.039 0.0304 0.0786 0.0616 0.11812 0.0914-12.917 3.604-20.857 8.5-20.857 13.895 0 11.072 33.457 20.05 74.729 20.05s74.729-8.9776 74.729-20.05c0-5.395-7.94-10.291-20.858-13.895 0.04-0.0298 0.0787-0.061 0.11875-0.0914 13.039 3.6226 21.059 8.5528 21.059 13.986 0 11.12-33.6 20.136-75.049 20.136" fill="#fafbfb"/>
   <path id="path4269" d="m451.28 932.3c-41.272 0-74.729-8.9776-74.729-20.05 0-5.395 7.9399-10.291 20.857-13.895 0.0396 0.0297 0.0791 0.0615 0.11863 0.0912-12.793 3.585-20.655 8.4488-20.655 13.804 0 11.025 33.314 19.964 74.408 19.964s74.408-8.939 74.408-19.964c0-5.3565-7.8588-10.219-20.655-13.804 0.04-0.0298 0.0787-0.0615 0.11875-0.0912 12.918 3.604 20.858 8.5 20.858 13.895 0 11.072-33.458 20.05-74.729 20.05" fill="#fafbfb"/>
   <path id="path4271" d="m451.28 932.22c-41.095 0-74.408-8.939-74.408-19.964 0-5.355 7.8619-10.219 20.655-13.804 0.0396 0.0299 0.0791 0.0611 0.11925 0.0914-12.673 3.5659-20.453 8.396-20.453 13.712 0 10.978 33.17 19.877 74.087 19.877s74.088-8.8999 74.088-19.877c0-5.3164-7.7812-10.146-20.454-13.712 0.04-0.0302 0.08-0.0615 0.11875-0.0914 12.796 3.585 20.655 8.4472 20.655 13.804 0 11.025-33.314 19.964-74.408 19.964" fill="#fafafa"/>
   <path id="path4273" d="m451.28 932.13c-40.918 0-74.087-8.8999-74.087-19.877 0-5.3164 7.7802-10.146 20.453-13.712 0.0395 0.0297 0.0795 0.061 0.11962 0.0913-12.55 3.5474-20.252 8.3438-20.252 13.621 0 10.93 33.026 19.791 73.767 19.791 40.74 0 73.767-8.8609 73.767-19.791 0-5.2774-7.7025-10.074-20.252-13.621 0.04-0.0303 0.08-0.0615 0.12-0.0913 12.672 3.5659 20.454 8.396 20.454 13.712 0 10.978-33.171 19.877-74.088 19.877" fill="#fafafa"/>
   <path id="path4275" d="m451.28 932.04c-40.74 0-73.767-8.8609-73.767-19.791 0-5.2774 7.7016-10.074 20.252-13.621 0.0395 0.0299 0.08 0.0611 0.11963 0.0914-12.431 3.5282-20.051 8.291-20.051 13.53 0 10.882 32.883 19.705 73.446 19.705s73.446-8.8227 73.446-19.705c0-5.2388-7.62-10.002-20.051-13.53 0.04-0.0303 0.08-0.0615 0.12-0.0914 12.55 3.5474 20.252 8.3438 20.252 13.621 0 10.93-33.026 19.791-73.767 19.791" fill="#f9fafa"/>
   <path id="path4277" d="m451.28 931.96c-40.563 0-73.446-8.8227-73.446-19.705 0-5.2388 7.6201-10.002 20.051-13.53 0.04 0.0298 0.0805 0.061 0.1205 0.0907-12.31 3.5102-19.851 8.2388-19.851 13.439 0 10.835 32.739 19.619 73.126 19.619 40.386 0 73.126-8.7836 73.126-19.619 0-5.2002-7.5412-9.9288-19.851-13.439 0.04-0.0297 0.0813-0.061 0.12-0.0907 12.431 3.5282 20.051 8.291 20.051 13.53 0 10.882-32.882 19.705-73.446 19.705" fill="#f9f9f9"/>
   <path id="path4279" d="m451.28 931.87c-40.386 0-73.126-8.7836-73.126-19.619 0-5.2002 7.5405-9.9288 19.851-13.439 0.0401 0.0303 0.0811 0.0615 0.12062 0.0914-12.187 3.4911-19.651 8.1865-19.651 13.348 0 10.788 32.596 19.534 72.805 19.534 40.208 0 72.804-8.7461 72.804-19.534 0-5.1611-7.4638-9.8565-19.651-13.348 0.04-0.0299 0.0812-0.0611 0.12125-0.0914 12.31 3.5102 19.851 8.2388 19.851 13.439 0 10.835-32.74 19.619-73.126 19.619" fill="#f9f9f9"/>
   <path id="path4281" d="m451.28 931.79c-40.209 0-72.805-8.7461-72.805-19.534 0-5.1611 7.4639-9.8565 19.651-13.348 0.042 0.0312 0.0796 0.059 0.12163 0.0912-12.068 3.4726-19.452 8.1339-19.452 13.256 0 10.74 32.452 19.448 72.484 19.448s72.484-8.7075 72.484-19.448c0-5.1225-7.385-9.7838-19.452-13.256 0.0425-0.0322 0.08-0.06 0.12125-0.0912 12.188 3.4911 19.651 8.1865 19.651 13.348 0 10.788-32.596 19.534-72.804 19.534" fill="#f8f9f9"/>
   <path id="path4283" d="m451.28 931.7c-40.032 0-72.484-8.7075-72.484-19.448 0-5.1225 7.3837-9.7838 19.452-13.256 0.04 0.0303 0.0815 0.0615 0.12162 0.0914-11.949 3.4536-19.252 8.08-19.252 13.165 0 10.692 32.309 19.361 72.163 19.361s72.163-8.669 72.163-19.361c0-5.085-7.3038-9.7114-19.252-13.165 0.04-0.0299 0.0812-0.0611 0.12125-0.0914 12.068 3.4726 19.452 8.1339 19.452 13.256 0 10.74-32.452 19.448-72.484 19.448" fill="#f8f8f8"/>
   <path id="path4285" d="m451.28 931.61c-39.854 0-72.163-8.669-72.163-19.361 0-5.085 7.3038-9.7114 19.252-13.165 0.04 0.0288 0.0825 0.0615 0.1225 0.0913-11.828 3.4351-19.054 8.0274-19.054 13.074 0 10.645 32.165 19.275 71.842 19.275s71.842-8.6299 71.842-19.275c0-5.0464-7.2262-9.6386-19.054-13.074 0.04-0.0298 0.0825-0.0625 0.1225-0.0913 11.949 3.4536 19.252 8.08 19.252 13.165 0 10.692-32.309 19.361-72.163 19.361" fill="#f8f8f8"/>
   <path id="path4287" d="m451.28 931.53c-39.677 0-71.842-8.6299-71.842-19.275 0-5.0464 7.226-9.6386 19.054-13.074 0.042 0.0312 0.0801 0.0586 0.12263 0.0914-11.708 3.416-18.856 7.975-18.856 12.982 0 10.598 32.022 19.189 71.522 19.189s71.522-8.5913 71.522-19.189c0-5.0074-7.1488-9.5664-18.856-12.982 0.0425-0.0327 0.08-0.0601 0.1225-0.0914 11.828 3.4351 19.054 8.0274 19.054 13.074 0 10.645-32.165 19.275-71.842 19.275" fill="#f7f8f8"/>
   <path id="path4289" d="m451.28 931.44c-39.5 0-71.522-8.5913-71.522-19.189 0-5.0074 7.1484-9.5664 18.856-12.982 0.04 0.0288 0.083 0.061 0.123 0.0913-11.588 3.3975-18.658 7.9224-18.658 12.891 0 10.55 31.878 19.103 71.201 19.103s71.2-8.5528 71.2-19.103c0-4.9688-7.07-9.4936-18.659-12.891 0.04-0.0303 0.0838-0.0625 0.12375-0.0913 11.708 3.416 18.856 7.975 18.856 12.982 0 10.598-32.021 19.189-71.522 19.189" fill="#f7f7f7"/>
   <path id="path4291" d="m451.28 931.35c-39.323 0-71.201-8.5528-71.201-19.103 0-4.9688 7.0699-9.4936 18.658-12.891 0.0425 0.0312 0.081 0.0601 0.1235 0.0914-11.47 3.3784-18.461 7.8696-18.461 12.8 0 10.502 31.734 19.016 70.88 19.016s70.879-8.5136 70.879-19.016c0-4.9301-6.9912-9.4214-18.461-12.8 0.0425-0.0312 0.0813-0.0601 0.12375-0.0914 11.589 3.3975 18.659 7.9224 18.659 12.891 0 10.55-31.878 19.103-71.2 19.103" fill="#f6f7f7"/>
   <path id="path4293" d="m451.28 931.27c-39.146 0-70.88-8.5136-70.88-19.016 0-4.9301 6.9911-9.4214 18.461-12.8 0.0405 0.0282 0.084 0.061 0.124 0.0907-11.349 3.3589-18.264 7.8179-18.264 12.709 0 10.455 31.59 18.931 70.559 18.931s70.559-8.476 70.559-18.931c0-4.8911-6.9162-9.3501-18.265-12.709 0.04-0.0297 0.0838-0.0625 0.12375-0.0907 11.47 3.3784 18.461 7.8696 18.461 12.8 0 10.502-31.734 19.016-70.879 19.016" fill="#f6f6f7"/>
   <path id="path4295" d="m451.28 931.18c-38.969 0-70.559-8.476-70.559-18.931 0-4.8911 6.915-9.3501 18.264-12.709 0.0425 0.0312 0.0826 0.0601 0.125 0.0914-11.232 3.3402-18.068 7.7651-18.068 12.618 0 10.408 31.447 18.845 70.238 18.845 38.792 0 70.238-8.4375 70.238-18.845 0-4.8525-6.8362-9.2774-18.069-12.618 0.0438-0.0312 0.0825-0.0601 0.125-0.0914 11.349 3.3589 18.265 7.8179 18.265 12.709 0 10.455-31.59 18.931-70.559 18.931" fill="#f6f6f6"/>
   <path id="path4297" d="m451.28 931.1c-38.792 0-70.238-8.4375-70.238-18.845 0-4.8525 6.8364-9.2774 18.068-12.618 0.0401 0.0287 0.0845 0.0615 0.125 0.0912-11.113 3.3213-17.872 7.7114-17.872 12.526 0 10.36 31.303 18.759 69.918 18.759 38.614 0 69.918-8.3989 69.918-18.759 0-4.815-6.76-9.2051-17.874-12.526 0.0412-0.0297 0.085-0.0625 0.125-0.0912 11.232 3.3402 18.069 7.7651 18.069 12.618 0 10.408-31.446 18.845-70.238 18.845" fill="#f5f6f6"/>
   <path id="path4299" d="m451.28 931.01c-38.614 0-69.918-8.3989-69.918-18.759 0-4.815 6.7592-9.2051 17.872-12.526 0.0425 0.0312 0.083 0.0601 0.1255 0.0914-10.995 3.3026-17.677 7.6586-17.677 12.435 0 10.312 31.159 18.672 69.597 18.672 38.437 0 69.597-8.3599 69.597-18.672 0-4.7764-6.6825-9.1324-17.678-12.435 0.0425-0.0312 0.0825-0.0601 0.125-0.0914 11.114 3.3213 17.874 7.7114 17.874 12.526 0 10.36-31.304 18.759-69.918 18.759" fill="#f5f5f5"/>
   <path id="path4301" d="m451.28 930.92c-38.438 0-69.597-8.3599-69.597-18.672 0-4.7764 6.6826-9.1324 17.677-12.435 0.0425 0.0312 0.0835 0.06 0.126 0.0913-10.877 3.2828-17.482 7.6065-17.482 12.344 0 10.265 31.016 18.586 69.276 18.586s69.276-8.3213 69.276-18.586c0-4.7372-6.605-9.061-17.482-12.344 0.0425-0.0312 0.0838-0.06 0.12625-0.0913 10.995 3.3026 17.678 7.6586 17.678 12.435 0 10.312-31.16 18.672-69.597 18.672" fill="#f5f5f5"/>
   <path id="path4303" d="m451.28 930.84c-38.26 0-69.276-8.3213-69.276-18.586 0-4.7372 6.6055-9.061 17.482-12.344 0.043 0.0312 0.084 0.061 0.1265 0.0912-10.758 3.2638-17.289 7.5538-17.289 12.252 0 10.217 30.873 18.5 68.956 18.5s68.956-8.2828 68.956-18.5c0-4.6988-6.5312-8.9888-17.289-12.252 0.0425-0.0303 0.0838-0.06 0.12625-0.0912 10.878 3.2828 17.482 7.6065 17.482 12.344 0 10.265-31.015 18.586-69.276 18.586" fill="#f4f4f4"/>
   <path id="path4305" d="m451.28 930.75c-38.083 0-68.956-8.2828-68.956-18.5 0-4.6988 6.5308-8.9888 17.289-12.252 0.0405 0.0299 0.0864 0.0625 0.12687 0.0914-10.642 3.2436-17.095 7.5-17.095 12.161 0 10.17 30.729 18.415 68.635 18.415s68.634-8.2452 68.634-18.415c0-4.6611-6.4525-8.9175-17.095-12.161 0.0412-0.0289 0.0875-0.0615 0.1275-0.0914 10.758 3.2638 17.289 7.5538 17.289 12.252 0 10.217-30.872 18.5-68.956 18.5" fill="#f4f4f4"/>
   <path id="path4307" d="m451.28 930.67c-37.906 0-68.635-8.2452-68.635-18.415 0-4.6611 6.4531-8.9175 17.095-12.161 0.043 0.0312 0.085 0.061 0.128 0.0922-10.524 3.2237-16.902 7.4464-16.902 12.069 0 10.122 30.586 18.329 68.314 18.329s68.314-8.2061 68.314-18.329c0-4.6225-6.3775-8.8452-16.902-12.069 0.0437-0.0312 0.085-0.061 0.1275-0.0922 10.642 3.2436 17.095 7.5 17.095 12.161 0 10.17-30.729 18.415-68.634 18.415" fill="#f3f3f3"/>
   <path id="path4309" d="m451.28 930.58c-37.728 0-68.314-8.2061-68.314-18.329 0-4.6225 6.3775-8.8452 16.902-12.069 0.043 0.0303 0.085 0.0601 0.12788 0.0914-10.407 3.205-16.709 7.3935-16.709 11.978 0 10.075 30.442 18.243 67.993 18.243 37.552 0 67.993-8.1674 67.993-18.243 0-4.584-6.3012-8.7725-16.709-11.978 0.0425-0.0312 0.085-0.0611 0.1275-0.0914 10.525 3.2236 16.902 7.4464 16.902 12.069 0 10.122-30.586 18.329-68.314 18.329" fill="#f3f3f2"/>
   <path id="path4311" d="m451.28 930.5c-37.552 0-67.993-8.1674-67.993-18.243 0-4.584 6.3019-8.7725 16.709-11.978 0.043 0.0298 0.0855 0.0615 0.1285 0.0913-10.289 3.1851-16.517 7.3414-16.517 11.886 0 10.027 30.298 18.156 67.672 18.156s67.672-8.1289 67.672-18.156c0-4.5464-6.225-8.7011-16.516-11.886 0.0425-0.0298 0.085-0.0615 0.12875-0.0913 10.408 3.205 16.709 7.3935 16.709 11.978 0 10.075-30.441 18.243-67.993 18.243" fill="#f2f2f2"/>
   <path id="path4313" d="m451.28 930.41c-37.374 0-67.672-8.1289-67.672-18.156 0-4.5449 6.228-8.7011 16.517-11.886 0.0429 0.0298 0.0859 0.061 0.12937 0.0914-10.174 3.165-16.325 7.2875-16.325 11.795 0 9.98 30.154 18.07 67.352 18.07 37.197 0 67.352-8.0898 67.352-18.07 0-4.5074-6.1525-8.6299-16.325-11.795 0.0425-0.0304 0.0862-0.0616 0.12875-0.0914 10.291 3.1851 16.516 7.3399 16.516 11.886 0 10.027-30.298 18.156-67.672 18.156" fill="#f2f1f1"/>
   <path id="path4315" d="m451.28 930.32c-37.197 0-67.352-8.0898-67.352-18.07 0-4.5074 6.1514-8.6299 16.325-11.795 0.043 0.0312 0.0864 0.061 0.12938 0.0923-10.056 3.145-16.134 7.2339-16.134 11.703 0 9.9326 30.011 17.984 67.031 17.984s67.03-8.0513 67.03-17.984c0-4.4688-6.0775-8.5576-16.134-11.703 0.0425-0.0312 0.0863-0.061 0.13-0.0923 10.172 3.165 16.325 7.2875 16.325 11.795 0 9.98-30.155 18.07-67.352 18.07" fill="#f1f1f1"/>
   <path id="path4317" d="m451.28 930.24c-37.02 0-67.031-8.0513-67.031-17.984 0-4.4688 6.0776-8.5576 16.134-11.703 0.043 0.0303 0.0869 0.0615 0.12987 0.0913-9.9399 3.125-15.943 7.1802-15.943 11.611 0 9.8848 29.867 17.897 66.71 17.897s66.71-8.0127 66.71-17.897c0-4.4311-6.0038-8.4864-15.944-11.611 0.0438-0.0297 0.0875-0.061 0.13-0.0913 10.056 3.145 16.134 7.2339 16.134 11.703 0 9.9326-30.01 17.984-67.03 17.984" fill="#f0f0f0"/>
   <path id="path4319" d="m451.28 930.15c-36.843 0-66.71-8.0127-66.71-17.897 0-4.4311 6.003-8.4864 15.943-11.611 0.0435 0.0304 0.0874 0.0616 0.13088 0.0914-9.8252 3.1064-15.753 7.1274-15.753 11.52 0 9.8374 29.723 17.812 66.389 17.812s66.389-7.9751 66.389-17.812c0-4.3926-5.9288-8.4136-15.754-11.52 0.0437-0.0298 0.0888-0.061 0.13125-0.0914 9.94 3.125 15.944 7.1802 15.944 11.611 0 9.8848-29.868 17.897-66.71 17.897" fill="#f0f0ef"/>
   <path id="path4321" d="m451.28 930.06c-36.666 0-66.389-7.9751-66.389-17.812 0-4.3926 5.9276-8.4136 15.753-11.52 0.0454 0.0312 0.0855 0.06 0.13137 0.0912-9.7105 3.0865-15.564 7.0738-15.564 11.429 0 9.79 29.58 17.726 66.068 17.726s66.068-7.9361 66.068-17.726c0-4.355-5.8525-8.3422-15.564-11.429 0.0462-0.0312 0.0863-0.06 0.13125-0.0912 9.825 3.1064 15.754 7.1274 15.754 11.52 0 9.8374-29.724 17.812-66.389 17.812" fill="#efefef"/>
   <path id="path4323" d="m451.28 929.98c-36.489 0-66.068-7.9361-66.068-17.726 0-4.355 5.853-8.3422 15.564-11.429 0.0429 0.0299 0.0884 0.0625 0.13138 0.0924-9.5942 3.0649-15.375 7.02-15.375 11.336 0 9.7426 29.437 17.64 65.748 17.64 36.312 0 65.748-7.8975 65.748-17.64 0-4.3164-5.78-8.2715-15.375-11.336 0.0437-0.0299 0.0887-0.0625 0.13125-0.0924 9.7112 3.0865 15.564 7.0738 15.564 11.429 0 9.79-29.58 17.726-66.068 17.726" fill="#eee"/>
   <path id="path4325" d="m451.28 929.89c-36.312 0-65.748-7.8975-65.748-17.64 0-4.3164 5.7804-8.2715 15.375-11.336 0.0434 0.0302 0.0888 0.0615 0.13225 0.0912-9.4814 3.0464-15.186 6.9664-15.186 11.245 0 9.6949 29.292 17.554 65.427 17.554 36.134 0 65.427-7.8588 65.427-17.554 0-4.2788-5.7038-8.1988-15.186-11.245 0.0438-0.0297 0.0888-0.061 0.1325-0.0912 9.595 3.0649 15.375 7.02 15.375 11.336 0 9.7426-29.436 17.64-65.748 17.64" fill="#eeeeed"/>
   <path id="path4327" d="m451.28 929.81c-36.134 0-65.427-7.8588-65.427-17.554 0-4.2788 5.7041-8.1988 15.186-11.245 0.0454 0.0312 0.0869 0.0601 0.13287 0.0914-9.3672 3.0262-14.998 6.9135-14.998 11.154 0 9.6475 29.148 17.467 65.106 17.467 35.957 0 65.106-7.8198 65.106-17.467 0-4.2402-5.63-8.1275-14.998-11.154 0.0463-0.0312 0.0875-0.0601 0.1325-0.0914 9.4825 3.0464 15.186 6.9664 15.186 11.245 0 9.6949-29.292 17.554-65.427 17.554" fill="#ededec"/>
   <path id="path4329" d="m451.28 929.72c-35.958 0-65.106-7.8198-65.106-17.467 0-4.2402 5.6304-8.1275 14.998-11.154 0.0434 0.0303 0.0897 0.0625 0.13325 0.0923-9.251 3.0054-14.81 6.8589-14.81 11.062 0 9.6001 29.006 17.381 64.786 17.381s64.786-7.7812 64.786-17.381c0-4.2026-5.56-8.0561-14.811-11.062 0.0437-0.0298 0.09-0.062 0.13375-0.0923 9.3675 3.0262 14.998 6.9135 14.998 11.154 0 9.6475-29.148 17.467-65.106 17.467" fill="#ededec"/>
   <path id="path4331" d="m451.28 929.63c-35.78 0-64.786-7.7812-64.786-17.381 0-4.2026 5.5595-8.0561 14.81-11.062 0.0459 0.0317 0.0884 0.06 0.13375 0.0912-9.1381 2.9854-14.624 6.8066-14.624 10.97 0 9.5528 28.862 17.295 64.465 17.295 35.602 0 64.464-7.7422 64.464-17.295 0-4.1636-5.485-7.9849-14.624-10.97 0.0462-0.0312 0.0887-0.0595 0.13375-0.0912 9.2512 3.0054 14.811 6.8589 14.811 11.062 0 9.6001-29.006 17.381-64.786 17.381" fill="#ececeb"/>
   <path id="path4333" d="m451.28 929.55c-35.603 0-64.465-7.7422-64.465-17.295 0-4.1636 5.4854-7.9849 14.624-10.97 0.044 0.0303 0.0914 0.0625 0.13475 0.0928-9.0244 2.9639-14.438 6.751-14.438 10.878 0 9.5049 28.718 17.21 64.144 17.21s64.143-7.7051 64.143-17.21c0-4.1265-5.4125-7.9136-14.436-10.878 0.0438-0.0303 0.09-0.0625 0.13375-0.0928 9.1388 2.9854 14.624 6.8066 14.624 10.97 0 9.5528-28.862 17.295-64.464 17.295" fill="#ecebea"/>
   <path id="path4335" d="m451.28 929.46c-35.426 0-64.144-7.7051-64.144-17.21 0-4.1265 5.4131-7.9136 14.438-10.878 0.046 0.0312 0.0889 0.0601 0.13488 0.0914-8.9111 2.9439-14.252 6.6972-14.252 10.786 0 9.4575 28.575 17.124 63.823 17.124s63.823-7.666 63.823-17.124c0-4.0889-5.34-7.8422-14.251-10.786 0.045-0.0312 0.0888-0.0601 0.135-0.0914 9.0238 2.9639 14.436 6.751 14.436 10.878 0 9.5049-28.717 17.21-64.143 17.21" fill="#ebebea"/>
   <path id="path4337" d="m451.28 929.38c-35.248 0-63.823-7.666-63.823-17.124 0-4.0889 5.3404-7.8422 14.252-10.786 0.0439 0.0297 0.0922 0.0625 0.13575 0.0912-8.7989 2.9249-14.066 6.6451-14.066 10.695 0 9.4101 28.431 17.038 63.502 17.038s63.502-7.6275 63.502-17.038c0-4.0498-5.2675-7.77-14.066-10.695 0.0437-0.0287 0.0925-0.0615 0.13625-0.0912 8.9112 2.9439 14.251 6.6972 14.251 10.786 0 9.4575-28.574 17.124-63.823 17.124" fill="#eaeae9"/>
   <path id="path4339" d="m451.28 929.29c-35.071 0-63.502-7.6275-63.502-17.038 0-4.0498 5.2676-7.77 14.066-10.695 0.0464 0.0312 0.0903 0.0611 0.13612 0.0924-8.685 2.9038-13.882 6.5898-13.882 10.602 0 9.3622 28.288 16.951 63.182 16.951s63.182-7.5889 63.182-16.951c0-4.0128-5.1975-7.6988-13.882-10.602 0.0463-0.0312 0.09-0.0611 0.13625-0.0924 8.7988 2.9249 14.066 6.6451 14.066 10.695 0 9.4101-28.43 17.038-63.502 17.038" fill="#eaeae8"/>
   <path id="path4341" d="m451.28 929.2c-34.894 0-63.182-7.5889-63.182-16.951 0-4.0128 5.1968-7.6988 13.882-10.602 0.0464 0.0312 0.0909 0.061 0.13675 0.0913-8.5722 2.8838-13.698 6.5376-13.698 10.511 0 9.315 28.144 16.865 62.861 16.865s62.86-7.5498 62.86-16.865c0-3.9736-5.125-7.6275-13.698-10.511 0.0462-0.0303 0.09-0.06 0.13625-0.0913 8.685 2.9038 13.882 6.5898 13.882 10.602 0 9.3622-28.288 16.951-63.182 16.951" fill="#e9e9e8"/>
   <path id="path4343" d="m451.28 929.12c-34.717 0-62.861-7.5498-62.861-16.865 0-3.9736 5.1255-7.6275 13.698-10.511 0.0464 0.0312 0.0914 0.061 0.13775 0.0923-8.461 2.8629-13.515 6.483-13.515 10.419 0 9.2676 28 16.779 62.54 16.779s62.539-7.5112 62.539-16.779c0-3.936-5.0538-7.5561-13.514-10.419 0.0462-0.0312 0.0912-0.061 0.1375-0.0923 8.5725 2.8838 13.698 6.5376 13.698 10.511 0 9.315-28.144 16.865-62.86 16.865" fill="#e9e8e7"/>
   <path id="path4345" d="m451.28 929.03c-34.54 0-62.54-7.5112-62.54-16.779 0-3.936 5.0538-7.5561 13.515-10.419 0.0459 0.0312 0.0917 0.0616 0.13763 0.0929-8.3496 2.8413-13.332 6.4273-13.332 10.326 0 9.2202 27.856 16.694 62.219 16.694 34.362 0 62.219-7.4736 62.219-16.694 0-3.8989-4.9825-7.4849-13.332-10.326 0.0463-0.0312 0.0925-0.0616 0.13875-0.0929 8.46 2.8629 13.514 6.483 13.514 10.419 0 9.2676-27.999 16.779-62.539 16.779" fill="#e8e8e6"/>
   <path id="path4347" d="m451.28 928.95c-34.363 0-62.219-7.4736-62.219-16.694 0-3.8989 4.9819-7.4849 13.332-10.326 0.0464 0.0298 0.0924 0.06 0.13875 0.0913-8.2374 2.8199-13.15 6.3735-13.15 10.235 0 9.1724 27.713 16.607 61.898 16.607 34.186 0 61.898-7.4351 61.898-16.607 0-3.8614-4.9112-7.415-13.149-10.235 0.0462-0.0312 0.0913-0.0615 0.1375-0.0913 8.35 2.8413 13.332 6.4273 13.332 10.326 0 9.2202-27.857 16.694-62.219 16.694" fill="#e7e7e6"/>
   <path id="path4349" d="m451.28 928.86c-34.186 0-61.898-7.4351-61.898-16.607 0-3.8614 4.9121-7.415 13.15-10.235 0.0464 0.0312 0.0928 0.061 0.13912 0.0922-8.128 2.7989-12.968 6.3189-12.968 10.143 0 9.1235 27.569 16.521 61.578 16.521 34.008 0 61.578-7.398 61.578-16.521 0-3.8238-4.84-7.3438-12.969-10.143 0.0463-0.0312 0.0937-0.061 0.14-0.0922 8.2375 2.8199 13.149 6.3735 13.149 10.235 0 9.1724-27.712 16.607-61.898 16.607" fill="#e7e6e5"/>
   <path id="path4351" d="m451.28 928.77c-34.009 0-61.578-7.398-61.578-16.521 0-3.8238 4.8397-7.3438 12.968-10.143 0.0464 0.0304 0.0933 0.0616 0.13963 0.0914-8.0156 2.7788-12.787 6.2661-12.787 10.051 0 9.0776 27.426 16.435 61.257 16.435s61.257-7.3574 61.257-16.435c0-3.7851-4.7712-7.2725-12.788-10.051 0.0475-0.0298 0.0937-0.061 0.14-0.0914 8.1288 2.7989 12.969 6.3189 12.969 10.143 0 9.1235-27.57 16.521-61.578 16.521" fill="#e6e6e4"/>
   <path id="path4353" d="m451.28 928.69c-33.832 0-61.257-7.3574-61.257-16.435 0-3.7851 4.7715-7.2725 12.787-10.051 0.0464 0.0312 0.0942 0.0625 0.14062 0.0922-7.9062 2.7579-12.606 6.2115-12.606 9.959 0 9.0288 27.282 16.349 60.936 16.349s60.936-7.3199 60.936-16.349c0-3.7475-4.7-7.2011-12.606-9.959 0.0463-0.0297 0.0937-0.061 0.14-0.0922 8.0162 2.7788 12.788 6.2661 12.788 10.051 0 9.0776-27.426 16.435-61.257 16.435" fill="#e5e5e3"/>
   <path id="path4355" d="m451.28 928.6c-33.654 0-60.936-7.3199-60.936-16.349 0-3.7475 4.7001-7.2011 12.606-9.959 0.0464 0.0303 0.0947 0.0615 0.14113 0.0928-7.7954 2.7364-12.427 6.1562-12.427 9.8662 0 8.9815 27.138 16.263 60.615 16.263s60.616-7.2812 60.616-16.263c0-3.71-4.6312-7.1299-12.428-9.8662 0.0462-0.0312 0.095-0.0625 0.14125-0.0928 7.9062 2.7579 12.606 6.2115 12.606 9.959 0 9.0288-27.282 16.349-60.936 16.349" fill="#e4e4e3"/>
   <path id="path4357" d="m451.28 928.52c-33.477 0-60.615-7.2812-60.615-16.263 0-3.71 4.6314-7.1299 12.427-9.8662 0.0469 0.0299 0.0953 0.0611 0.14162 0.0914-7.686 2.7162-12.248 6.1025-12.248 9.7749 0 8.9336 26.995 16.176 60.295 16.176s60.294-7.2426 60.294-16.176c0-3.6724-4.5612-7.0586-12.248-9.7749 0.0463-0.0302 0.095-0.0615 0.14125-0.0914 7.7962 2.7364 12.428 6.1562 12.428 9.8662 0 8.9815-27.138 16.263-60.616 16.263" fill="#e4e3e2"/>
   <path id="path4359" d="m451.28 928.43c-33.3 0-60.295-7.2426-60.295-16.176 0-3.6724 4.5621-7.0586 12.248-9.7749 0.0488 0.0323 0.0933 0.061 0.1425 0.0922-7.5776 2.6939-12.07 6.0479-12.07 9.6826 0 8.8862 26.851 16.091 59.974 16.091 33.122 0 59.974-7.2051 59.974-16.091 0-3.6348-4.4925-6.9888-12.07-9.6826 0.0487-0.0312 0.0937-0.06 0.1425-0.0922 7.6862 2.7162 12.248 6.1025 12.248 9.7749 0 8.9336-26.994 16.176-60.294 16.176" fill="#e3e3e1"/>
   <path id="path4361" d="m451.28 928.34c-33.123 0-59.974-7.2051-59.974-16.091 0-3.6348 4.4921-6.9888 12.07-9.6826 0.0465 0.0303 0.0962 0.0625 0.14313 0.0928-7.4678 2.6724-11.892 5.9922-11.892 9.5899 0 8.8389 26.708 16.005 59.653 16.005s59.653-7.166 59.653-16.005c0-3.5976-4.4238-6.9175-11.891-9.5899 0.0463-0.0303 0.0962-0.0625 0.1425-0.0928 7.5775 2.6939 12.07 6.0479 12.07 9.6826 0 8.8862-26.852 16.091-59.974 16.091" fill="#e2e2e0"/>
   <path id="path4363" d="m451.28 928.26c-32.945 0-59.653-7.166-59.653-16.005 0-3.5976 4.4244-6.9175 11.892-9.5899 0.0489 0.0312 0.0942 0.0601 0.1435 0.0909-7.3589 2.6528-11.715 5.939-11.715 9.499 0 8.791 26.564 15.919 59.332 15.919s59.332-7.128 59.332-15.919c0-3.56-4.355-6.8462-11.714-9.499 0.0488-0.0308 0.0937-0.0596 0.14375-0.0909 7.4675 2.6724 11.891 5.9922 11.891 9.5899 0 8.8389-26.708 16.005-59.653 16.005" fill="#e2e1df"/>
   <path id="path4365" d="m451.28 928.17c-32.769 0-59.332-7.128-59.332-15.919 0-3.56 4.3559-6.8462 11.715-9.499 0.0469 0.0303 0.0972 0.063 0.14412 0.0928-7.2505 2.6299-11.538 5.8838-11.538 9.4062 0 8.7436 26.42 15.833 59.012 15.833 32.591 0 59.012-7.0889 59.012-15.833 0-3.5225-4.2875-6.7764-11.539-9.4062 0.0475-0.0298 0.0975-0.0625 0.145-0.0928 7.3588 2.6528 11.714 5.939 11.714 9.499 0 8.791-26.564 15.919-59.332 15.919" fill="#e1e0df"/>
   <path id="path4367" d="m451.28 928.08c-32.591 0-59.012-7.0889-59.012-15.833 0-3.5225 4.2876-6.7764 11.538-9.4062 0.0492 0.0312 0.0956 0.061 0.145 0.0922-7.1421 2.6089-11.362 5.8291-11.362 9.314 0 8.6962 26.277 15.746 58.691 15.746s58.69-7.0498 58.69-15.746c0-3.4849-4.22-6.7051-11.362-9.314 0.05-0.0312 0.0962-0.061 0.145-0.0922 7.2512 2.6299 11.539 5.8838 11.539 9.4062 0 8.7436-26.42 15.833-59.012 15.833" fill="#e0e0de"/>
   <path id="path4369" d="m451.28 928c-32.414 0-58.691-7.0498-58.691-15.746 0-3.4849 4.2202-6.7051 11.362-9.314 0.0469 0.0303 0.0991 0.0625 0.146 0.0928-7.0366 2.586-11.188 5.7735-11.188 9.2212 0 8.6489 26.133 15.66 58.37 15.66s58.37-7.0113 58.37-15.66c0-3.4478-4.1512-6.6352-11.188-9.2212 0.0462-0.0303 0.0987-0.0625 0.145-0.0928 7.1425 2.6089 11.362 5.8291 11.362 9.314 0 8.6962-26.276 15.746-58.69 15.746" fill="#e0dfdd"/>
   <path id="path4371" d="m451.28 927.91c-32.237 0-58.37-7.0113-58.37-15.66 0-3.4478 4.1509-6.6352 11.188-9.2212 0.0492 0.0312 0.0966 0.0611 0.146 0.0924-6.9272 2.5649-11.013 5.7188-11.013 9.1289 0 8.6011 25.989 15.575 58.049 15.575s58.049-6.9741 58.049-15.575c0-3.4101-4.085-6.564-11.012-9.1289 0.0487-0.0312 0.0962-0.0611 0.14625-0.0924 7.0362 2.586 11.188 5.7735 11.188 9.2212 0 8.6489-26.134 15.66-58.37 15.66" fill="#dfdedc"/>
   <path id="path4373" d="m451.28 927.83c-32.06 0-58.049-6.9741-58.049-15.575 0-3.4101 4.0855-6.564 11.013-9.1289 0.0497 0.0312 0.0976 0.0615 0.147 0.0928-6.8219 2.5424-10.839 5.6636-10.839 9.0361 0 8.5538 25.846 15.489 57.728 15.489s57.728-6.935 57.728-15.489c0-3.3725-4.0162-6.4936-10.839-9.0361 0.05-0.0312 0.0975-0.0615 0.1475-0.0928 6.9275 2.5649 11.012 5.7188 11.012 9.1289 0 8.6011-25.99 15.575-58.049 15.575" fill="#dedddb"/>
   <path id="path4375" d="m451.28 927.74c-31.883 0-57.728-6.935-57.728-15.489 0-3.3725 4.017-6.4936 10.839-9.0361 0.0492 0.0312 0.0986 0.061 0.14788 0.0922-6.7152 2.5215-10.666 5.6089-10.666 8.9439 0 8.5064 25.702 15.402 57.408 15.402s57.408-6.896 57.408-15.402c0-3.335-3.9512-6.4224-10.666-8.9439 0.0488-0.0312 0.0975-0.061 0.1475-0.0922 6.8225 2.5425 10.839 5.6636 10.839 9.0361 0 8.5538-25.846 15.489-57.728 15.489" fill="#dddcda"/>
   <path id="path4377" d="m451.28 927.65c-31.706 0-57.408-6.896-57.408-15.402 0-3.335 3.9508-6.4224 10.666-8.9439 0.0499 0.0303 0.0986 0.0615 0.1485 0.0928-6.6094 2.4986-10.494 5.5538-10.494 8.8511 0 8.459 25.559 15.316 57.087 15.316s57.087-6.8574 57.087-15.316c0-3.2974-3.8838-6.3525-10.494-8.8511 0.05-0.0312 0.0987-0.0625 0.14875-0.0928 6.715 2.5215 10.666 5.6089 10.666 8.9439 0 8.5064-25.702 15.402-57.408 15.402" fill="#dddcda"/>
   <path id="path4379" d="m451.28 927.57c-31.528 0-57.087-6.8574-57.087-15.316 0-3.2974 3.8848-6.3525 10.494-8.8511 0.0497 0.0299 0.0996 0.0611 0.14887 0.0924-6.5029 2.4775-10.322 5.499-10.322 8.7588 0 8.4111 25.415 15.23 56.766 15.23s56.767-6.8188 56.767-15.23c0-3.2598-3.82-6.2812-10.322-8.7588 0.0487-0.0312 0.0987-0.0625 0.14875-0.0924 6.61 2.4986 10.494 5.5538 10.494 8.8511 0 8.459-25.558 15.316-57.087 15.316" fill="#dcdbd9"/>
   <path id="path4381" d="m451.28 927.48c-31.351 0-56.766-6.8188-56.766-15.23 0-3.2598 3.8189-6.2812 10.322-8.7588 0.0499 0.0303 0.10063 0.061 0.14988 0.0923-6.3974 2.4551-10.151 5.4439-10.151 8.6665 0 8.3638 25.271 15.144 56.445 15.144s56.446-6.7798 56.446-15.144c0-3.2226-3.7538-6.2114-10.151-8.6665 0.05-0.0312 0.1-0.062 0.15-0.0923 6.5025 2.4775 10.322 5.499 10.322 8.7588 0 8.4111-25.416 15.23-56.767 15.23" fill="#dbdad8"/>
   <path id="path4383" d="m451.28 927.4c-31.174 0-56.445-6.7798-56.445-15.144 0-3.2226 3.7535-6.2114 10.151-8.6665 0.0499 0.0303 0.10112 0.0615 0.15087 0.0928-6.2934 2.4326-9.9814 5.3877-9.9814 8.5737 0 8.3164 25.128 15.058 56.125 15.058 30.996 0 56.124-6.7412 56.124-15.058 0-3.186-3.6875-6.1411-9.9812-8.5738 0.05-0.0312 0.10125-0.0625 0.15125-0.0928 6.3975 2.4551 10.151 5.4439 10.151 8.6665 0 8.3638-25.272 15.144-56.446 15.144" fill="#dad9d7"/>
   <path id="path4385" d="m451.28 927.31c-30.997 0-56.125-6.7412-56.125-15.058 0-3.186 3.688-6.1411 9.9814-8.5738 0.0499 0.0298 0.10163 0.061 0.15138 0.0923-6.1885 2.4116-9.812 5.3326-9.812 8.4815 0 8.2685 24.984 14.973 55.804 14.973 30.819 0 55.804-6.7042 55.804-14.973 0-3.1489-3.6238-6.0699-9.8125-8.4815 0.05-0.0312 0.1025-0.0625 0.15125-0.0923 6.2938 2.4326 9.9812 5.3878 9.9812 8.5738 0 8.3164-25.128 15.058-56.124 15.058" fill="#d9d8d6"/>
   <path id="path4387" d="m451.28 927.23c-30.82 0-55.804-6.7042-55.804-14.973 0-3.1489 3.6235-6.0699 9.812-8.4815 0.0523 0.0312 0.0996 0.0616 0.15187 0.0929-6.0845 2.3886-9.643 5.2773-9.643 8.3886 0 8.2212 24.841 14.886 55.483 14.886s55.483-6.665 55.483-14.886c0-3.1114-3.5588-6-9.6425-8.3886 0.0512-0.0312 0.0987-0.0616 0.15125-0.0929 6.1888 2.4116 9.8125 5.3326 9.8125 8.4815 0 8.2685-24.985 14.973-55.804 14.973" fill="#d8d7d6"/>
   <path id="path4389" d="m451.28 927.14c-30.643 0-55.483-6.665-55.483-14.886 0-3.1114 3.5585-6 9.643-8.3886 0.0503 0.0298 0.103 0.0625 0.15288 0.0923-5.9815 2.3663-9.4751 5.2211-9.4751 8.2964 0 8.1739 24.697 14.8 55.163 14.8 30.465 0 55.162-6.6259 55.162-14.8 0-3.0752-3.4925-5.9301-9.475-8.2964 0.05-0.0298 0.10375-0.0625 0.15375-0.0923 6.0838 2.3886 9.6425 5.2773 9.6425 8.3886 0 8.2212-24.84 14.886-55.483 14.886" fill="#d7d6d5"/>
   <path id="path4391" d="m451.28 927.05c-30.465 0-55.163-6.6259-55.163-14.8 0-3.0752 3.4936-5.9301 9.4751-8.2964 0.0528 0.0312 0.1015 0.0615 0.15375 0.0928-5.8779 2.3438-9.3081 5.166-9.3081 8.2036 0 8.1265 24.553 14.714 54.842 14.714 30.288 0 54.842-6.5874 54.842-14.714 0-3.0376-3.43-5.8599-9.3088-8.2036 0.0525-0.0312 0.10125-0.0615 0.15375-0.0928 5.9825 2.3663 9.475 5.2211 9.475 8.2964 0 8.1739-24.696 14.8-55.162 14.8" fill="#d6d6d4"/>
   <path id="path4393" d="m451.28 926.97c-30.289 0-54.842-6.5874-54.842-14.714 0-3.0376 3.4302-5.8599 9.3081-8.2036 0.0504 0.0297 0.104 0.0625 0.15437 0.0922-5.7754 2.3227-9.1416 5.1114-9.1416 8.1114 0 8.0786 24.41 14.627 54.521 14.627s54.52-6.5488 54.52-14.627c0-3-3.3662-5.7886-9.1412-8.1114 0.05-0.0297 0.10375-0.0625 0.15375-0.0922 5.8788 2.3438 9.3088 5.166 9.3088 8.2036 0 8.1265-24.554 14.714-54.842 14.714" fill="#d5d5d3"/>
   <path id="path4395" d="m451.28 926.88c-30.111 0-54.521-6.5488-54.521-14.627 0-3 3.3662-5.7886 9.1416-8.1114 0.0528 0.0328 0.103 0.0625 0.15525 0.0937-5.6724 2.2989-8.9761 5.0552-8.9761 8.0176 0 8.0312 24.266 14.541 54.2 14.541s54.2-6.5098 54.2-14.541c0-2.9624-3.3038-5.7188-8.9762-8.0176 0.0525-0.0312 0.1025-0.061 0.155-0.0937 5.775 2.3227 9.1412 5.1114 9.1412 8.1114 0 8.0786-24.41 14.627-54.52 14.627" fill="#d4d4d2"/>
   <path id="path4397" d="m451.28 926.79c-29.934 0-54.2-6.5098-54.2-14.541 0-2.9624 3.3038-5.7188 8.9761-8.0176 0.0528 0.0312 0.1035 0.0616 0.15625 0.0929-5.5709 2.2759-8.8115 4.9985-8.8115 7.9248 0 7.9839 24.122 14.455 53.879 14.455s53.879-6.4712 53.879-14.455c0-2.9262-3.2412-5.6489-8.8112-7.9248 0.0525-0.0312 0.10375-0.0616 0.15625-0.0929 5.6725 2.2989 8.9762 5.0552 8.9762 8.0176 0 8.0312-24.267 14.541-54.2 14.541" fill="#d4d3d1"/>
   <path id="path4399" d="m451.28 926.71c-29.757 0-53.879-6.4712-53.879-14.455 0-2.9262 3.2406-5.6489 8.8115-7.9248 0.0528 0.0312 0.104 0.061 0.15675 0.0923-5.4702 2.2539-8.6475 4.9439-8.6475 7.8325 0 7.936 23.979 14.37 53.559 14.37s53.558-6.4341 53.558-14.37c0-2.8886-3.1775-5.5786-8.6475-7.8325 0.0538-0.0312 0.105-0.061 0.1575-0.0923 5.57 2.2759 8.8112 4.9985 8.8112 7.9248 0 7.9839-24.122 14.455-53.879 14.455" fill="#d3d2d0"/>
   <path id="path4401" d="m451.28 926.62c-29.58 0-53.559-6.4341-53.559-14.37 0-2.8886 3.1772-5.5786 8.6475-7.8325 0.0503 0.0297 0.10688 0.064 0.15763 0.0937-5.3686 2.23-8.4844 4.8862-8.4844 7.7388 0 7.8886 23.836 14.284 53.238 14.284s53.238-6.3951 53.238-14.284c0-2.8525-3.1162-5.5088-8.485-7.7388 0.0512-0.0298 0.1075-0.064 0.1575-0.0937 5.47 2.2539 8.6475 4.9439 8.6475 7.8325 0 7.936-23.978 14.37-53.558 14.37" fill="#d2d1cf"/>
   <path id="path4403" d="m451.28 926.54c-29.402 0-53.238-6.3951-53.238-14.284 0-2.8525 3.1158-5.5088 8.4844-7.7388 0.0528 0.0312 0.1055 0.0625 0.15825 0.0922-5.2685 2.2075-8.3218 4.8315-8.3218 7.6465 0 7.8412 23.691 14.197 52.917 14.197 29.225 0 52.917-6.356 52.917-14.197 0-2.815-3.0538-5.439-8.3212-7.6465 0.0525-0.0312 0.105-0.061 0.1575-0.0922 5.3688 2.23 8.485 4.8862 8.485 7.7388 0 7.8886-23.836 14.284-53.238 14.284" fill="#d1d0cf"/>
   <path id="path4405" d="m451.28 926.45c-29.226 0-52.917-6.356-52.917-14.197 0-2.815 3.0532-5.439 8.3218-7.6465 0.0551 0.0328 0.104 0.0615 0.15925 0.0937-5.168 2.1841-8.1608 4.774-8.1608 7.5528 0 7.794 23.549 14.111 52.597 14.111s52.597-6.3173 52.597-14.111c0-2.7788-2.9925-5.3686-8.1612-7.5528 0.055-0.0322 0.10375-0.061 0.16-0.0937 5.2675 2.2075 8.3212 4.8315 8.3212 7.6465 0 7.8412-23.692 14.197-52.917 14.197" fill="#d0cfcd"/>
   <path id="path4407" d="m451.28 926.36c-29.048 0-52.597-6.3173-52.597-14.111 0-2.7788 2.9928-5.3686 8.1608-7.5528 0.0531 0.0303 0.10737 0.0625 0.16012 0.0928-5.0684 2.1611-7.9995 4.7188-7.9995 7.46 0 7.7461 23.404 14.025 52.275 14.025s52.276-6.2788 52.276-14.025c0-2.7412-2.9312-5.2989-8-7.46 0.0525-0.0303 0.1075-0.0625 0.16-0.0928 5.1688 2.1841 8.1612 4.774 8.1612 7.5528 0 7.794-23.549 14.111-52.597 14.111" fill="#cfcecc"/>
   <path id="path4409" d="m451.28 926.28c-28.871 0-52.275-6.2788-52.275-14.025 0-2.7412 2.9311-5.2989 7.9995-7.46 0.0532 0.0312 0.10838 0.0625 0.16113 0.0937-4.9688 2.1372-7.8404 4.6611-7.8404 7.3662 0 7.6988 23.261 13.94 51.955 13.94s51.954-6.2412 51.954-13.94c0-2.7051-2.8712-5.229-7.84-7.3662 0.0538-0.0312 0.10875-0.0625 0.16125-0.0937 5.0688 2.1611 8 4.7188 8 7.46 0 7.7461-23.404 14.025-52.276 14.025" fill="#cecdcb"/>
   <path id="path4411" d="m451.28 926.19c-28.694 0-51.955-6.2412-51.955-13.94 0-2.7051 2.8716-5.229 7.8404-7.3662 0.0532 0.0299 0.10887 0.0625 0.16213 0.0924-4.8706 2.1138-7.6816 4.6064-7.6816 7.2739 0 7.6514 23.118 13.854 51.634 13.854 28.517 0 51.634-6.2021 51.634-13.854 0-2.6675-2.8112-5.1601-7.6812-7.2739 0.0525-0.0299 0.10875-0.0625 0.16125-0.0924 4.9688 2.1372 7.84 4.6611 7.84 7.3662 0 7.6988-23.26 13.94-51.954 13.94" fill="#cdccca"/>
   <path id="path4413" d="m451.28 926.11c-28.517 0-51.634-6.2021-51.634-13.854 0-2.6675 2.811-5.1601 7.6816-7.2739 0.0551 0.0326 0.10687 0.0615 0.16249 0.0937-4.7729 2.0902-7.5229 4.5487-7.5229 7.1801 0 7.6035 22.974 13.768 51.313 13.768s51.313-6.1641 51.313-13.768c0-2.6314-2.75-5.0899-7.5238-7.1801 0.0563-0.0323 0.1075-0.0611 0.16375-0.0937 4.87 2.1138 7.6812 4.6064 7.6812 7.2739 0 7.6514-23.118 13.854-51.634 13.854" fill="#cccbc9"/>
   <path id="path4415" d="m451.28 926.02c-28.339 0-51.313-6.1641-51.313-13.768 0-2.6314 2.75-5.0899 7.5229-7.1801 0.0532 0.0302 0.11038 0.0625 0.16363 0.0927-4.6752 2.0674-7.3662 4.4921-7.3662 7.0874 0 7.5561 22.83 13.681 50.993 13.681s50.993-6.125 50.993-13.681c0-2.5952-2.6912-5.02-7.3662-7.0874 0.0525-0.0302 0.11-0.0625 0.1625-0.0927 4.7738 2.0902 7.5238 4.5487 7.5238 7.1801 0 7.6035-22.974 13.768-51.313 13.768" fill="#cbc9c8"/>
   <path id="path4417" d="m451.28 925.93c-28.163 0-50.993-6.125-50.993-13.681 0-2.5952 2.691-5.02 7.3662-7.0874 0.0556 0.0323 0.10887 0.0625 0.1645 0.0937-4.5771 2.0434-7.2099 4.436-7.2099 6.9936 0 7.5088 22.686 13.595 50.672 13.595 27.985 0 50.672-6.0865 50.672-13.595 0-2.5576-2.6325-4.9502-7.21-6.9936 0.055-0.0312 0.10875-0.0615 0.165-0.0937 4.675 2.0674 7.3662 4.4921 7.3662 7.0874 0 7.5561-22.83 13.681-50.993 13.681" fill="#cac8c7"/>
   <path id="path4419" d="m451.28 925.85c-27.985 0-50.672-6.0865-50.672-13.595 0-2.5576 2.6328-4.9502 7.2099-6.9936 0.0563 0.0312 0.10987 0.0625 0.16562 0.0937-4.4805 2.02-7.0548 4.3784-7.0548 6.8999 0 7.4614 22.543 13.509 50.351 13.509s50.35-6.0474 50.35-13.509c0-2.5215-2.5738-4.8799-7.055-6.8999 0.0563-0.0312 0.11-0.0625 0.16625-0.0937 4.5775 2.0434 7.21 4.436 7.21 6.9936 0 7.5088-22.686 13.595-50.672 13.595" fill="#c9c7c6"/>
   <path id="path4421" d="m451.28 925.76c-27.808 0-50.351-6.0474-50.351-13.509 0-2.5215 2.5742-4.8799 7.0548-6.8999 0.0561 0.0312 0.11075 0.0625 0.1665 0.0937-4.3852 1.9946-6.9004 4.3222-6.9004 6.8061 0 7.4136 22.399 13.422 50.03 13.422s50.03-6.0087 50.03-13.422c0-2.4839-2.515-4.8115-6.9012-6.8061 0.0563-0.0312 0.11125-0.0625 0.16625-0.0937 4.4812 2.02 7.055 4.3784 7.055 6.8999 0 7.4614-22.542 13.509-50.35 13.509" fill="#c8c6c5"/>
   <path id="path4423" d="m451.28 925.67c-27.631 0-50.03-6.0087-50.03-13.422 0-2.4839 2.5151-4.8115 6.9004-6.8061 0.0561 0.0312 0.11125 0.0625 0.1675 0.0937-4.2901 1.9711-6.7471 4.2646-6.7471 6.7124 0 7.3662 22.256 13.337 49.71 13.337s49.709-5.9712 49.709-13.337c0-2.4478-2.4575-4.7412-6.7475-6.7124 0.0563-0.0312 0.1125-0.0625 0.1675-0.0937 4.3862 1.9946 6.9012 4.3222 6.9012 6.8061 0 7.4136-22.4 13.422-50.03 13.422" fill="#c7c5c3"/>
   <path id="path4425" d="m451.28 925.59c-27.454 0-49.71-5.9712-49.71-13.337 0-2.4478 2.457-4.7412 6.7471-6.7124 0.0561 0.0312 0.11225 0.0625 0.16838 0.0922-4.1942 1.9488-6.5948 4.209-6.5948 6.6201 0 7.3189 22.112 13.251 49.389 13.251 27.276 0 49.389-5.9326 49.389-13.251 0-2.4111-2.4012-4.6714-6.595-6.6201 0.0563-0.0297 0.1125-0.061 0.1675-0.0922 4.29 1.9711 6.7475 4.2646 6.7475 6.7124 0 7.3662-22.256 13.337-49.709 13.337" fill="#c6c4c2"/>
   <path id="path4427" d="m451.28 925.5c-27.277 0-49.389-5.9326-49.389-13.251 0-2.4111 2.4005-4.6714 6.5948-6.6201 0.0561 0.0312 0.11325 0.064 0.1695 0.0937-4.1001 1.9239-6.4434 4.1514-6.4434 6.5264 0 7.271 21.968 13.165 49.068 13.165 27.099 0 49.068-5.894 49.068-13.165 0-2.375-2.3438-4.6025-6.4438-6.5264 0.0562-0.0297 0.11375-0.0625 0.17-0.0937 4.1938 1.9488 6.595 4.209 6.595 6.6201 0 7.3189-22.113 13.251-49.389 13.251" fill="#c4c3c1"/>
   <path id="path4429" d="m451.28 925.42c-27.1 0-49.068-5.894-49.068-13.165 0-2.375 2.3432-4.6025 6.4434-6.5264 0.0561 0.0312 0.11375 0.064 0.16987 0.0937-4.0054 1.8999-6.2925 4.0953-6.2925 6.4326 0 7.2236 21.825 13.079 48.747 13.079s48.747-5.855 48.747-13.079c0-2.3374-2.2875-4.5328-6.2925-6.4326 0.0563-0.0297 0.11375-0.0625 0.17-0.0937 4.1 1.9239 6.4438 4.1514 6.4438 6.5264 0 7.271-21.969 13.165-49.068 13.165" fill="#c3c2c0"/>
   <path id="path4431" d="m451.28 925.33c-26.922 0-48.747-5.855-48.747-13.079 0-2.3374 2.2871-4.5328 6.2925-6.4326 0.0566 0.0312 0.11525 0.064 0.17138 0.0937-3.9126 1.875-6.1435 4.0376-6.1435 6.3389 0 7.1762 21.682 12.993 48.427 12.993s48.427-5.8164 48.427-12.993c0-2.3012-2.2312-4.4639-6.1438-6.3389 0.0563-0.0297 0.115-0.0625 0.17125-0.0937 4.005 1.8999 6.2925 4.0953 6.2925 6.4326 0 7.2236-21.824 13.079-48.747 13.079" fill="#c2c1bf"/>
   <path id="path4433" d="m451.28 925.25c-26.745 0-48.427-5.8164-48.427-12.993 0-2.3012 2.2309-4.4639 6.1435-6.3389 0.0591 0.0328 0.11375 0.0625 0.17287 0.0953-3.8208 1.8501-5.9956 3.9785-5.9956 6.2436 0 7.1289 21.538 12.906 48.106 12.906s48.106-5.7774 48.106-12.906c0-2.2651-2.1738-4.3935-5.995-6.2436 0.0588-0.0328 0.11375-0.0625 0.1725-0.0953 3.9125 1.875 6.1438 4.0376 6.1438 6.3389 0 7.1762-21.682 12.993-48.427 12.993" fill="#c1c0be"/>
   <path id="path4435" d="m451.28 925.16c-26.568 0-48.106-5.7774-48.106-12.906 0-2.2651 2.1749-4.3935 5.9956-6.2436 0.0561 0.0297 0.11675 0.0625 0.17338 0.0937-3.7281 1.8246-5.8478 3.9214-5.8478 6.1499 0 7.081 21.394 12.82 47.785 12.82s47.784-5.7388 47.784-12.82c0-2.2285-2.12-4.3252-5.8475-6.1499 0.0562-0.0312 0.1175-0.064 0.17375-0.0937 3.8212 1.8501 5.995 3.9785 5.995 6.2436 0 7.1289-21.538 12.906-48.106 12.906" fill="#c0bfbd"/>
   <path id="path4437" d="m451.28 925.07c-26.391 0-47.785-5.7388-47.785-12.82 0-2.2285 2.1196-4.3252 5.8478-6.1499 0.0585 0.0312 0.11525 0.0625 0.17425 0.0937-3.6362 1.8012-5.7016 3.8638-5.7016 6.0561 0 7.0328 21.251 12.735 47.464 12.735 26.214 0 47.464-5.7021 47.464-12.735 0-2.1924-2.0662-4.2549-5.7012-6.0561 0.0588-0.0312 0.115-0.0625 0.17375-0.0937 3.7275 1.8246 5.8475 3.9214 5.8475 6.1499 0 7.081-21.394 12.82-47.784 12.82" fill="#bfbebc"/>
   <path id="path4439" d="m451.28 924.99c-26.213 0-47.464-5.7021-47.464-12.735 0-2.1924 2.0654-4.2549 5.7016-6.0561 0.0591 0.0312 0.11675 0.0625 0.17537 0.0937-3.546 1.7759-5.5562 3.8061-5.5562 5.9624 0 6.9849 21.107 12.649 47.144 12.649s47.143-5.664 47.143-12.649c0-2.1562-2.01-4.1865-5.5562-5.9624 0.0588-0.0312 0.11625-0.0625 0.17625-0.0937 3.635 1.8012 5.7012 3.8638 5.7012 6.0561 0 7.0328-21.25 12.735-47.464 12.735" fill="#bebdbb"/>
   <path id="path4441" d="m451.28 924.9c-26.037 0-47.144-5.664-47.144-12.649 0-2.1562 2.0102-4.1865 5.5562-5.9624 0.059 0.0312 0.11763 0.0625 0.17675 0.0937-3.4556 1.7524-5.4121 3.7485-5.4121 5.8686 0 6.9375 20.963 12.562 46.823 12.562 25.859 0 46.823-5.625 46.823-12.562 0-2.1201-1.9575-4.1162-5.4125-5.8686 0.0588-0.0312 0.1175-0.0625 0.17625-0.0937 3.5462 1.7759 5.5562 3.8061 5.5562 5.9624 0 6.9849-21.106 12.649-47.143 12.649" fill="#bdbcba"/>
   <path id="path4443" d="m451.28 924.81c-25.859 0-46.823-5.625-46.823-12.562 0-2.1201 1.9565-4.1162 5.4121-5.8686 0.059 0.0323 0.11863 0.0635 0.17775 0.0948-3.3658 1.7265-5.2691 3.6899-5.2691 5.7739 0 6.8901 20.82 12.476 46.502 12.476s46.502-5.586 46.502-12.476c0-2.084-1.9038-4.0474-5.2688-5.7739 0.0588-0.0312 0.11875-0.0625 0.1775-0.0948 3.455 1.7524 5.4125 3.7485 5.4125 5.8686 0 6.9375-20.964 12.562-46.823 12.562" fill="#bcbbb9"/>
   <path id="path4445" d="m451.28 924.73c-25.682 0-46.502-5.586-46.502-12.476 0-2.084 1.9034-4.0474 5.2691-5.7739 0.0595 0.0312 0.11963 0.0625 0.17913 0.0937-3.2774 1.7011-5.1274 3.6328-5.1274 5.6801 0 6.8422 20.676 12.39 46.181 12.39s46.18-5.5479 46.18-12.39c0-2.0474-1.85-3.979-5.1275-5.6801 0.06-0.0312 0.12-0.0625 0.18-0.0937 3.365 1.7265 5.2688 3.6899 5.2688 5.7739 0 6.8901-20.82 12.476-46.502 12.476" fill="#bbbab8"/>
   <path id="path4447" d="m451.28 924.64c-25.505 0-46.181-5.5479-46.181-12.39 0-2.0474 1.85-3.979 5.1274-5.6801 0.0591 0.0312 0.12062 0.0639 0.17975 0.0951-3.189 1.6762-4.9864 3.5738-4.9864 5.585 0 6.7949 20.532 12.304 45.86 12.304s45.86-5.5088 45.86-12.304c0-2.0112-1.7975-3.9088-4.9862-5.585 0.0588-0.0312 0.12-0.0639 0.17875-0.0951 3.2775 1.7011 5.1275 3.6328 5.1275 5.6801 0 6.8422-20.676 12.39-46.18 12.39" fill="#bab9b7"/>
   <path id="path4449" d="m451.28 924.56c-25.328 0-45.86-5.5088-45.86-12.304 0-2.0112 1.7974-3.9088 4.9864-5.585 0.062 0.0327 0.11962 0.0625 0.18112 0.0937-3.1006 1.6514-4.8468 3.5161-4.8468 5.4912 0 6.7475 20.389 12.219 45.54 12.219s45.539-5.4712 45.539-12.219c0-1.9751-1.7462-3.8399-4.8462-5.4912 0.0613-0.0312 0.11875-0.061 0.18125-0.0937 3.1888 1.6762 4.9862 3.5738 4.9862 5.585 0 6.7949-20.532 12.304-45.86 12.304" fill="#b9b8b6"/>
   <path id="path4451" d="m451.28 924.47c-25.151 0-45.54-5.4712-45.54-12.219 0-1.9751 1.7461-3.8399 4.8468-5.4912 0.0595 0.0312 0.123 0.0635 0.18263 0.0952-3.0132 1.6245-4.7085 3.457-4.7085 5.396 0 6.7002 20.245 12.132 45.219 12.132s45.218-5.4321 45.218-12.132c0-1.939-1.695-3.7715-4.7075-5.396 0.0588-0.0317 0.1225-0.064 0.1825-0.0952 3.1 1.6514 4.8462 3.5161 4.8462 5.4912 0 6.7475-20.388 12.219-45.539 12.219" fill="#b7b7b5"/>
   <path id="path4453" d="m451.28 924.38c-24.974 0-45.219-5.4321-45.219-12.132 0-1.939 1.6952-3.7715 4.7085-5.396 0.062 0.0323 0.1215 0.062 0.18362 0.0948-2.9272 1.5986-4.5714 3.3989-4.5714 5.3012 0 6.6524 20.102 12.046 44.898 12.046s44.898-5.394 44.898-12.046c0-1.9024-1.645-3.7026-4.5712-5.3012 0.0613-0.0328 0.12125-0.0625 0.18375-0.0948 3.0125 1.6245 4.7075 3.457 4.7075 5.396 0 6.7002-20.244 12.132-45.218 12.132" fill="#b6b6b4"/>
   <path id="path4455" d="m451.28 924.3c-24.796 0-44.898-5.394-44.898-12.046 0-1.9024 1.6441-3.7026 4.5714-5.3012 0.062 0.0312 0.1225 0.0625 0.185 0.0937-2.8428 1.5751-4.4355 3.3412-4.4355 5.2075 0 6.605 19.958 11.96 44.577 11.96s44.577-5.355 44.577-11.96c0-1.8662-1.5925-3.6324-4.435-5.2075 0.0625-0.0312 0.1225-0.0625 0.185-0.0937 2.9262 1.5986 4.5712 3.3989 4.5712 5.3012 0 6.6524-20.102 12.046-44.898 12.046" fill="#b5b4b3"/>
   <path id="path4457" d="m451.28 924.21c-24.619 0-44.577-5.355-44.577-11.96 0-1.8662 1.5928-3.6324 4.4355-5.2075 0.0596 0.0312 0.126 0.0649 0.186 0.0952-2.7572 1.5482-4.3012 3.2821-4.3012 5.1122 0 6.5576 19.814 11.874 44.257 11.874 24.442 0 44.257-5.3159 44.257-11.874 0-1.8301-1.5438-3.564-4.3012-5.1122 0.06-0.0304 0.12625-0.064 0.18625-0.0952 2.8425 1.5751 4.435 3.3412 4.435 5.2075 0 6.605-19.958 11.96-44.577 11.96" fill="#b4b3b2"/>
   <path id="path4459" d="m451.28 924.13c-24.442 0-44.257-5.3159-44.257-11.874 0-1.8301 1.544-3.564 4.3012-5.1122 0.0645 0.0336 0.12263 0.0625 0.187 0.0946-2.6728 1.5225-4.1674 3.2236-4.1674 5.0176 0 6.5098 19.671 11.788 43.936 11.788s43.936-5.2778 43.936-11.788c0-1.794-1.4938-3.4951-4.1675-5.0176 0.065-0.0321 0.1225-0.061 0.1875-0.0946 2.7575 1.5482 4.3012 3.2821 4.3012 5.1122 0 6.5576-19.814 11.874-44.257 11.874" fill="#b3b2b1"/>
   <path id="path4461" d="m451.28 924.04c-24.265 0-43.936-5.2778-43.936-11.788 0-1.794 1.4946-3.4951 4.1674-5.0176 0.0625 0.0312 0.1265 0.064 0.189 0.0953-2.5904 1.4961-4.0351 3.1636-4.0351 4.9224 0 6.4624 19.527 11.701 43.615 11.701s43.614-5.2388 43.614-11.701c0-1.7588-1.445-3.4262-4.035-4.9224 0.0625-0.0312 0.12625-0.064 0.18875-0.0953 2.6738 1.5225 4.1675 3.2236 4.1675 5.0176 0 6.5098-19.67 11.788-43.936 11.788" fill="#b1b1b0"/>
   <path id="path4463" d="m451.28 923.95c-24.088 0-43.615-5.2388-43.615-11.701 0-1.7588 1.4448-3.4262 4.0351-4.9224 0.062 0.0312 0.1275 0.0635 0.19 0.0947-2.5074 1.4702-3.9049 3.105-3.9049 4.8276 0 6.415 19.384 11.616 43.294 11.616 23.911 0 43.294-5.2012 43.294-11.616 0-1.7226-1.3975-3.3574-3.905-4.8276 0.0625-0.0312 0.1275-0.0635 0.19-0.0947 2.59 1.4961 4.035 3.1636 4.035 4.9224 0 6.4624-19.526 11.701-43.614 11.701" fill="#b0b0af"/>
   <path id="path4465" d="m451.28 923.87c-23.911 0-43.294-5.2012-43.294-11.616 0-1.7226 1.3975-3.3574 3.9049-4.8276 0.0649 0.0327 0.12588 0.0625 0.19088 0.0952-2.4248 1.4438-3.7749 3.0459-3.7749 4.7324 0 6.3676 19.24 11.53 42.974 11.53 23.733 0 42.973-5.1622 42.973-11.53 0-1.6865-1.35-3.2886-3.775-4.7324 0.065-0.0327 0.12625-0.0625 0.19125-0.0952 2.5075 1.4702 3.905 3.105 3.905 4.8276 0 6.415-19.384 11.616-43.294 11.616" fill="#afafad"/>
   <path id="path4467" d="m451.28 923.78c-23.733 0-42.974-5.1622-42.974-11.53 0-1.6865 1.3501-3.2886 3.7749-4.7324 0.063 0.0312 0.13037 0.0649 0.19287 0.0961-2.3442 1.416-3.647 2.9864-3.647 4.6362 0 6.3199 19.096 11.444 42.653 11.444 23.556 0 42.653-5.124 42.653-11.444 0-1.6499-1.3025-3.2202-3.6475-4.6362 0.0625-0.0312 0.13-0.0649 0.1925-0.0961 2.425 1.4438 3.775 3.0459 3.775 4.7324 0 6.3676-19.24 11.53-42.973 11.53" fill="#aeaeac"/>
   <path id="path4469" d="m451.28 923.7c-23.557 0-42.653-5.124-42.653-11.444 0-1.6499 1.3028-3.2202 3.647-4.6362 0.0654 0.0312 0.12888 0.0625 0.19438 0.0947-2.2648 1.3916-3.5205 2.9262-3.5205 4.5415 0 6.2725 18.953 11.357 42.332 11.357s42.332-5.0849 42.332-11.357c0-1.6152-1.2562-3.1499-3.52-4.5415 0.065-0.0322 0.12875-0.0635 0.19375-0.0947 2.345 1.416 3.6475 2.9864 3.6475 4.6362 0 6.3199-19.097 11.444-42.653 11.444" fill="#adacab"/>
   <path id="path4471" d="m451.28 923.61c-23.379 0-42.332-5.0849-42.332-11.357 0-1.6152 1.2558-3.1499 3.5205-4.5415 0.0649 0.0317 0.12987 0.064 0.19525 0.0952-2.185 1.3652-3.395 2.8676-3.395 4.4462 0 6.2251 18.809 11.271 42.011 11.271s42.01-5.0464 42.01-11.271c0-1.5786-1.2088-3.081-3.395-4.4462 0.0662-0.0312 0.13125-0.0635 0.19625-0.0952 2.2638 1.3916 3.52 2.9262 3.52 4.5415 0 6.2725-18.952 11.357-42.332 11.357" fill="#acabaa"/>
   <path id="path4473" d="m451.28 923.52c-23.202 0-42.011-5.0464-42.011-11.271 0-1.5786 1.21-3.081 3.395-4.4462 0.0655 0.0326 0.13137 0.0639 0.19675 0.0961-2.1064 1.3374-3.271 2.8076-3.271 4.3501 0 6.1772 18.666 11.185 41.69 11.185 23.025 0 41.69-5.0078 41.69-11.185 0-1.5425-1.165-3.0128-3.2712-4.3501 0.065-0.0322 0.13125-0.0635 0.19625-0.0961 2.1862 1.3652 3.395 2.8676 3.395 4.4462 0 6.2251-18.809 11.271-42.01 11.271" fill="#aaaaa9"/>
   <path id="path4475" d="m451.28 923.44c-23.025 0-41.69-5.0078-41.69-11.185 0-1.5425 1.1646-3.0128 3.271-4.3501 0.0655 0.0312 0.13337 0.064 0.19875 0.0953-2.0292 1.311-3.1489 2.7475-3.1489 4.2549 0 6.1299 18.522 11.099 41.37 11.099s41.369-4.9688 41.369-11.099c0-1.5074-1.12-2.9439-3.1488-4.2549 0.0662-0.0312 0.13375-0.064 0.19875-0.0953 2.1062 1.3374 3.2712 2.8076 3.2712 4.3501 0 6.1772-18.666 11.185-41.69 11.185" fill="#a9a9a8"/>
   <path id="path4477" d="m451.28 923.35c-22.848 0-41.37-4.9688-41.37-11.099 0-1.5074 1.1196-2.9439 3.1489-4.2549 0.0679 0.0322 0.13187 0.0635 0.19975 0.0961-1.9521 1.2822-3.0279 2.6875-3.0279 4.1588 0 6.0825 18.378 11.014 41.049 11.014 22.67 0 41.049-4.9311 41.049-11.014 0-1.4712-1.0762-2.8765-3.0288-4.1588 0.0687-0.0326 0.1325-0.0639 0.2-0.0961 2.0288 1.311 3.1488 2.7475 3.1488 4.2549 0 6.1299-18.522 11.099-41.369 11.099" fill="#a8a8a7"/>
   <path id="path4479" d="m451.28 923.27c-22.671 0-41.049-4.9311-41.049-11.014 0-1.4712 1.0758-2.8765 3.0279-4.1588 0.0659 0.0312 0.13275 0.0625 0.19825 0.0937-1.876 1.2564-2.9092 2.626-2.9092 4.0611 0 6.0415 18.236 10.935 40.736 10.935 22.488 0 40.725-4.8935 40.725-10.935 0-1.4351-1.0325-2.8048-2.9088-4.0601 0.0662-0.0312 0.135-0.0635 0.2-0.0947 1.9525 1.2822 3.0288 2.6875 3.0288 4.1588 0 6.0825-18.379 11.014-41.049 11.014" fill="#a7a6a5"/>
   <path id="path4481" d="m458 912.25c0 0.9975-3.0118 1.8051-6.727 1.8051-3.7154 0-6.7271-0.80762-6.7271-1.8051 0-0.99612 3.0118-1.8051 6.7271-1.8051 3.7152 0 6.727 0.809 6.727 1.8051" fill="#100f0d"/>
  </g>
  <g id="g4565" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g4567" clip-path="url(#clipPath4569-7)">
    <path id="path4581" d="m936.28 1986.6c0 105.27-86.121 191.39-191.39 191.39h-73.438c-10.551 0-20.906-0.86-31.004-2.53v3514c0 30.46-24.695 55.16-55.16 55.16s-55.16-24.7-55.16-55.16v-3574.2c-31.067-34.05-50.067-79.27-50.067-128.72v3675.3c0 13.46 1.411 26.62 4.09 39.31 18.262 86.57 95.504 152.07 187.3 152.07h73.438c105.26 0 191.39-86.12 191.39-191.38v-3675.3" fill="url(#linearGradient4573)"/>
   </g>
  </g>
  <g id="g4583" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g4585" clip-path="url(#clipPath4587-0)">
    <path id="path4597" d="m480.07 1400.7v585.95c0 49.45 19 94.67 50.067 128.72v-528.52c0-30.47 24.695-55.16 55.16-55.16s55.16 24.69 55.16 55.16v588.66c10.098 1.67 20.453 2.53 31.004 2.53h73.438c105.26 0 191.39-86.12 191.39-191.39v-585.93c-70.082 29.76-147.17 46.22-228.1 46.22-80.934 0-158.03-16.46-228.11-46.22" fill="url(#linearGradient4591)"/>
   </g>
  </g>
  <g id="g4599" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g4601" clip-path="url(#clipPath4603-1)">
    <path id="path4613" d="m1292.4 862.75c0-322.64-261.54-584.18-584.17-584.18s-584.18 261.54-584.18 584.18c0 322.63 261.55 584.18 584.18 584.18s584.17-261.55 584.17-584.18" fill="url(#radialGradient4639-2)"/>
   </g>
  </g>
  <g id="g4615" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g4617" clip-path="url(#clipPath4619-2)">
    <path id="path4629" d="m1050.7 1172.3v1.43-0.71-0.72" fill="url(#radialGradient4639-2)"/>
   </g>
  </g>
  <g id="g4631" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g4633" clip-path="url(#clipPath4635-1)">
    <path id="path4645" d="m968.38 1031.8c51.305 37.97 82.295 87.29 82.295 141.21v-0.72c-0.28-53.63-31.21-102.69-82.295-140.49m-568.34 46.3c-22.008 28.67-34.359 60.88-34.359 94.91 0-34.03 12.351-66.24 34.359-94.91m650.63 94.91c0 15.69-2.63 31-7.61 45.75 4.91-14.53 7.53-29.6 7.61-45.04v-0.71" fill="url(#radialGradient4639-2)"/>
   </g>
  </g>
  <g id="g4647" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g4649" clip-path="url(#clipPath4651-8)">
    <g id="g4655" transform="matrix(696.2,0,0,453.2,359.9,945.9)">
     <image id="image4657" xlink:href="data:image/png;base64,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" transform="matrix(1,0,0,-1,0,1)" height="1" width="1" preserveAspectRatio="none"/>
    </g>
   </g>
  </g>
  <path id="path4659" d="m455.87 188.84h-9.1802c-21.737 0-39.423 17.685-39.423 39.422v523.07c-27.34 15.644-44.509 44.775-44.509 76.826 0 48.811 39.711 88.522 88.522 88.522 48.81 0 88.522-39.712 88.522-88.522 0-32.052-17.169-61.182-44.509-76.826v-523.07c0-21.738-17.685-39.422-39.423-39.422m0 15.5c13.158 0 23.923 10.765 23.923 23.922v532.65c26.161 11.106 44.509 37.031 44.509 67.242 0 40.33-32.692 73.022-73.022 73.022-40.329 0-73.022-32.692-73.022-73.022 0-30.211 18.349-56.136 44.509-67.242v-532.65c0-13.158 10.766-23.922 23.923-23.922h9.1802" fill="#100f0d"/>
  <g id="g4661" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g4663" clip-path="url(#clipPath4665-6)">
    <path id="path4679" d="m744.9 5941.9h-73.442c-154.37 0-279.96-125.59-279.96-279.96v-4205.5c-218.11-116.2-356.07-343.2-356.07-593.65-0.004-370.96 301.79-672.75 672.75-672.75 370.95 0 672.74 301.79 672.74 672.75 0 250.48-137.96 477.48-356.07 593.7v4205.5c0 154.37-125.59 279.96-279.96 279.96m0-88.58c105.26 0 191.39-86.12 191.39-191.38v-4261.2c209.29-88.85 356.07-296.25 356.07-537.94 0-322.63-261.54-584.18-584.17-584.18s-584.18 261.55-584.18 584.18c0 241.69 146.79 449.09 356.07 537.94v4261.2c0 105.26 86.125 191.38 191.39 191.38h73.442" fill="url(#linearGradient4669)"/>
   </g>
  </g>
  <g id="g4681" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g4683" clip-path="url(#clipPath4685-6)">
    <path id="path4697" d="m530.13 2115.4v3574.2c0 30.46 24.695 55.16 55.16 55.16s55.16-24.7 55.16-55.16v-3514c-43.328-7.13-81.883-28.96-110.32-60.14" fill="url(#linearGradient4689)"/>
   </g>
  </g>
  <g id="g4699" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g4701" clip-path="url(#clipPath4703-4)">
    <path id="path4713" d="m585.29 1531.7c-30.465 0-55.16 24.69-55.16 55.16v528.52c28.437 31.18 66.992 53.01 110.32 60.14v-588.66c0-30.47-24.695-55.16-55.16-55.16" fill="url(#linearGradient4707)"/>
   </g>
  </g>
  <g id="g6093" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g6095" clip-path="url(#clipPath6097-3)">
    <g id="g6101" transform="matrix(658.2,0,0,184.2,378.9,98.9)">
     <image id="image6103" xlink:href="data:image/png;base64,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" transform="matrix(1,0,0,-1,0,1)" height="1" width="1" preserveAspectRatio="none"/>
    </g>
   </g>
  </g>
 </g>
</svg>
\",\"data:image/svg+xml;base64,<svg id="svg6934" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="210.87mm" width="49.966mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 177.04375 747.16249" xmlns:dc="http://purl.org/dc/elements/1.1/">
 <defs id="defs6936">
  <linearGradient id="linearGradient5139" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1e-7 -2613.7 -2613.7 -1e-7 2652.4 3942.8)">
   <stop id="stop5141" stop-color="#c7e44b" offset="0"/>
   <stop id="stop5143" stop-color="#60ba65" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient5121" gradientUnits="userSpaceOnUse" gradientTransform="matrix(456.22 0 0 -456.22 2424.3 3494.3)">
   <stop id="stop5123" stop-color="#cac9c8" offset="0"/>
   <stop id="stop5125" stop-color="#f6f6f6" offset=".75269"/>
   <stop id="stop5127" stop-color="#d4d3d2" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient5101" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1345.5 0 0 -1345.5 1979.6 3065.9)">
   <stop id="stop5103" stop-color="#b3b3b2" offset="0"/>
   <stop id="stop5105" stop-color="#b3b3b2" offset=".1"/>
   <stop id="stop5107" stop-color="#feffff" offset=".24731"/>
   <stop id="stop5109" stop-color="#a3a3a1" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient5023" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1e-7 -2613.7 -2613.7 -1e-7 2652.4 3942.8)">
   <stop id="stop5025" stop-color="#a6d71c" offset="0"/>
   <stop id="stop5027" stop-color="#26803a" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient5005" gradientUnits="userSpaceOnUse" gradientTransform="matrix(456.22 0 0 -456.22 2424.3 3494.3)">
   <stop id="stop5007" stop-color="#a3a3a1" offset="0"/>
   <stop id="stop5009" stop-color="#ececec" offset=".75269"/>
   <stop id="stop5011" stop-color="#b3b3b2" offset="1"/>
  </linearGradient>
  <clipPath id="clipPath6109-9" clipPathUnits="userSpaceOnUse">
   <path id="path6111-4" clip-rule="evenodd" d="m2198.2 190.03c0 67.231 203.31 121.77 454.14 121.77s454.14-54.539 454.14-121.77c0-67.32-203.31-121.86-454.14-121.86s-454.14 54.543-454.14 121.86"/>
  </clipPath>
  <clipPath id="clipPath5135-7" clipPathUnits="userSpaceOnUse">
   <path id="path5137-8" d="m2529.5 1531.7c-30.46 0-55.16 24.69-55.16 55.16v2278.8c28.44 31.18 67 53 110.33 60.14v-2338.9c0-30.47-24.7-55.16-55.17-55.16"/>
  </clipPath>
  <clipPath id="clipPath5117-0" clipPathUnits="userSpaceOnUse">
   <path id="path5119-3" d="m2474.3 3865.6v1823.9c0 30.46 24.7 55.16 55.16 55.16 30.47 0 55.17-24.7 55.17-55.16v-1763.8c-43.33-7.14-81.89-28.96-110.33-60.14"/>
  </clipPath>
  <clipPath id="clipPath5097-6" clipPathUnits="userSpaceOnUse">
   <path id="path5099-3" d="m2689.1 5941.9h-73.44c-154.37 0-279.96-125.59-279.96-279.96v-4205.5c-218.11-116.22-356.07-343.22-356.07-593.7 0-370.96 301.79-672.75 672.75-672.75 370.95 0 672.74 301.79 672.74 672.75 0 250.48-137.95 477.48-356.07 593.7v4205.5c0 154.37-125.59 279.96-279.95 279.96m0-88.58c105.26 0 191.38-86.12 191.38-191.38v-4261.2c209.29-88.85 356.07-296.25 356.07-537.94 0-322.63-261.54-584.18-584.17-584.18-322.64 0-584.18 261.55-584.18 584.18 0 241.69 146.79 449.09 356.07 537.94v4261.2c0 105.26 86.12 191.38 191.39 191.38h73.44"/>
  </clipPath>
  <clipPath id="clipPath5083-5" clipPathUnits="userSpaceOnUse">
   <path id="path5085-5" d="m2652.4 955.89c-189.16 0-342.5 97.219-342.5 217.15 0 119.92 153.34 217.14 342.5 217.14 139.65 0 259.77-52.99 313.09-128.99 18.9-26.94 29.4-56.76 29.4-88.15 0-66.67-47.4-126.33-121.99-166.16-59.58-31.81-136.51-50.989-220.5-50.989"/>
  </clipPath>
  <clipPath id="clipPath5067-4" clipPathUnits="userSpaceOnUse">
   <path id="path5069-7" d="m2872.9 1006.9c74.59 39.83 121.99 99.49 121.99 166.16v-1.02c-0.48-66.26-47.76-125.51-121.99-165.14m121.99 166.16c0 31.39-10.5 61.21-29.4 88.15 18.7-26.65 29.18-56.13 29.4-87.14v-1.01"/>
  </clipPath>
  <radialGradient id="radialGradient5071-6" gradientUnits="userSpaceOnUse" cy="0" cx="0" gradientTransform="matrix(584.18 0 0 -584.18 2652.4 862.75)" r="1">
   <stop id="stop5073-5" stop-color="#a6d71c" offset="0"/>
   <stop id="stop5075-6" stop-color="#26803a" offset="1"/>
  </radialGradient>
  <clipPath id="clipPath5051-9" clipPathUnits="userSpaceOnUse">
   <path id="path5053-3" d="m2994.9 1172v1.02 1.01-1.01-1.02"/>
  </clipPath>
  <clipPath id="clipPath5035-2" clipPathUnits="userSpaceOnUse">
   <path id="path5037-5" d="m3236.5 862.75c0-322.64-261.54-584.18-584.17-584.18-322.64 0-584.18 261.54-584.18 584.18 0 322.63 261.54 584.18 584.18 584.18 322.63 0 584.17-261.55 584.17-584.18"/>
  </clipPath>
  <clipPath id="clipPath5019-4" clipPathUnits="userSpaceOnUse">
   <path id="path5021-3" d="m2880.5 1400.7c-70.08 29.76-147.17 46.22-228.1 46.22-80.94 0-158.03-16.46-228.11-46.22v2336.2c0 49.44 19 94.66 50.06 128.72v-2278.8c0-30.47 24.7-55.16 55.16-55.16 30.47 0 55.17 24.69 55.17 55.16v2338.9c10.09 1.66 20.45 2.52 31 2.52h73.44c105.26 0 191.38-86.12 191.38-191.38v-2336.2"/>
  </clipPath>
  <clipPath id="clipPath5001-8" clipPathUnits="userSpaceOnUse">
   <path id="path5003-6" d="m2880.5 3736.9c0 105.26-86.12 191.38-191.38 191.38h-73.44c-10.55 0-20.91-0.86-31-2.52v1763.8c0 30.46-24.7 55.16-55.17 55.16-30.46 0-55.16-24.7-55.16-55.16v-1823.9c-31.06-34.06-50.06-79.28-50.06-128.72v1925c0 105.26 86.12 191.38 191.39 191.38h73.44c105.26 0 191.38-86.12 191.38-191.38v-1925"/>
  </clipPath>
 </defs>
 <g id="layer1" transform="translate(-257.06 -200.97)">
  <g fill="#fff">
   <path id="path4715" d="m345.58 948.14c-48.89 0-88.522-10.632-88.522-23.75 0-7.0864 11.571-13.449 29.919-17.8 0.035 0.0298 0.0675 0.0585 0.1025 0.0897-18.22 4.335-29.7 10.663-29.7 17.71 0 13.069 39.489 23.664 88.201 23.664 48.711 0 88.201-10.595 88.201-23.664 0-7.0474-11.481-13.375-29.701-17.71 0.035-0.0312 0.067-0.06 0.1025-0.0897 18.348 4.351 29.919 10.713 29.919 17.8 0 13.118-39.632 23.75-88.521 23.75"/>
   <path id="path4717" d="m345.58 948.05c-48.712 0-88.201-10.595-88.201-23.664 0-7.0474 11.48-13.375 29.7-17.71 0.0337 0.0289 0.07 0.0611 0.1025 0.0914-18.089 4.3174-29.482 10.611-29.482 17.619 0 13.021 39.346 23.578 87.881 23.578s87.88-10.557 87.88-23.578c0-7.0074-11.394-13.301-29.482-17.619 0.033-0.0302 0.07-0.0625 0.1025-0.0914 18.22 4.335 29.701 10.663 29.701 17.71 0 13.069-39.49 23.664-88.201 23.664"/>
   <path id="path4719" d="m345.58 947.96c-48.535 0-87.881-10.557-87.881-23.578 0-7.0074 11.394-13.301 29.482-17.619 0.0362 0.0297 0.0687 0.0586 0.10375 0.0899-17.96 4.3026-29.265 10.562-29.265 17.529 0 12.974 39.201 23.491 87.56 23.491 48.358 0 87.559-10.518 87.559-23.491 0-6.9672-11.305-13.226-29.265-17.529 0.036-0.0312 0.069-0.0601 0.1038-0.0899 18.089 4.3174 29.482 10.611 29.482 17.619 0 13.021-39.345 23.578-87.88 23.578"/>
   <path id="path4721" d="m345.58 947.88c-48.359 0-87.56-10.518-87.56-23.491 0-6.9672 11.305-13.226 29.265-17.529 0.0325 0.0288 0.07 0.061 0.10375 0.0897-17.83 4.2866-29.048 10.511-29.048 17.439 0 12.926 39.058 23.406 87.239 23.406 48.18 0 87.239-10.48 87.239-23.406 0-6.9278-11.219-13.152-29.048-17.439 0.033-0.0287 0.07-0.061 0.1025-0.0897 17.96 4.3026 29.265 10.562 29.265 17.529 0 12.974-39.201 23.491-87.559 23.491"/>
   <path id="path4723" d="m345.58 947.79c-48.181 0-87.239-10.48-87.239-23.406 0-6.9278 11.218-13.152 29.048-17.439 0.035 0.0312 0.0675 0.0601 0.10375 0.0914-17.701 4.269-28.831 10.459-28.831 17.348 0 12.879 38.915 23.32 86.919 23.32 48.003 0 86.918-10.441 86.918-23.32 0-6.8886-11.13-13.079-28.831-17.348 0.036-0.0312 0.069-0.0601 0.105-0.0914 17.829 4.2866 29.048 10.511 29.048 17.439 0 12.926-39.059 23.406-87.239 23.406"/>
   <path id="path4725" d="m345.58 947.71c-48.004 0-86.919-10.441-86.919-23.32 0-6.8886 11.13-13.079 28.831-17.348 0.035 0.0312 0.0687 0.06 0.10375 0.0902-17.569 4.2526-28.614 10.41-28.614 17.257 0 12.831 38.77 23.234 86.598 23.234 47.826 0 86.598-10.403 86.598-23.234 0-6.8476-11.046-13.005-28.615-17.257 0.035-0.0303 0.069-0.059 0.1037-0.0902 17.701 4.269 28.831 10.459 28.831 17.348 0 12.879-38.915 23.32-86.918 23.32"/>
   <path id="path4727" d="m345.58 947.62c-47.828 0-86.598-10.403-86.598-23.234 0-6.8476 11.045-13.005 28.614-17.257 0.0337 0.0299 0.0712 0.0625 0.105 0.0914-17.441 4.2349-28.399 10.357-28.399 17.166 0 12.784 38.628 23.147 86.278 23.147 47.649 0 86.276-10.364 86.276-23.147 0-6.8086-10.958-12.931-28.399-17.166 0.034-0.0289 0.071-0.0615 0.105-0.0914 17.569 4.2525 28.615 10.41 28.615 17.257 0 12.831-38.771 23.234-86.598 23.234"/>
   <path id="path4729" d="m345.58 947.53c-47.65 0-86.278-10.364-86.278-23.147 0-6.8086 10.958-12.931 28.399-17.166 0.035 0.0308 0.0687 0.0595 0.105 0.0908-17.311 4.2187-28.182 10.307-28.182 17.075 0 12.736 38.484 23.061 85.956 23.061 47.471 0 85.955-10.325 85.955-23.061 0-6.7685-10.868-12.856-28.181-17.075 0.035-0.0312 0.069-0.06 0.1038-0.0908 17.441 4.2349 28.399 10.357 28.399 17.166 0 12.784-38.628 23.147-86.276 23.147"/>
   <path id="path4731" d="m345.58 947.45c-47.472 0-85.956-10.325-85.956-23.061 0-6.7685 10.871-12.856 28.182-17.075 0.035 0.0304 0.0687 0.0601 0.105 0.0904-17.184 4.2021-27.966 10.256-27.966 16.985 0 12.688 38.34 22.976 85.635 22.976s85.635-10.288 85.635-22.976c0-6.729-10.784-12.783-27.968-16.985 0.036-0.0303 0.07-0.06 0.1062-0.0904 17.314 4.2188 28.181 10.307 28.181 17.075 0 12.736-38.484 23.061-85.955 23.061"/>
   <path id="path4733" d="m345.58 947.36c-47.295 0-85.635-10.288-85.635-22.976 0-6.729 10.782-12.783 27.966-16.985 0.0337 0.0289 0.0712 0.0625 0.105 0.0914-17.054 4.1845-27.751 10.204-27.751 16.893 0 12.641 38.196 22.89 85.315 22.89 47.118 0 85.314-10.249 85.314-22.89 0-6.689-10.698-12.709-27.751-16.894 0.034-0.0289 0.072-0.0625 0.105-0.0914 17.184 4.2021 27.968 10.256 27.968 16.985 0 12.688-38.34 22.976-85.635 22.976"/>
   <path id="path4735" d="m345.58 947.28c-47.119 0-85.315-10.249-85.315-22.89 0-6.689 10.698-12.709 27.751-16.894 0.0362 0.0298 0.07 0.0595 0.10625 0.0897-16.925 4.169-27.536 10.154-27.536 16.804 0 12.594 38.052 22.804 84.994 22.804 46.94 0 84.994-10.21 84.994-22.804 0-6.6499-10.612-12.635-27.538-16.804 0.036-0.0303 0.07-0.06 0.1063-0.0897 17.054 4.1845 27.751 10.204 27.751 16.894 0 12.641-38.196 22.89-85.314 22.89"/>
   <path id="path4737" d="m345.58 947.19c-46.941 0-84.994-10.21-84.994-22.804 0-6.6499 10.611-12.635 27.536-16.804 0.035 0.0312 0.07 0.0601 0.10625 0.0914-16.796 4.1514-27.322 10.102-27.322 16.712 0 12.546 37.91 22.717 84.674 22.717 46.763 0 84.673-10.171 84.673-22.717 0-6.6099-10.526-12.561-27.322-16.712 0.036-0.0312 0.071-0.0601 0.1062-0.0914 16.925 4.169 27.538 10.154 27.538 16.804 0 12.594-38.054 22.804-84.994 22.804"/>
   <path id="path4739" d="m345.58 947.1c-46.764 0-84.674-10.171-84.674-22.717 0-6.6099 10.526-12.561 27.322-16.712 0.0362 0.0297 0.07 0.06 0.10625 0.0899-16.669 4.1352-27.108 10.053-27.108 16.622 0 12.499 37.766 22.631 84.352 22.631s84.351-10.133 84.351-22.631c0-6.5699-10.439-12.487-27.108-16.622 0.036-0.0299 0.071-0.0601 0.1063-0.0899 16.796 4.1514 27.322 10.102 27.322 16.712 0 12.546-37.91 22.717-84.673 22.717"/>
   <path id="path4741" d="m345.58 947.02c-46.586 0-84.352-10.133-84.352-22.631 0-6.5699 10.439-12.487 27.108-16.622 0.0362 0.0312 0.0712 0.0615 0.1075 0.0913-16.541 4.1176-26.894 10-26.894 16.531 0 12.451 37.621 22.545 84.031 22.545 46.409 0 84.031-10.094 84.031-22.545 0-6.5312-10.354-12.414-26.895-16.531 0.036-0.0298 0.071-0.06 0.1075-0.0913 16.669 4.1352 27.108 10.053 27.108 16.622 0 12.499-37.765 22.631-84.351 22.631"/>
   <path id="path4743" d="m345.58 946.93c-46.41 0-84.031-10.094-84.031-22.545 0-6.5312 10.352-12.414 26.894-16.531 0.035 0.0297 0.0712 0.06 0.1075 0.0899-16.415 4.1015-26.681 9.9501-26.681 16.441 0 12.404 37.479 22.459 83.711 22.459 46.231 0 83.71-10.055 83.71-22.459 0-6.4912-10.266-12.34-26.68-16.441 0.035-0.0299 0.071-0.0601 0.1062-0.0899 16.541 4.1176 26.895 10 26.895 16.531 0 12.451-37.622 22.545-84.031 22.545"/>
   <path id="path4745" d="m345.58 946.84c-46.232 0-83.711-10.055-83.711-22.459 0-6.4912 10.266-12.34 26.681-16.441 0.035 0.0312 0.0712 0.0615 0.1075 0.0912-16.289 4.084-26.468 9.8975-26.468 16.35 0 12.356 37.335 22.373 83.39 22.373s83.389-10.016 83.389-22.373c0-6.4526-10.179-12.266-26.466-16.35 0.035-0.0297 0.071-0.06 0.1075-0.0912 16.414 4.1015 26.68 9.9501 26.68 16.441 0 12.404-37.479 22.459-83.71 22.459"/>
   <path id="path4747" d="m345.58 946.76c-46.055 0-83.39-10.016-83.39-22.373 0-6.4526 10.179-12.266 26.468-16.35 0.035 0.0303 0.0712 0.0601 0.1075 0.0914-16.159 4.0664-26.254 9.8461-26.254 16.259 0 12.309 37.19 22.288 83.069 22.288 45.878 0 83.069-9.979 83.069-22.288 0-6.4126-10.096-12.192-26.255-16.259 0.036-0.0312 0.072-0.0611 0.1088-0.0914 16.288 4.084 26.466 9.8975 26.466 16.35 0 12.356-37.334 22.373-83.389 22.373"/>
   <path id="path4749" d="m345.58 946.67c-45.879 0-83.069-9.979-83.069-22.288 0-6.4126 10.095-12.192 26.254-16.259 0.0362 0.0303 0.0725 0.06 0.10875 0.0898-16.031 4.0489-26.042 9.7965-26.042 16.169 0 12.261 37.048 22.201 82.749 22.201 45.7 0 82.748-9.94 82.748-22.201 0-6.3725-10.011-12.12-26.042-16.169 0.036-0.0298 0.072-0.0595 0.1087-0.0898 16.159 4.0664 26.255 9.8461 26.255 16.259 0 12.309-37.191 22.288-83.069 22.288"/>
   <path id="path4751" d="m345.58 946.59c-45.701 0-82.749-9.94-82.749-22.201 0-6.3725 10.011-12.12 26.042-16.169 0.0363 0.0304 0.0725 0.0616 0.10875 0.0914-15.906 4.0312-25.83 9.7441-25.83 16.078 0 12.214 36.904 22.115 82.428 22.115 45.523 0 82.426-9.9009 82.426-22.115 0-6.3335-9.9237-12.046-25.83-16.078 0.036-0.0298 0.074-0.061 0.1088-0.0914 16.031 4.0489 26.042 9.7965 26.042 16.169 0 12.261-37.048 22.201-82.748 22.201"/>
   <path id="path4753" d="m345.58 946.5c-45.524 0-82.428-9.9009-82.428-22.115 0-6.3335 9.9238-12.046 25.83-16.078 0.0362 0.0303 0.0725 0.0615 0.10875 0.0913-15.779 4.0137-25.619 9.6914-25.619 15.986 0 12.166 36.761 22.029 82.108 22.029 45.346 0 82.106-9.8628 82.106-22.029 0-6.2949-9.84-11.973-25.619-15.986 0.036-0.0297 0.072-0.061 0.1087-0.0913 15.906 4.0312 25.83 9.7441 25.83 16.078 0 12.214-36.904 22.115-82.426 22.115"/>
   <path id="path4755" d="m345.58 946.41c-45.346 0-82.108-9.8628-82.108-22.029 0-6.2949 9.84-11.973 25.619-15.986 0.0363 0.0304 0.0738 0.0601 0.11 0.0899-15.652 3.9976-25.408 9.6416-25.408 15.896 0 12.119 36.616 21.942 81.786 21.942 45.169 0 81.785-9.8237 81.785-21.942 0-6.2549-9.7538-11.899-25.406-15.896 0.036-0.0297 0.072-0.0595 0.1088-0.0899 15.779 4.0138 25.619 9.6915 25.619 15.986 0 12.166-36.76 22.029-82.106 22.029"/>
   <path id="path4757" d="m345.58 946.33c-45.17 0-81.786-9.8237-81.786-21.942 0-6.2549 9.755-11.899 25.408-15.896 0.0362 0.0303 0.0725 0.0615 0.10875 0.0914-15.526 3.9799-25.195 9.5889-25.195 15.805 0 12.071 36.472 21.856 81.465 21.856 44.991 0 81.465-9.7852 81.465-21.856 0-6.2162-9.67-11.825-25.196-15.805 0.036-0.0299 0.074-0.0611 0.11-0.0914 15.652 3.9976 25.406 9.6416 25.406 15.896 0 12.119-36.616 21.942-81.785 21.942"/>
   <path id="path4759" d="m345.58 946.24c-44.992 0-81.465-9.7852-81.465-21.856 0-6.2162 9.6688-11.825 25.195-15.805 0.0363 0.0302 0.075 0.0615 0.11125 0.0912-15.399 3.9614-24.986 9.5377-24.986 15.714 0 12.024 36.33 21.77 81.145 21.77 44.814 0 81.144-9.7461 81.144-21.77 0-6.1762-9.5875-11.752-24.986-15.714 0.038-0.0297 0.075-0.061 0.1112-0.0912 15.526 3.9799 25.196 9.5889 25.196 15.805 0 12.071-36.474 21.856-81.465 21.856"/>
   <path id="path4761" d="m345.58 946.16c-44.815 0-81.145-9.7461-81.145-21.77 0-6.1762 9.5875-11.752 24.986-15.714 0.0362 0.0289 0.0737 0.0601 0.11 0.0904-15.272 3.9448-24.775 9.4858-24.775 15.624 0 11.976 36.186 21.685 80.824 21.685s80.823-9.709 80.823-21.685c0-6.1378-9.5025-11.679-24.775-15.624 0.036-0.0303 0.074-0.0615 0.11-0.0904 15.399 3.9614 24.986 9.5376 24.986 15.714 0 12.024-36.33 21.77-81.144 21.77"/>
  </g>
  <g>
   <path id="path4763" d="m345.58 946.07c-44.638 0-80.824-9.709-80.824-21.685 0-6.1378 9.5025-11.679 24.775-15.624 0.0388 0.0308 0.0725 0.0595 0.11125 0.0907-15.146 3.9278-24.566 9.4351-24.566 15.533 0 11.929 36.042 21.599 80.504 21.599 44.46 0 80.503-9.6699 80.503-21.599 0-6.0976-9.42-11.605-24.566-15.533 0.039-0.0312 0.072-0.06 0.1113-0.0907 15.272 3.9448 24.775 9.4858 24.775 15.624 0 11.976-36.185 21.685-80.823 21.685" fill="#feffff"/>
   <path id="path4765" d="m345.58 945.98c-44.461 0-80.504-9.6699-80.504-21.599 0-6.0976 9.42-11.605 24.566-15.533 0.0362 0.0303 0.075 0.0615 0.11125 0.0914-15.022 3.9086-24.356 9.3827-24.356 15.441 0 11.881 35.899 21.513 80.182 21.513s80.181-9.6314 80.181-21.513c0-6.0586-9.3337-11.533-24.356-15.441 0.036-0.0299 0.075-0.0611 0.1112-0.0914 15.146 3.9278 24.566 9.4351 24.566 15.533 0 11.929-36.042 21.599-80.503 21.599" fill="#feffff"/>
   <path id="path4767" d="m345.58 945.9c-44.284 0-80.182-9.6314-80.182-21.513 0-6.0586 9.3338-11.533 24.356-15.441 0.0362 0.0287 0.075 0.0615 0.11125 0.0902-14.895 3.8921-24.146 9.3326-24.146 15.351 0 11.834 35.755 21.426 79.861 21.426s79.861-9.5923 79.861-21.426c0-6.0185-9.2512-11.459-24.148-15.351 0.036-0.0287 0.075-0.0615 0.1113-0.0902 15.022 3.9086 24.356 9.3828 24.356 15.441 0 11.881-35.899 21.513-80.181 21.513" fill="#fefeff"/>
   <path id="path4769" d="m345.58 945.81c-44.106 0-79.861-9.5923-79.861-21.426 0-6.0185 9.2512-11.459 24.146-15.351 0.0387 0.0312 0.0738 0.0601 0.1125 0.0909-14.77 3.8755-23.939 9.2802-23.939 15.26 0 11.786 35.611 21.34 79.541 21.34 43.929 0 79.54-9.5537 79.54-21.34 0-5.98-9.1675-11.385-23.939-15.26 0.039-0.0308 0.074-0.0596 0.1125-0.0909 14.896 3.8921 24.148 9.3326 24.148 15.351 0 11.834-35.755 21.426-79.861 21.426" fill="#fefefe"/>
   <path id="path4771" d="m345.58 945.73c-43.93 0-79.541-9.5537-79.541-21.34 0-5.98 9.1688-11.385 23.939-15.26 0.0362 0.0303 0.0762 0.0615 0.1125 0.0913-14.645 3.8565-23.73 9.2276-23.73 15.169 0 11.739 35.468 21.255 79.22 21.255 43.751 0 79.219-9.5161 79.219-21.255 0-5.9414-9.0837-11.312-23.73-15.169 0.036-0.0298 0.076-0.061 0.1125-0.0913 14.771 3.8755 23.939 9.2802 23.939 15.26 0 11.786-35.611 21.34-79.54 21.34" fill="#fefefe"/>
   <path id="path4773" d="m345.58 945.64c-43.752 0-79.22-9.5161-79.22-21.255 0-5.9414 9.085-11.312 23.73-15.169 0.0388 0.0312 0.0738 0.0591 0.1125 0.0904-14.521 3.8399-23.522 9.1772-23.522 15.079 0 11.691 35.325 21.169 78.9 21.169 43.574 0 78.899-9.4776 78.899-21.169 0-5.9014-9.0012-11.239-23.522-15.079 0.039-0.0312 0.074-0.0591 0.1125-0.0904 14.646 3.8565 23.73 9.2276 23.73 15.169 0 11.739-35.468 21.255-79.219 21.255" fill="#fdfefe"/>
   <path id="path4775" d="m345.58 945.55c-43.575 0-78.9-9.4776-78.9-21.169 0-5.9014 9.0012-11.239 23.522-15.079 0.0375 0.0297 0.0775 0.0625 0.11375 0.0914-14.395 3.8208-23.315 9.125-23.315 14.987 0 11.644 35.181 21.083 78.579 21.083s78.578-9.439 78.578-21.083c0-5.8622-8.92-11.166-23.315-14.987 0.038-0.0289 0.076-0.0616 0.1137-0.0914 14.521 3.8399 23.522 9.1772 23.522 15.079 0 11.691-35.325 21.169-78.899 21.169" fill="#fdfefe"/>
   <path id="path4777" d="m345.58 945.47c-43.398 0-78.579-9.439-78.579-21.083 0-5.8622 8.92-11.166 23.315-14.987 0.0387 0.0312 0.075 0.06 0.11375 0.0907-14.271 3.8042-23.108 9.0728-23.108 14.896 0 11.596 35.036 20.996 78.258 20.996 43.22 0 78.258-9.3999 78.258-20.996 0-5.8238-8.8363-11.092-23.109-14.896 0.039-0.0308 0.075-0.0595 0.1138-0.0907 14.395 3.8208 23.315 9.125 23.315 14.987 0 11.644-35.18 21.083-78.578 21.083" fill="#fdfdfe"/>
   <path id="path4779" d="m345.58 945.38c-43.221 0-78.258-9.3999-78.258-20.996 0-5.8238 8.8362-11.092 23.108-14.896 0.0362 0.0289 0.0775 0.0615 0.11375 0.0914-14.146 3.7851-22.901 9.0214-22.901 14.805 0 11.549 34.894 20.91 77.938 20.91 43.043 0 77.936-9.3613 77.936-20.91 0-5.7838-8.755-11.02-22.901-14.805 0.036-0.0299 0.078-0.0625 0.1137-0.0914 14.272 3.8042 23.109 9.0728 23.109 14.896 0 11.596-35.038 20.996-78.258 20.996" fill="#fdfdfd"/>
   <path id="path4781" d="m345.58 945.3c-43.044 0-77.938-9.3613-77.938-20.91 0-5.7838 8.755-11.02 22.901-14.805 0.0387 0.0312 0.0762 0.06 0.115 0.0902-14.025 3.7686-22.695 8.9697-22.695 14.715 0 11.501 34.75 20.824 77.616 20.824 42.865 0 77.615-9.3223 77.615-20.824 0-5.7451-8.67-10.946-22.695-14.715 0.04-0.0303 0.076-0.059 0.115-0.0902 14.146 3.7851 22.901 9.0214 22.901 14.805 0 11.549-34.894 20.91-77.936 20.91" fill="#fdfdfd"/>
   <path id="path4783" d="m345.58 945.21c-42.866 0-77.616-9.3223-77.616-20.824 0-5.7451 8.67-10.946 22.695-14.715 0.0362 0.0299 0.0775 0.0625 0.115 0.0914-13.901 3.75-22.49 8.9175-22.49 14.624 0 11.454 34.608 20.737 77.296 20.737 42.689 0 77.295-9.2837 77.295-20.737 0-5.706-8.5888-10.874-22.49-14.624 0.038-0.0289 0.079-0.0615 0.115-0.0914 14.025 3.7686 22.695 8.9697 22.695 14.715 0 11.501-34.75 20.824-77.615 20.824" fill="#fcfdfd"/>
   <path id="path4785" d="m345.58 945.12c-42.689 0-77.296-9.2837-77.296-20.737 0-5.706 8.5888-10.874 22.49-14.624 0.0387 0.0312 0.0763 0.0595 0.115 0.0907-13.778 3.7315-22.284 8.8652-22.284 14.533 0 11.406 34.462 20.652 76.975 20.652 42.511 0 76.974-9.2461 76.974-20.652 0-5.6675-8.5062-10.801-22.284-14.533 0.04-0.0312 0.076-0.0595 0.115-0.0907 13.901 3.75 22.49 8.9175 22.49 14.624 0 11.454-34.606 20.737-77.295 20.737" fill="#fcfdfd"/>
   <path id="path4787" d="m345.58 945.04c-42.512 0-76.975-9.2461-76.975-20.652 0-5.6675 8.5062-10.801 22.284-14.533 0.0387 0.0312 0.0762 0.0601 0.11625 0.0914-13.652 3.7139-22.079 8.8139-22.079 14.441 0 11.359 34.319 20.566 76.654 20.566 42.334 0 76.654-9.2075 76.654-20.566 0-5.6275-8.4275-10.728-22.079-14.441 0.039-0.0312 0.076-0.0601 0.115-0.0914 13.778 3.7315 22.284 8.8652 22.284 14.533 0 11.406-34.462 20.652-76.974 20.652" fill="#fcfcfd"/>
   <path id="path4789" d="m345.58 944.95c-42.335 0-76.654-9.2075-76.654-20.566 0-5.6275 8.4262-10.728 22.079-14.441 0.0362 0.0287 0.0787 0.0625 0.115 0.0912-13.529 3.6954-21.874 8.7612-21.874 14.35 0 11.311 34.176 20.48 76.334 20.48s76.333-9.1689 76.333-20.48c0-5.5889-8.345-10.655-21.874-14.35 0.036-0.0287 0.079-0.0625 0.1163-0.0912 13.651 3.7139 22.079 8.8139 22.079 14.441 0 11.359-34.32 20.566-76.654 20.566" fill="#fcfcfc"/>
   <path id="path4791" d="m345.58 944.87c-42.158 0-76.334-9.1689-76.334-20.48 0-5.5889 8.345-10.655 21.874-14.35 0.04 0.0303 0.0775 0.0601 0.1175 0.0914-13.405 3.6762-21.67 8.709-21.67 14.259 0 11.264 34.031 20.394 76.012 20.394 41.98 0 76.011-9.1299 76.011-20.394 0-5.5498-8.265-10.582-21.669-14.259 0.039-0.0312 0.076-0.0611 0.1162-0.0914 13.529 3.6954 21.874 8.7612 21.874 14.35 0 11.311-34.175 20.48-76.333 20.48" fill="#fbfcfc"/>
   <path id="path4793" d="m345.58 944.78c-41.981 0-76.012-9.1299-76.012-20.394 0-5.5498 8.265-10.582 21.67-14.259 0.0387 0.0298 0.0775 0.06 0.11625 0.0898-13.284 3.6602-21.465 8.6578-21.465 14.169 0 11.216 33.888 20.308 75.691 20.308s75.691-9.0914 75.691-20.308c0-5.5112-8.1825-10.509-21.466-14.169 0.039-0.0298 0.078-0.06 0.1175-0.0898 13.404 3.6762 21.669 8.709 21.669 14.259 0 11.264-34.031 20.394-76.011 20.394" fill="#fbfcfc"/>
   <path id="path4795" d="m345.58 944.69c-41.804 0-75.691-9.0914-75.691-20.308 0-5.5112 8.1812-10.509 21.465-14.169 0.04 0.0312 0.0787 0.0616 0.1175 0.0914-13.161 3.6411-21.262 8.605-21.262 14.078 0 11.169 33.745 20.221 75.371 20.221s75.37-9.0522 75.37-20.221c0-5.4726-8.1013-10.436-21.262-14.078 0.04-0.0298 0.078-0.0601 0.1175-0.0914 13.284 3.6602 21.466 8.6578 21.466 14.169 0 11.216-33.889 20.308-75.691 20.308" fill="#fbfbfb"/>
   <path id="path4797" d="m345.58 944.61c-41.626 0-75.371-9.0522-75.371-20.221 0-5.4726 8.1012-10.436 21.262-14.078 0.04 0.0312 0.0787 0.0615 0.1175 0.0913-13.039 3.6226-21.059 8.5528-21.059 13.986 0 11.12 33.6 20.136 75.05 20.136 41.449 0 75.049-9.0161 75.049-20.136 0-5.4336-8.02-10.364-21.059-13.986 0.039-0.0297 0.079-0.06 0.1175-0.0913 13.161 3.6411 21.262 8.605 21.262 14.078 0 11.169-33.744 20.221-75.37 20.221" fill="#fbfbfb"/>
   <path id="path4799" d="m345.58 944.52c-41.45 0-75.05-9.0161-75.05-20.136 0-5.4336 8.02-10.364 21.059-13.986 0.04 0.0304 0.0788 0.0616 0.11875 0.0914-12.918 3.604-20.858 8.5-20.858 13.895 0 11.072 33.458 20.05 74.73 20.05 41.271 0 74.729-8.9776 74.729-20.05 0-5.395-7.94-10.291-20.858-13.895 0.04-0.0298 0.079-0.061 0.1188-0.0914 13.039 3.6226 21.059 8.5528 21.059 13.986 0 11.12-33.6 20.136-75.049 20.136" fill="#fafbfb"/>
   <path id="path4801" d="m345.58 944.44c-41.272 0-74.73-8.9776-74.73-20.05 0-5.395 7.94-10.291 20.858-13.895 0.04 0.0297 0.0788 0.0615 0.11875 0.0912-12.794 3.585-20.655 8.4488-20.655 13.804 0 11.025 33.314 19.964 74.409 19.964 41.094 0 74.408-8.939 74.408-19.964 0-5.3565-7.8588-10.219-20.655-13.804 0.04-0.0298 0.08-0.0615 0.1187-0.0912 12.918 3.604 20.858 8.5 20.858 13.895 0 11.072-33.458 20.05-74.729 20.05" fill="#fafbfb"/>
   <path id="path4803" d="m345.58 944.35c-41.095 0-74.409-8.939-74.409-19.964 0-5.355 7.8612-10.219 20.655-13.804 0.04 0.0299 0.0787 0.0611 0.11875 0.0914-12.672 3.5659-20.452 8.396-20.452 13.712 0 10.978 33.17 19.877 74.088 19.877s74.088-8.8999 74.088-19.877c0-5.3164-7.7813-10.146-20.454-13.712 0.04-0.0302 0.08-0.0615 0.1188-0.0914 12.796 3.585 20.655 8.4472 20.655 13.804 0 11.025-33.314 19.964-74.408 19.964" fill="#fafafa"/>
   <path id="path4805" d="m345.58 944.26c-40.918 0-74.088-8.8999-74.088-19.877 0-5.3164 7.78-10.146 20.452-13.712 0.04 0.0297 0.08 0.061 0.12 0.0913-12.55 3.5474-20.252 8.3438-20.252 13.621 0 10.93 33.026 19.791 73.768 19.791 40.74 0 73.766-8.8609 73.766-19.791 0-5.2774-7.7012-10.074-20.252-13.621 0.04-0.0303 0.08-0.0615 0.12-0.0913 12.672 3.5659 20.454 8.396 20.454 13.712 0 10.978-33.17 19.877-74.088 19.877" fill="#fafafa"/>
   <path id="path4807" d="m345.58 944.18c-40.741 0-73.768-8.8609-73.768-19.791 0-5.2774 7.7025-10.074 20.252-13.621 0.04 0.0299 0.08 0.0611 0.12 0.0914-12.431 3.5282-20.051 8.291-20.051 13.53 0 10.882 32.882 19.705 73.446 19.705 40.563 0 73.445-8.8227 73.445-19.705 0-5.2388-7.6188-10.002-20.051-13.53 0.04-0.0303 0.081-0.0615 0.12-0.0914 12.551 3.5474 20.252 8.3438 20.252 13.621 0 10.93-33.026 19.791-73.766 19.791" fill="#f9fafa"/>
   <path id="path4809" d="m345.58 944.09c-40.564 0-73.446-8.8227-73.446-19.705 0-5.2388 7.62-10.002 20.051-13.53 0.04 0.0298 0.08 0.061 0.12 0.0907-12.31 3.5102-19.851 8.2388-19.851 13.439 0 10.835 32.74 19.619 73.126 19.619 40.385 0 73.125-8.7836 73.125-19.619 0-5.2002-7.5413-9.9288-19.851-13.439 0.04-0.0297 0.081-0.061 0.12-0.0907 12.432 3.5282 20.051 8.291 20.051 13.53 0 10.882-32.882 19.705-73.445 19.705" fill="#f9f9f9"/>
   <path id="path4811" d="m345.58 944c-40.386 0-73.126-8.7836-73.126-19.619 0-5.2002 7.5412-9.9288 19.851-13.439 0.04 0.0303 0.0813 0.0615 0.12125 0.0914-12.188 3.4911-19.651 8.1865-19.651 13.348 0 10.788 32.596 19.534 72.805 19.534s72.804-8.7461 72.804-19.534c0-5.1611-7.4637-9.8565-19.651-13.348 0.04-0.0312 0.081-0.0611 0.1212-0.0914 12.31 3.5102 19.851 8.2388 19.851 13.439 0 10.835-32.74 19.619-73.125 19.619" fill="#f9f9f9"/>
   <path id="path4813" d="m345.58 943.92c-40.209 0-72.805-8.7461-72.805-19.534 0-5.1611 7.4638-9.8565 19.651-13.348 0.0412 0.0312 0.0788 0.059 0.12125 0.0912-12.068 3.4726-19.451 8.1339-19.451 13.256 0 10.74 32.451 19.448 72.484 19.448 40.031 0 72.484-8.7075 72.484-19.448 0-5.1225-7.385-9.7838-19.452-13.256 0.043-0.0322 0.08-0.06 0.1213-0.0912 12.188 3.4911 19.651 8.1865 19.651 13.348 0 10.788-32.595 19.534-72.804 19.534" fill="#f8f9f9"/>
   <path id="path4815" d="m345.58 943.83c-40.032 0-72.484-8.7075-72.484-19.448 0-5.1225 7.3838-9.7838 19.451-13.256 0.04 0.0303 0.0813 0.0615 0.12125 0.0914-11.949 3.4536-19.252 8.08-19.252 13.165 0 10.692 32.309 19.361 72.164 19.361 39.854 0 72.163-8.669 72.163-19.361 0-5.085-7.3038-9.7114-19.252-13.165 0.04-0.0299 0.081-0.0611 0.1212-0.0914 12.068 3.4726 19.452 8.1339 19.452 13.256 0 10.74-32.452 19.448-72.484 19.448" fill="#f8f8f8"/>
   <path id="path4817" d="m345.58 943.75c-39.855 0-72.164-8.669-72.164-19.361 0-5.085 7.3038-9.7114 19.252-13.165 0.04 0.0288 0.0825 0.0615 0.1225 0.0913-11.828 3.4351-19.054 8.0274-19.054 13.074 0 10.645 32.165 19.275 71.842 19.275 39.676 0 71.841-8.6299 71.841-19.275 0-5.0464-7.225-9.6386-19.054-13.074 0.04-0.0298 0.082-0.0625 0.1225-0.0913 11.949 3.4536 19.252 8.08 19.252 13.165 0 10.692-32.309 19.361-72.163 19.361" fill="#f8f8f8"/>
   <path id="path4819" d="m345.58 943.66c-39.678 0-71.842-8.6299-71.842-19.275 0-5.0464 7.2262-9.6386 19.054-13.074 0.0425 0.0312 0.08 0.0586 0.1225 0.0914-11.708 3.416-18.856 7.975-18.856 12.982 0 10.598 32.021 19.189 71.522 19.189 39.5 0 71.521-8.5913 71.521-19.189 0-5.0074-7.1487-9.5664-18.856-12.982 0.043-0.0327 0.08-0.0601 0.1225-0.0914 11.829 3.4351 19.054 8.0274 19.054 13.074 0 10.645-32.165 19.275-71.841 19.275" fill="#f7f8f8"/>
   <path id="path4821" d="m345.58 943.57c-39.501 0-71.522-8.5913-71.522-19.189 0-5.0074 7.1488-9.5664 18.856-12.982 0.04 0.0288 0.0837 0.061 0.12375 0.0913-11.589 3.3975-18.659 7.9224-18.659 12.891 0 10.55 31.878 19.103 71.201 19.103s71.2-8.5528 71.2-19.103c0-4.9688-7.07-9.4936-18.659-12.891 0.04-0.0303 0.084-0.0625 0.1238-0.0913 11.708 3.416 18.856 7.975 18.856 12.982 0 10.598-32.021 19.189-71.521 19.189" fill="#f7f7f7"/>
   <path id="path4823" d="m345.58 943.49c-39.324 0-71.201-8.5528-71.201-19.103 0-4.9688 7.07-9.4936 18.659-12.891 0.0425 0.0312 0.0812 0.0601 0.12375 0.0914-11.47 3.3784-18.461 7.8696-18.461 12.8 0 10.502 31.734 19.016 70.88 19.016 39.145 0 70.88-8.5136 70.88-19.016 0-4.9301-6.9925-9.4214-18.461-12.8 0.041-0.0312 0.08-0.0601 0.1225-0.0914 11.589 3.3975 18.659 7.9224 18.659 12.891 0 10.55-31.878 19.103-71.2 19.103" fill="#f6f7f7"/>
   <path id="path4825" d="m345.58 943.4c-39.146 0-70.88-8.5136-70.88-19.016 0-4.9301 6.9912-9.4214 18.461-12.8 0.04 0.0282 0.0837 0.061 0.12375 0.0907-11.349 3.3589-18.265 7.8179-18.265 12.709 0 10.455 31.591 18.931 70.56 18.931s70.559-8.476 70.559-18.931c0-4.8911-6.915-9.3501-18.265-12.709 0.04-0.0297 0.084-0.0625 0.125-0.0907 11.469 3.3784 18.461 7.8696 18.461 12.8 0 10.502-31.735 19.016-70.88 19.016" fill="#f6f6f7"/>
   <path id="path4827" d="m345.58 943.32c-38.969 0-70.56-8.476-70.56-18.931 0-4.8911 6.9162-9.3501 18.265-12.709 0.0425 0.0312 0.0825 0.0601 0.125 0.0914-11.232 3.3402-18.069 7.7651-18.069 12.618 0 10.408 31.446 18.845 70.239 18.845 38.791 0 70.238-8.4375 70.238-18.845 0-4.8525-6.8363-9.2774-18.068-12.618 0.043-0.0312 0.081-0.0601 0.1237-0.0914 11.35 3.3589 18.265 7.8179 18.265 12.709 0 10.455-31.59 18.931-70.559 18.931" fill="#f6f6f6"/>
   <path id="path4829" d="m345.58 943.23c-38.792 0-70.239-8.4375-70.239-18.845 0-4.8525 6.8362-9.2774 18.069-12.618 0.04 0.0287 0.0837 0.0615 0.125 0.0912-11.114 3.3213-17.872 7.7114-17.872 12.526 0 10.36 31.302 18.759 69.918 18.759 38.614 0 69.918-8.3989 69.918-18.759 0-4.815-6.76-9.2051-17.874-12.526 0.041-0.0297 0.085-0.0625 0.1263-0.0912 11.231 3.3402 18.068 7.7651 18.068 12.618 0 10.408-31.446 18.845-70.238 18.845" fill="#f5f6f6"/>
   <path id="path4831" d="m345.58 943.14c-38.615 0-69.918-8.3989-69.918-18.759 0-4.815 6.7588-9.2051 17.872-12.526 0.0425 0.0312 0.0825 0.0601 0.125 0.0914-10.995 3.3026-17.678 7.6586-17.678 12.435 0 10.312 31.16 18.672 69.598 18.672 38.436 0 69.596-8.3599 69.596-18.672 0-4.7764-6.6825-9.1324-17.678-12.435 0.043-0.0312 0.082-0.0601 0.125-0.0914 11.114 3.3213 17.874 7.7114 17.874 12.526 0 10.36-31.304 18.759-69.918 18.759" fill="#f5f5f5"/>
   <path id="path4833" d="m345.58 943.06c-38.438 0-69.598-8.3599-69.598-18.672 0-4.7764 6.6825-9.1324 17.678-12.435 0.0425 0.0312 0.0837 0.06 0.12625 0.0913-10.878 3.2828-17.482 7.6065-17.482 12.344 0 10.265 31.016 18.586 69.276 18.586s69.276-8.3213 69.276-18.586c0-4.7372-6.6062-9.061-17.484-12.344 0.043-0.0312 0.084-0.06 0.1262-0.0913 10.995 3.3026 17.678 7.6586 17.678 12.435 0 10.312-31.16 18.672-69.596 18.672" fill="#f5f5f5"/>
   <path id="path4835" d="m345.58 942.97c-38.26 0-69.276-8.3213-69.276-18.586 0-4.7372 6.605-9.061 17.482-12.344 0.0425 0.0312 0.0837 0.061 0.12625 0.0912-10.758 3.2638-17.289 7.5538-17.289 12.252 0 10.217 30.872 18.5 68.956 18.5 38.083 0 68.955-8.2828 68.955-18.5 0-4.6988-6.5313-8.9888-17.289-12.252 0.043-0.0303 0.084-0.06 0.1263-0.0912 10.878 3.2828 17.484 7.6065 17.484 12.344 0 10.265-31.016 18.586-69.276 18.586" fill="#f4f4f4"/>
   <path id="path4837" d="m345.58 942.89c-38.084 0-68.956-8.2828-68.956-18.5 0-4.6988 6.5312-8.9888 17.289-12.252 0.0412 0.0299 0.0862 0.0625 0.1275 0.0914-10.642 3.2436-17.095 7.5-17.095 12.161 0 10.17 30.729 18.415 68.635 18.415 37.905 0 68.634-8.2452 68.634-18.415 0-4.6611-6.4525-8.9175-17.095-12.161 0.041-0.0289 0.088-0.0615 0.1275-0.0914 10.758 3.2638 17.289 7.5538 17.289 12.252 0 10.217-30.872 18.5-68.955 18.5" fill="#f4f4f4"/>
   <path id="path4839" d="m345.58 942.8c-37.906 0-68.635-8.2452-68.635-18.415 0-4.6611 6.4525-8.9175 17.095-12.161 0.0425 0.0312 0.085 0.061 0.1275 0.0922-10.524 3.2236-16.901 7.4464-16.901 12.069 0 10.122 30.585 18.329 68.314 18.329s68.314-8.2061 68.314-18.329c0-4.6225-6.3775-8.8452-16.902-12.069 0.044-0.0312 0.085-0.061 0.1275-0.0922 10.642 3.2436 17.095 7.5 17.095 12.161 0 10.17-30.729 18.415-68.634 18.415" fill="#f3f3f3"/>
   <path id="path4841" d="m345.58 942.71c-37.729 0-68.314-8.2061-68.314-18.329 0-4.6225 6.3775-8.8452 16.901-12.069 0.0425 0.0303 0.085 0.0601 0.1275 0.0914-10.408 3.205-16.709 7.3935-16.709 11.978 0 10.075 30.441 18.243 67.994 18.243 37.551 0 67.993-8.1674 67.993-18.243 0-4.584-6.3013-8.7725-16.709-11.978 0.043-0.0312 0.085-0.0611 0.1275-0.0914 10.525 3.2236 16.902 7.4464 16.902 12.069 0 10.122-30.585 18.329-68.314 18.329" fill="#f3f3f2"/>
   <path id="path4843" d="m345.58 942.63c-37.552 0-67.994-8.1674-67.994-18.243 0-4.584 6.3012-8.7725 16.709-11.978 0.0437 0.0298 0.0863 0.0615 0.12875 0.0913-10.289 3.1851-16.516 7.3413-16.516 11.886 0 10.027 30.298 18.156 67.672 18.156s67.671-8.1289 67.671-18.156c0-4.5464-6.225-8.7011-16.516-11.886 0.043-0.0298 0.086-0.0615 0.1287-0.0913 10.408 3.205 16.709 7.3935 16.709 11.978 0 10.075-30.441 18.243-67.993 18.243" fill="#f2f2f2"/>
   <path id="path4845" d="m345.58 942.54c-37.375 0-67.672-8.1289-67.672-18.156 0-4.5449 6.2275-8.7011 16.516-11.886 0.0425 0.0298 0.0863 0.061 0.12875 0.0914-10.172 3.165-16.324 7.2875-16.324 11.795 0 9.98 30.154 18.07 67.351 18.07 37.196 0 67.351-8.0898 67.351-18.07 0-4.5074-6.1512-8.6299-16.325-11.795 0.043-0.0304 0.086-0.0616 0.1288-0.0914 10.291 3.1851 16.516 7.3399 16.516 11.886 0 10.027-30.298 18.156-67.671 18.156" fill="#f2f1f1"/>
   <path id="path4847" d="m345.58 942.46c-37.198 0-67.351-8.0898-67.351-18.07 0-4.5074 6.1512-8.6299 16.324-11.795 0.0438 0.0312 0.0875 0.061 0.13 0.0923-10.056 3.145-16.134 7.2339-16.134 11.703 0 9.9326 30.011 17.984 67.031 17.984s67.03-8.0513 67.03-17.984c0-4.4688-6.0775-8.5576-16.134-11.703 0.044-0.0312 0.086-0.061 0.13-0.0923 10.174 3.165 16.325 7.2875 16.325 11.795 0 9.98-30.155 18.07-67.351 18.07" fill="#f1f1f1"/>
   <path id="path4849" d="m345.58 942.37c-37.02 0-67.031-8.0513-67.031-17.984 0-4.4688 6.0775-8.5576 16.134-11.703 0.0438 0.0303 0.0875 0.0615 0.13 0.0913-9.94 3.125-15.942 7.1802-15.942 11.611 0 9.8848 29.866 17.897 66.71 17.897 36.843 0 66.71-8.0127 66.71-17.897 0-4.4311-6.0038-8.4864-15.944-11.611 0.044-0.0297 0.088-0.061 0.13-0.0913 10.056 3.145 16.134 7.2339 16.134 11.703 0 9.9326-30.01 17.984-67.03 17.984" fill="#f0f0f0"/>
   <path id="path4851" d="m345.58 942.28c-36.844 0-66.71-8.0127-66.71-17.897 0-4.4311 6.0025-8.4864 15.942-11.611 0.0438 0.0304 0.0875 0.0616 0.13125 0.0914-9.825 3.1064-15.754 7.1274-15.754 11.52 0 9.8374 29.724 17.812 66.39 17.812 36.665 0 66.389-7.9751 66.389-17.812 0-4.3926-5.9287-8.4136-15.752-11.52 0.043-0.0298 0.088-0.061 0.13-0.0914 9.94 3.125 15.944 7.1802 15.944 11.611 0 9.8848-29.868 17.897-66.71 17.897" fill="#f0f0ef"/>
   <path id="path4853" d="m345.58 942.2c-36.666 0-66.39-7.9751-66.39-17.812 0-4.3926 5.9288-8.4136 15.754-11.52 0.045 0.0312 0.085 0.06 0.13125 0.0912-9.7112 3.0865-15.564 7.0738-15.564 11.429 0 9.79 29.58 17.726 66.069 17.726 36.488 0 66.068-7.9361 66.068-17.726 0-4.355-5.8525-8.3422-15.562-11.429 0.045-0.0312 0.085-0.06 0.1312-0.0912 9.8238 3.1064 15.752 7.1274 15.752 11.52 0 9.8374-29.724 17.812-66.389 17.812" fill="#efefef"/>
   <path id="path4855" d="m345.58 942.11c-36.489 0-66.069-7.9361-66.069-17.726 0-4.355 5.8525-8.3422 15.564-11.429 0.0425 0.0299 0.0875 0.0625 0.13125 0.0924-9.5938 3.0649-15.374 7.02-15.374 11.336 0 9.7426 29.436 17.64 65.748 17.64 36.311 0 65.748-7.8975 65.748-17.64 0-4.3164-5.78-8.2715-15.375-11.336 0.044-0.0299 0.089-0.0625 0.1325-0.0924 9.71 3.0865 15.562 7.0738 15.562 11.429 0 9.79-29.58 17.726-66.068 17.726" fill="#eee"/>
   <path id="path4857" d="m345.58 942.03c-36.311 0-65.748-7.8975-65.748-17.64 0-4.3164 5.78-8.2715 15.374-11.336 0.0437 0.0302 0.0888 0.0615 0.1325 0.0912-9.4825 3.0464-15.186 6.9664-15.186 11.245 0 9.6949 29.292 17.554 65.428 17.554 36.134 0 65.426-7.8588 65.426-17.554 0-4.2788-5.7037-8.1988-15.186-11.245 0.044-0.0297 0.09-0.061 0.1325-0.0912 9.595 3.0649 15.375 7.02 15.375 11.336 0 9.7426-29.436 17.64-65.748 17.64" fill="#eeeeed"/>
   <path id="path4859" d="m345.58 941.94c-36.135 0-65.428-7.8588-65.428-17.554 0-4.2788 5.7038-8.1988 15.186-11.245 0.045 0.0312 0.0863 0.0601 0.1325 0.0914-9.3675 3.0262-14.998 6.9135-14.998 11.154 0 9.6475 29.149 17.467 65.106 17.467 35.956 0 65.106-7.8198 65.106-17.467 0-4.2402-5.6312-8.1275-14.999-11.154 0.046-0.0312 0.088-0.0601 0.1325-0.0914 9.4825 3.0464 15.186 6.9664 15.186 11.245 0 9.6949-29.292 17.554-65.426 17.554" fill="#ededec"/>
   <path id="path4861" d="m345.58 941.85c-35.958 0-65.106-7.8198-65.106-17.467 0-4.2402 5.63-8.1275 14.998-11.154 0.0437 0.0303 0.09 0.0625 0.13375 0.0923-9.2512 3.0054-14.811 6.8589-14.811 11.062 0 9.6001 29.006 17.381 64.786 17.381s64.785-7.7812 64.785-17.381c0-4.2026-5.56-8.0561-14.811-11.062 0.044-0.0298 0.091-0.062 0.1338-0.0923 9.3675 3.0262 14.999 6.9135 14.999 11.154 0 9.6475-29.15 17.467-65.106 17.467" fill="#ededec"/>
   <path id="path4863" d="m345.58 941.77c-35.78 0-64.786-7.7812-64.786-17.381 0-4.2026 5.56-8.0561 14.811-11.062 0.045 0.0317 0.0875 0.06 0.13375 0.0912-9.1388 2.9854-14.624 6.8066-14.624 10.97 0 9.5528 28.861 17.295 64.465 17.295 35.603 0 64.464-7.7422 64.464-17.295 0-4.1636-5.485-7.9849-14.624-10.97 0.046-0.0312 0.089-0.0595 0.1337-0.0912 9.2513 3.0054 14.811 6.8589 14.811 11.062 0 9.6001-29.005 17.381-64.785 17.381" fill="#ececeb"/>
   <path id="path4865" d="m345.58 941.68c-35.604 0-64.465-7.7422-64.465-17.295 0-4.1636 5.485-7.9849 14.624-10.97 0.0438 0.0303 0.0913 0.0625 0.13375 0.0928-9.0238 2.9639-14.436 6.751-14.436 10.878 0 9.5049 28.718 17.21 64.144 17.21 35.425 0 64.144-7.7051 64.144-17.21 0-4.1265-5.4137-7.9136-14.438-10.879 0.044-0.0289 0.091-0.0611 0.1338-0.0914 9.1387 2.9854 14.624 6.8066 14.624 10.97 0 9.5528-28.861 17.295-64.464 17.295" fill="#ecebea"/>
   <path id="path4867" d="m345.58 941.6c-35.426 0-64.144-7.7051-64.144-17.21 0-4.1265 5.4125-7.9136 14.436-10.878 0.0463 0.0312 0.09 0.0601 0.135 0.0914-8.9112 2.9439-14.251 6.6972-14.251 10.786 0 9.4575 28.575 17.124 63.824 17.124 35.248 0 63.823-7.666 63.823-17.124 0-4.0889-5.34-7.8422-14.251-10.786 0.046-0.0312 0.089-0.0615 0.135-0.0928 9.0238 2.9652 14.438 6.7524 14.438 10.879 0 9.5049-28.719 17.21-64.144 17.21" fill="#ebebea"/>
   <path id="path4869" d="m345.58 941.51c-35.249 0-63.824-7.666-63.824-17.124 0-4.0889 5.34-7.8422 14.251-10.786 0.0437 0.0297 0.0925 0.0625 0.13625 0.0912-8.7988 2.9249-14.066 6.6452-14.066 10.695 0 9.4101 28.43 17.038 63.502 17.038 35.071 0 63.501-7.6275 63.501-17.038 0-4.0498-5.2675-7.77-14.066-10.695 0.044-0.0287 0.092-0.0615 0.1362-0.0912 8.9113 2.9439 14.251 6.6972 14.251 10.786 0 9.4575-28.575 17.124-63.823 17.124" fill="#eaeae9"/>
   <path id="path4871" d="m345.58 941.42c-35.072 0-63.502-7.6275-63.502-17.038 0-4.0498 5.2675-7.77 14.066-10.695 0.0462 0.0312 0.09 0.0611 0.13625 0.0924-8.685 2.9038-13.882 6.5898-13.882 10.602 0 9.3622 28.288 16.951 63.182 16.951s63.181-7.5889 63.181-16.951c0-4.0128-5.1975-7.6988-13.882-10.602 0.046-0.0312 0.09-0.0611 0.1363-0.0924 8.7987 2.9249 14.066 6.6451 14.066 10.695 0 9.4101-28.43 17.038-63.501 17.038" fill="#eaeae8"/>
   <path id="path4873" d="m345.58 941.34c-34.895 0-63.182-7.5889-63.182-16.951 0-4.0128 5.1975-7.6988 13.882-10.602 0.0462 0.0312 0.09 0.061 0.13625 0.0913-8.5725 2.8838-13.698 6.5376-13.698 10.511 0 9.315 28.144 16.865 62.861 16.865 34.716 0 62.86-7.5498 62.86-16.865 0-3.9736-5.125-7.6275-13.698-10.511 0.046-0.0303 0.09-0.06 0.1362-0.0913 8.685 2.9038 13.882 6.5898 13.882 10.602 0 9.3622-28.288 16.951-63.181 16.951" fill="#e9e9e8"/>
   <path id="path4875" d="m345.58 941.25c-34.718 0-62.861-7.5498-62.861-16.865 0-3.9736 5.125-7.6275 13.698-10.511 0.0462 0.0312 0.0913 0.061 0.1375 0.0923-8.46 2.8629-13.514 6.483-13.514 10.419 0 9.2676 28 16.779 62.54 16.779s62.54-7.5112 62.54-16.779c0-3.936-5.055-7.5561-13.515-10.419 0.046-0.0312 0.091-0.061 0.1375-0.0923 8.5725 2.8838 13.698 6.5376 13.698 10.511 0 9.315-28.144 16.865-62.86 16.865" fill="#e9e8e7"/>
   <path id="path4877" d="m345.58 941.16c-34.54 0-62.54-7.5112-62.54-16.779 0-3.936 5.0538-7.5561 13.514-10.419 0.0462 0.0312 0.0925 0.0616 0.13875 0.0929-8.35 2.8413-13.332 6.4273-13.332 10.326 0 9.2202 27.856 16.694 62.22 16.694 34.363 0 62.219-7.4736 62.219-16.694 0-3.8989-4.9825-7.4849-13.332-10.326 0.047-0.0312 0.092-0.0616 0.1388-0.0929 8.46 2.8629 13.515 6.483 13.515 10.419 0 9.2676-28 16.779-62.54 16.779" fill="#e8e8e6"/>
   <path id="path4879" d="m345.58 941.08c-34.364 0-62.22-7.4736-62.22-16.694 0-3.8989 4.9825-7.4849 13.332-10.326 0.0462 0.0298 0.0913 0.06 0.1375 0.0913-8.2362 2.8199-13.149 6.3735-13.149 10.235 0 9.1724 27.712 16.607 61.899 16.607 34.185 0 61.898-7.4351 61.898-16.607 0-3.8614-4.9113-7.415-13.149-10.235 0.046-0.0312 0.092-0.0615 0.1375-0.0913 8.35 2.8413 13.332 6.4273 13.332 10.326 0 9.2202-27.856 16.694-62.219 16.694" fill="#e7e7e6"/>
   <path id="path4881" d="m345.58 940.99c-34.186 0-61.899-7.4351-61.899-16.607 0-3.8614 4.9125-7.415 13.149-10.235 0.0475 0.0312 0.0937 0.061 0.14 0.0922-8.1262 2.7989-12.969 6.3199-12.969 10.143 0 9.1235 27.57 16.521 61.579 16.521 34.008 0 61.578-7.398 61.578-16.521 0-3.8238-4.84-7.3438-12.969-10.143 0.046-0.0312 0.094-0.061 0.14-0.0922 8.2375 2.8199 13.149 6.3735 13.149 10.235 0 9.1724-27.712 16.607-61.898 16.607" fill="#e7e6e5"/>
   <path id="path4883" d="m345.58 940.91c-34.009 0-61.579-7.398-61.579-16.521 0-3.8228 4.8425-7.3438 12.969-10.143 0.0463 0.0304 0.0937 0.0616 0.14 0.0914-8.0162 2.7788-12.788 6.2661-12.788 10.051 0 9.0776 27.426 16.435 61.258 16.435 33.831 0 61.256-7.3574 61.256-16.435 0-3.7851-4.7712-7.2725-12.786-10.051 0.046-0.0298 0.093-0.061 0.1387-0.0914 8.1288 2.7989 12.969 6.3189 12.969 10.143 0 9.1235-27.57 16.521-61.578 16.521" fill="#e6e6e4"/>
   <path id="path4885" d="m345.58 940.82c-33.831 0-61.258-7.3574-61.258-16.435 0-3.7851 4.7712-7.2725 12.788-10.051 0.0462 0.0312 0.0937 0.0625 0.14 0.0922-7.9062 2.7579-12.606 6.2115-12.606 9.959 0 9.0288 27.281 16.349 60.936 16.349 33.654 0 60.936-7.3199 60.936-16.349 0-3.7475-4.7012-7.2011-12.608-9.959 0.046-0.0297 0.094-0.061 0.1413-0.0922 8.015 2.7788 12.786 6.2661 12.786 10.051 0 9.0776-27.425 16.435-61.256 16.435" fill="#e5e5e3"/>
   <path id="path4887" d="m345.58 940.73c-33.655 0-60.936-7.3199-60.936-16.349 0-3.7475 4.7-7.2011 12.606-9.959 0.0462 0.0303 0.095 0.0615 0.14125 0.0928-7.7962 2.7364-12.428 6.1562-12.428 9.8662 0 8.9815 27.139 16.263 60.616 16.263 33.476 0 60.615-7.2812 60.615-16.263 0-3.71-4.6313-7.1299-12.428-9.8662 0.046-0.0312 0.095-0.0625 0.1412-0.0928 7.9063 2.7579 12.608 6.2115 12.608 9.959 0 9.0288-27.282 16.349-60.936 16.349" fill="#e4e4e3"/>
   <path id="path4889" d="m345.58 940.65c-33.478 0-60.616-7.2812-60.616-16.263 0-3.71 4.6312-7.1299 12.428-9.8662 0.0462 0.0299 0.095 0.0611 0.14125 0.0914-7.6862 2.7162-12.248 6.1025-12.248 9.7749 0 8.9336 26.995 16.176 60.295 16.176 33.299 0 60.294-7.2426 60.294-16.176 0-3.6724-4.5612-7.0586-12.248-9.7749 0.046-0.0302 0.095-0.0615 0.1413-0.0914 7.7962 2.7364 12.428 6.1562 12.428 9.8662 0 8.9815-27.139 16.263-60.615 16.263" fill="#e4e3e2"/>
   <path id="path4891" d="m345.58 940.56c-33.3 0-60.295-7.2426-60.295-16.176 0-3.6724 4.5612-7.0586 12.248-9.7749 0.0488 0.0323 0.0937 0.061 0.1425 0.0922-7.5775 2.6939-12.069 6.0479-12.069 9.6826 0 8.8862 26.85 16.091 59.974 16.091 33.123 0 59.974-7.2051 59.974-16.091 0-3.6348-4.4925-6.9888-12.07-9.6826 0.049-0.0312 0.094-0.06 0.1425-0.0922 7.6863 2.7162 12.248 6.1025 12.248 9.7749 0 8.9336-26.995 16.176-60.294 16.176" fill="#e3e3e1"/>
   <path id="path4893" d="m345.58 940.48c-33.124 0-59.974-7.2051-59.974-16.091 0-3.6348 4.4912-6.9888 12.069-9.6826 0.0462 0.0303 0.0962 0.0625 0.14375 0.0928-7.4675 2.6724-11.892 5.9922-11.892 9.5899 0 8.8389 26.708 16.005 59.654 16.005 32.945 0 59.653-7.166 59.653-16.005 0-3.5976-4.4238-6.9175-11.891-9.5899 0.046-0.0303 0.096-0.0625 0.1425-0.0928 7.5775 2.6939 12.07 6.0479 12.07 9.6826 0 8.8862-26.851 16.091-59.974 16.091" fill="#e2e2e0"/>
   <path id="path4895" d="m345.58 940.39c-32.946 0-59.654-7.166-59.654-16.005 0-3.5976 4.425-6.9175 11.892-9.5899 0.0488 0.0312 0.0937 0.0601 0.1425 0.0909-7.3588 2.6528-11.714 5.939-11.714 9.499 0 8.791 26.564 15.919 59.332 15.919s59.331-7.128 59.331-15.919c0-3.56-4.355-6.8462-11.714-9.499 0.049-0.0308 0.094-0.0596 0.1437-0.0909 7.4675 2.6724 11.891 5.9922 11.891 9.5899 0 8.8389-26.708 16.005-59.653 16.005" fill="#e2e1df"/>
   <path id="path4897" d="m345.58 940.3c-32.769 0-59.332-7.128-59.332-15.919 0-3.56 4.355-6.8462 11.714-9.499 0.0475 0.0303 0.0975 0.063 0.145 0.0928-7.2512 2.6298-11.539 5.8837-11.539 9.4062 0 8.7436 26.421 15.833 59.012 15.833s59.011-7.0889 59.011-15.833c0-3.5225-4.2875-6.7764-11.539-9.4062 0.048-0.0298 0.098-0.0625 0.145-0.0928 7.3587 2.6528 11.714 5.939 11.714 9.499 0 8.791-26.564 15.919-59.331 15.919" fill="#e1e0df"/>
   <path id="path4899" d="m345.58 940.22c-32.591 0-59.012-7.0889-59.012-15.833 0-3.5225 4.2875-6.7764 11.539-9.4062 0.0487 0.0312 0.095 0.061 0.145 0.0922-7.1425 2.6089-11.362 5.8291-11.362 9.314 0 8.6962 26.276 15.746 58.691 15.746 32.414 0 58.69-7.0498 58.69-15.746 0-3.4849-4.22-6.7051-11.362-9.314 0.05-0.0312 0.096-0.061 0.145-0.0922 7.2512 2.6299 11.539 5.8838 11.539 9.4062 0 8.7436-26.42 15.833-59.011 15.833" fill="#e0e0de"/>
   <path id="path4901" d="m345.58 940.13c-32.415 0-58.691-7.0498-58.691-15.746 0-3.4849 4.22-6.7051 11.362-9.314 0.0463 0.0303 0.0987 0.0625 0.145 0.0928-7.0362 2.586-11.186 5.7735-11.186 9.2212 0 8.6489 26.132 15.66 58.37 15.66 32.236 0 58.37-7.0113 58.37-15.66 0-3.4478-4.1513-6.6352-11.188-9.2212 0.046-0.0303 0.099-0.0625 0.145-0.0928 7.1425 2.6089 11.362 5.8291 11.362 9.314 0 8.6962-26.276 15.746-58.69 15.746" fill="#e0dfdd"/>
   <path id="path4903" d="m345.58 940.05c-32.238 0-58.37-7.0113-58.37-15.66 0-3.4478 4.15-6.6352 11.186-9.2212 0.05 0.0312 0.0975 0.0611 0.1475 0.0924-6.9288 2.5649-11.014 5.7188-11.014 9.1289 0 8.6011 25.99 15.575 58.05 15.575 32.059 0 58.049-6.9741 58.049-15.575 0-3.4101-4.085-6.564-11.012-9.1289 0.049-0.0312 0.096-0.0611 0.1463-0.0924 7.0362 2.586 11.188 5.7735 11.188 9.2212 0 8.6489-26.134 15.66-58.37 15.66" fill="#dfdedc"/>
   <path id="path4905" d="m345.58 939.96c-32.06 0-58.05-6.9741-58.05-15.575 0-3.4101 4.085-6.564 11.014-9.1289 0.0487 0.0312 0.0962 0.0615 0.14625 0.0928-6.8212 2.5425-10.839 5.6636-10.839 9.0361 0 8.5538 25.846 15.489 57.729 15.489s57.728-6.935 57.728-15.489c0-3.3725-4.0163-6.4936-10.839-9.0361 0.05-0.0312 0.097-0.0615 0.1475-0.0928 6.9275 2.5649 11.012 5.7188 11.012 9.1289 0 8.6011-25.99 15.575-58.049 15.575" fill="#dedddb"/>
   <path id="path4907" d="m345.58 939.87c-31.882 0-57.729-6.935-57.729-15.489 0-3.3725 4.0175-6.4936 10.839-9.0361 0.05 0.0312 0.0987 0.061 0.1475 0.0922-6.715 2.5215-10.666 5.6089-10.666 8.9439 0 8.5064 25.702 15.402 57.409 15.402 31.705 0 57.408-6.896 57.408-15.402 0-3.335-3.9513-6.4224-10.666-8.9439 0.049-0.0312 0.099-0.061 0.1475-0.0922 6.8225 2.5425 10.839 5.6636 10.839 9.0361 0 8.5538-25.845 15.489-57.728 15.489" fill="#dddcda"/>
   <path id="path4909" d="m345.58 939.79c-31.706 0-57.409-6.896-57.409-15.402 0-3.335 3.9512-6.4224 10.666-8.9439 0.05 0.0303 0.0987 0.0615 0.14875 0.0928-6.61 2.4986-10.494 5.5538-10.494 8.8511 0 8.459 25.559 15.316 57.088 15.316 31.528 0 57.086-6.8574 57.086-15.316 0-3.2974-3.8837-6.3525-10.494-8.8511 0.05-0.0312 0.099-0.0625 0.1487-0.0928 6.715 2.5215 10.666 5.6089 10.666 8.9439 0 8.5064-25.702 15.402-57.408 15.402" fill="#dddcda"/>
   <path id="path4911" d="m345.58 939.7c-31.529 0-57.088-6.8574-57.088-15.316 0-3.2974 3.8838-6.3525 10.494-8.8511 0.05 0.0299 0.1025 0.0635 0.1525 0.0937-6.505 2.4761-10.324 5.4946-10.324 8.7535 0 8.415 25.414 15.233 56.768 15.233s56.768-6.8179 56.768-15.233c0-3.2589-3.82-6.2789-10.328-8.7549 0.05-0.0312 0.1-0.0625 0.15-0.0924 6.61 2.4986 10.494 5.5538 10.494 8.8511 0 8.459-25.559 15.316-57.086 15.316" fill="#dcdbd9"/>
   <path id="path4913" d="m352.3 924.39c0 0.9975-3.0112 1.8051-6.7262 1.8051-3.7162 0-6.7275-0.80762-6.7275-1.8051 0-0.99612 3.0112-1.8051 6.7275-1.8051 3.715 0 6.7262 0.809 6.7262 1.8051" fill="#100f0d"/>
  </g>
  <g id="g4997" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g4999" clip-path="url(#clipPath5001-8)">
    <path id="path5013" d="m2880.5 3736.9c0 105.26-86.12 191.38-191.38 191.38h-73.44c-10.55 0-20.91-0.86-31-2.52v1763.8c0 30.46-24.7 55.16-55.17 55.16-30.46 0-55.16-24.7-55.16-55.16v-1823.9c-31.06-34.06-50.06-79.28-50.06-128.72v1925c0 105.26 86.12 191.38 191.39 191.38h73.44c105.26 0 191.38-86.12 191.38-191.38v-1925" fill="url(#linearGradient5005)"/>
   </g>
  </g>
  <g id="g5015" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g5017" clip-path="url(#clipPath5019-4)">
    <path id="path5029" d="m2880.5 1400.7c-70.08 29.76-147.17 46.22-228.1 46.22-80.94 0-158.03-16.46-228.11-46.22v2336.2c0 49.44 19 94.66 50.06 128.72v-2278.8c0-30.47 24.7-55.16 55.16-55.16 30.47 0 55.17 24.69 55.17 55.16v2338.9c10.09 1.66 20.45 2.52 31 2.52h73.44c105.26 0 191.38-86.12 191.38-191.38v-2336.2" fill="url(#linearGradient5023)"/>
   </g>
  </g>
  <g id="g5031" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g5033" clip-path="url(#clipPath5035-2)">
    <path id="path5045" d="m3236.5 862.75c0-322.64-261.54-584.18-584.17-584.18-322.64 0-584.18 261.54-584.18 584.18 0 322.63 261.54 584.18 584.18 584.18 322.63 0 584.17-261.55 584.17-584.18" fill="url(#radialGradient5071-6)"/>
   </g>
  </g>
  <g id="g5047" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g5049" clip-path="url(#clipPath5051-9)">
    <path id="path5061" d="m2994.9 1172v2.03-1.01-1.02" fill="url(#radialGradient5071-6)"/>
   </g>
  </g>
  <g id="g5063" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g5065" clip-path="url(#clipPath5067-4)">
    <path id="path5077" d="m2872.9 1006.9c74.59 39.83 121.99 99.49 121.99 166.16v-1.02c-0.48-66.26-47.76-125.51-121.99-165.14m121.99 166.16c0 31.39-10.5 61.21-29.4 88.15 18.7-26.65 29.18-56.13 29.4-87.14v-1.01" fill="url(#radialGradient5071-6)"/>
   </g>
  </g>
  <g id="g5079" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g5081" clip-path="url(#clipPath5083-5)">
    <g id="g5087" transform="matrix(696.2,0,0,453.2,2303.9,945.9)">
     <image id="image5089" xlink:href="data:image/png;base64,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" transform="matrix(1,0,0,-1,0,1)" height="1" width="1" preserveAspectRatio="none"/>
    </g>
   </g>
  </g>
  <path id="path5091" d="m350.17 200.97h-9.18c-21.739 0-39.424 17.685-39.424 39.422v523.07c-27.34 15.644-44.509 44.775-44.509 76.826 0 48.811 39.711 88.522 88.522 88.522 48.81 0 88.521-39.712 88.521-88.522 0-32.052-17.169-61.182-44.509-76.826v-523.07c0-21.738-17.685-39.422-39.423-39.422m0 15.5c13.158 0 23.923 10.765 23.923 23.922v532.65c26.161 11.106 44.509 37.031 44.509 67.242 0 40.33-32.692 73.022-73.021 73.022-40.33 0-73.022-32.692-73.022-73.022 0-30.211 18.349-56.136 44.509-67.242v-532.65c0-13.158 10.765-23.922 23.924-23.922h9.18" fill="#100f0d"/>
  <g id="g5093" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g5095" clip-path="url(#clipPath5097-6)">
    <path id="path5111" d="m2689.1 5941.9h-73.44c-154.37 0-279.96-125.59-279.96-279.96v-4205.5c-218.11-116.22-356.07-343.22-356.07-593.7 0-370.96 301.79-672.75 672.75-672.75 370.95 0 672.74 301.79 672.74 672.75 0 250.48-137.95 477.48-356.07 593.7v4205.5c0 154.37-125.59 279.96-279.95 279.96m0-88.58c105.26 0 191.38-86.12 191.38-191.38v-4261.2c209.29-88.85 356.07-296.25 356.07-537.94 0-322.63-261.54-584.18-584.17-584.18-322.64 0-584.18 261.55-584.18 584.18 0 241.69 146.79 449.09 356.07 537.94v4261.2c0 105.26 86.12 191.38 191.39 191.38h73.44" fill="url(#linearGradient5101)"/>
   </g>
  </g>
  <g id="g5113" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g5115" clip-path="url(#clipPath5117-0)">
    <path id="path5129" d="m2474.3 3865.6v1823.9c0 30.46 24.7 55.16 55.16 55.16 30.47 0 55.17-24.7 55.17-55.16v-1763.8c-43.33-7.14-81.89-28.96-110.33-60.14" fill="url(#linearGradient5121)"/>
   </g>
  </g>
  <g id="g5131" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g5133" clip-path="url(#clipPath5135-7)">
    <path id="path5145" d="m2529.5 1531.7c-30.46 0-55.16 24.69-55.16 55.16v2278.8c28.44 31.18 67 53 110.33 60.14v-2338.9c0-30.47-24.7-55.16-55.17-55.16" fill="url(#linearGradient5139)"/>
   </g>
  </g>
  <g id="g6105" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g6107" clip-path="url(#clipPath6109-9)">
    <g id="g6113" transform="matrix(918.2,0,0,253.2,2192.9,62.9)">
     <image id="image6115" xlink:href="data:image/png;base64,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" transform="matrix(1,0,0,-1,0,1)" height="1" width="1" preserveAspectRatio="none"/>
    </g>
   </g>
  </g>
 </g>
</svg>
\",\"data:image/svg+xml;base64,<svg id="svg6934" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="210.87mm" width="49.966mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 177.04375 747.16249" xmlns:dc="http://purl.org/dc/elements/1.1/">
 <defs id="defs6936">
  <linearGradient id="linearGradient5571" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1e-7 -1704.3 -1704.3 -1e-7 4596.6 2828.6)">
   <stop id="stop5573" stop-color="#f7d649" offset="0"/>
   <stop id="stop5575" stop-color="#f18355" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient5553" gradientUnits="userSpaceOnUse" gradientTransform="matrix(456.22 0 0 -456.22 4368.4 3494.3)">
   <stop id="stop5555" stop-color="#cac9c8" offset="0"/>
   <stop id="stop5557" stop-color="#f6f6f6" offset=".75269"/>
   <stop id="stop5559" stop-color="#d4d3d2" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient5533" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1345.5 0 0 -1345.5 3923.8 3065.9)">
   <stop id="stop5535" stop-color="#b3b3b2" offset="0"/>
   <stop id="stop5537" stop-color="#b3b3b2" offset=".1"/>
   <stop id="stop5539" stop-color="#feffff" offset=".24731"/>
   <stop id="stop5541" stop-color="#a3a3a1" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient5455" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1e-7 -1704.3 -1704.3 -1e-7 4596.6 2828.6)">
   <stop id="stop5457" stop-color="#f3b70c" offset="0"/>
   <stop id="stop5459" stop-color="#e73e20" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient5437" gradientUnits="userSpaceOnUse" gradientTransform="matrix(456.22 0 0 -456.22 4368.4 3494.3)">
   <stop id="stop5439" stop-color="#a3a3a1" offset="0"/>
   <stop id="stop5441" stop-color="#ececec" offset=".75269"/>
   <stop id="stop5443" stop-color="#b3b3b2" offset="1"/>
  </linearGradient>
  <clipPath id="clipPath6121-3" clipPathUnits="userSpaceOnUse">
   <path id="path6123-6" clip-rule="evenodd" d="m4142.4 190.03c0 67.231 203.31 121.77 454.14 121.77s454.14-54.539 454.14-121.77c0-67.32-203.31-121.86-454.14-121.86s-454.14 54.543-454.14 121.86"/>
  </clipPath>
  <clipPath id="clipPath5567-7" clipPathUnits="userSpaceOnUse">
   <path id="path5569-5" d="m4473.7 1531.7c-30.47 0-55.16 24.69-55.16 55.16v2914.1c28.43 31.18 66.99 53 110.32 60.14v-2974.2c0-30.47-24.7-55.16-55.16-55.16"/>
  </clipPath>
  <clipPath id="clipPath5549-6" clipPathUnits="userSpaceOnUse">
   <path id="path5551-2" d="m4418.5 4501v1188.6c0 30.46 24.69 55.16 55.16 55.16 30.46 0 55.16-24.7 55.16-55.16v-1128.4c-43.33-7.14-81.89-28.96-110.32-60.14"/>
  </clipPath>
  <clipPath id="clipPath5529-7" clipPathUnits="userSpaceOnUse">
   <path id="path5531-0" d="m4633.3 5941.9h-73.44c-154.37 0-279.96-125.59-279.96-279.96v-4205.5c-218.11-116.22-356.07-343.22-356.07-593.7 0-370.96 301.79-672.75 672.75-672.75 370.95 0 672.74 301.79 672.74 672.75 0 250.48-137.95 477.48-356.07 593.7v4205.5c0 154.37-125.59 279.96-279.95 279.96m0-88.58c105.26 0 191.39-86.12 191.39-191.38v-4261.2c209.28-88.85 356.07-296.25 356.07-537.94 0-322.63-261.55-584.18-584.18-584.18-322.64 0-584.18 261.55-584.18 584.18 0 241.69 146.78 449.09 356.07 537.94v4261.2c0 105.26 86.12 191.38 191.39 191.38h73.44"/>
  </clipPath>
  <clipPath id="clipPath5515-6" clipPathUnits="userSpaceOnUse">
   <path id="path5517-2" d="m4596.6 955.89c-189.16 0-342.5 97.219-342.5 217.15 0 119.92 153.34 217.14 342.5 217.14 118.59 0 223.1-38.21 284.57-96.28 36.58-34.55 57.92-76.12 57.92-120.86 0-83.39-74.13-155.8-182.9-192.18-47.65-15.937-101.96-24.968-159.59-24.968"/>
  </clipPath>
  <clipPath id="clipPath5499-6" clipPathUnits="userSpaceOnUse">
   <path id="path5501-1" d="m4756.2 980.86c108.77 36.381 182.9 108.79 182.9 192.18v-1.24c-0.73-82.87-74.67-154.73-182.9-190.94m182.9 192.18c0 44.74-21.34 86.31-57.92 120.86 36.24-34.23 57.53-75.36 57.92-119.63v-1.23"/>
  </clipPath>
  <radialGradient id="radialGradient5503-8" gradientUnits="userSpaceOnUse" cy="0" cx="0" gradientTransform="matrix(584.18 0 0 -584.18 4596.6 862.75)" r="1">
   <stop id="stop5505-7" stop-color="#f3b70c" offset="0"/>
   <stop id="stop5507-9" stop-color="#e73e20" offset="1"/>
  </radialGradient>
  <clipPath id="clipPath5483-2" clipPathUnits="userSpaceOnUse">
   <path id="path5485-0" d="m4939 1171.8v1.24 1.23-1.23-1.24"/>
  </clipPath>
  <clipPath id="clipPath5467-5" clipPathUnits="userSpaceOnUse">
   <path id="path5469-9" d="m5180.7 862.75c0-322.64-261.55-584.18-584.18-584.18-322.64 0-584.18 261.54-584.18 584.18 0 322.63 261.54 584.18 584.18 584.18 322.63 0 584.18-261.55 584.18-584.18"/>
  </clipPath>
  <clipPath id="clipPath5451-9" clipPathUnits="userSpaceOnUse">
   <path id="path5453-7" d="m4824.7 1400.7c-70.09 29.76-147.18 46.22-228.11 46.22-80.94 0-158.03-16.46-228.11-46.22v2971.5c0 49.44 19 94.67 50.07 128.72v-2914.1c0-30.47 24.69-55.16 55.16-55.16 30.46 0 55.16 24.69 55.16 55.16v2974.2c10.09 1.66 20.45 2.53 31 2.53h73.44c105.26 0 191.39-86.13 191.39-191.39v-2971.5"/>
  </clipPath>
  <clipPath id="clipPath5433-1" clipPathUnits="userSpaceOnUse">
   <path id="path5435-2" d="m4824.7 4372.2c0 105.26-86.13 191.39-191.39 191.39h-73.44c-10.55 0-20.91-0.87-31-2.53v1128.4c0 30.46-24.7 55.16-55.16 55.16-30.47 0-55.16-24.7-55.16-55.16v-1188.6c-31.07-34.05-50.07-79.28-50.07-128.72v1289.7c0 105.26 86.12 191.38 191.39 191.38h73.44c105.26 0 191.39-86.12 191.39-191.38v-1289.7"/>
  </clipPath>
 </defs>
 <g id="layer1" transform="translate(-217.07 -204.53)">
  <g fill="#fff">
   <path id="path5147" d="m305.59 951.7c-48.89 0-88.523-10.632-88.523-23.75 0-7.0864 11.571-13.449 29.919-17.8 0.035 0.03 0.0675 0.058 0.1025 0.09-18.22 4.335-29.7 10.663-29.7 17.71 0 13.069 39.489 23.664 88.201 23.664 48.711 0 88.201-10.595 88.201-23.664 0-7.0474-11.481-13.375-29.701-17.71 0.0362-0.031 0.0675-0.06 0.1025-0.09 18.348 4.351 29.919 10.713 29.919 17.8 0 13.118-39.632 23.75-88.521 23.75m37.502-45.174c0.0437-0.026 0.0875-0.054 0.13125-0.079-0.0438 0.025-0.0875 0.052-0.13125 0.079"/>
   <path id="path5149" d="m305.59 951.61c-48.713 0-88.201-10.595-88.201-23.664 0-7.0474 11.48-13.375 29.7-17.71 0.0337 0.029 0.07 0.061 0.1025 0.091-18.089 4.3174-29.481 10.611-29.481 17.619 0 13.021 39.345 23.578 87.88 23.578s87.88-10.557 87.88-23.578c0-7.0074-11.394-13.301-29.482-17.619 0.0338-0.03 0.07-0.062 0.1025-0.091 18.22 4.335 29.701 10.663 29.701 17.71 0 13.069-39.49 23.664-88.201 23.664m37.371-45.01c0.045-0.026 0.0863-0.051 0.13125-0.078-0.045 0.026-0.0863 0.051-0.13125 0.078"/>
   <path id="path5151" d="m305.59 951.52c-48.535 0-87.88-10.557-87.88-23.578 0-7.0074 11.392-13.301 29.481-17.619 0.0362 0.03 0.0688 0.059 0.10375 0.09-17.96 4.3026-29.265 10.562-29.265 17.529 0 12.974 39.201 23.491 87.56 23.491 48.358 0 87.559-10.518 87.559-23.491 0-6.9672-11.305-13.226-29.264-17.529 0.035-0.031 0.0675-0.06 0.1025-0.09 18.089 4.3174 29.482 10.611 29.482 17.619 0 13.021-39.345 23.578-87.88 23.578m37.24-44.845c0.0425-0.025 0.0875-0.052 0.13125-0.079-0.0438 0.026-0.0887 0.054-0.13125 0.079"/>
   <path id="path5153" d="m305.59 951.44c-48.359 0-87.56-10.518-87.56-23.491 0-6.9672 11.305-13.226 29.265-17.529 0.0337 0.029 0.07 0.061 0.10375 0.09-17.83 4.2866-29.048 10.511-29.048 17.439 0 12.926 39.058 23.406 87.239 23.406 48.18 0 87.239-10.48 87.239-23.406 0-6.9278-11.218-13.152-29.048-17.439 0.0325-0.029 0.07-0.061 0.10375-0.09 17.959 4.3026 29.264 10.562 29.264 17.529 0 12.974-39.201 23.491-87.559 23.491m37.108-44.68c0.0425-0.026 0.0888-0.052 0.1325-0.079-0.0438 0.026-0.09 0.053-0.1325 0.079"/>
   <path id="path5155" d="m305.59 951.35c-48.181 0-87.239-10.48-87.239-23.406 0-6.9277 11.218-13.152 29.048-17.439 0.035 0.031 0.0675 0.06 0.10375 0.091-17.701 4.269-28.831 10.459-28.831 17.348 0 12.879 38.915 23.32 86.919 23.32s86.918-10.441 86.918-23.32c0-6.8886-11.13-13.079-28.83-17.348 0.035-0.031 0.0675-0.06 0.10375-0.091 17.83 4.2866 29.048 10.511 29.048 17.439 0 12.926-39.059 23.406-87.239 23.406m36.974-44.516c0.0463-0.028 0.0875-0.053 0.13375-0.079-0.0463 0.026-0.0875 0.051-0.13375 0.079"/>
   <path id="path5157" d="m305.59 951.27c-48.004 0-86.919-10.441-86.919-23.32 0-6.8886 11.13-13.079 28.831-17.348 0.035 0.031 0.0688 0.06 0.10375 0.09-17.569 4.2525-28.614 10.41-28.614 17.257 0 12.831 38.771 23.234 86.598 23.234 47.826 0 86.598-10.403 86.598-23.234 0-6.8476-11.046-13.005-28.615-17.256 0.0362-0.031 0.0687-0.06 0.105-0.091 17.7 4.269 28.83 10.459 28.83 17.348 0 12.879-38.914 23.32-86.918 23.32m36.841-44.353c0.0425-0.025 0.09-0.052 0.1325-0.077-0.0425 0.025-0.09 0.052-0.1325 0.077"/>
   <path id="path5159" d="m305.59 951.18c-47.826 0-86.598-10.403-86.598-23.234 0-6.8476 11.045-13.005 28.614-17.257 0.0337 0.03 0.0712 0.062 0.105 0.091-17.441 4.2349-28.398 10.357-28.398 17.166 0 12.784 38.626 23.148 86.276 23.148 47.649 0 86.276-10.364 86.276-23.148 0-6.8086-10.956-12.931-28.398-17.166 0.0325-0.029 0.0712-0.062 0.10375-0.09 17.569 4.2515 28.615 10.409 28.615 17.256 0 12.831-38.771 23.234-86.598 23.234m36.708-44.188c0.045-0.026 0.0875-0.051 0.13375-0.079-0.0463 0.028-0.0887 0.053-0.13375 0.079"/>
   <path id="path5161" d="m305.59 951.09c-47.65 0-86.276-10.364-86.276-23.148 0-6.8086 10.956-12.931 28.398-17.166 0.035 0.031 0.0688 0.06 0.105 0.091-17.311 4.2187-28.182 10.307-28.182 17.075 0 12.736 38.484 23.061 85.956 23.061 47.471 0 85.955-10.325 85.955-23.061 0-6.7685-10.871-12.856-28.181-17.075 0.035-0.031 0.0688-0.06 0.105-0.091 17.441 4.2348 28.398 10.357 28.398 17.166 0 12.784-38.628 23.147-86.276 23.147m36.572-44.024c0.0438-0.025 0.0913-0.052 0.135-0.077-0.0438 0.025-0.0913 0.052-0.135 0.077"/>
   <path id="path5163" d="m305.59 951.01c-47.473 0-85.956-10.325-85.956-23.061 0-6.7685 10.871-12.856 28.182-17.075 0.035 0.03 0.0688 0.06 0.105 0.09-17.184 4.2021-27.966 10.256-27.966 16.985 0 12.688 38.34 22.976 85.635 22.976s85.635-10.288 85.635-22.976c0-6.729-10.784-12.783-27.966-16.985 0.035-0.03 0.0687-0.06 0.105-0.09 17.31 4.2188 28.181 10.307 28.181 17.075 0 12.736-38.484 23.061-85.955 23.061m36.438-43.858c0.045-0.026 0.0888-0.053 0.135-0.079-0.0463 0.026-0.09 0.053-0.135 0.079"/>
   <path id="path5165" d="m305.59 950.92c-47.295 0-85.635-10.288-85.635-22.976 0-6.729 10.782-12.783 27.966-16.985 0.0337 0.029 0.0712 0.062 0.105 0.091-17.054 4.1845-27.751 10.204-27.751 16.894 0 12.641 38.198 22.89 85.315 22.89 47.118 0 85.314-10.249 85.314-22.89 0-6.689-10.698-12.709-27.751-16.894 0.0337-0.029 0.0725-0.062 0.10625-0.091 17.182 4.2021 27.966 10.256 27.966 16.985 0 12.688-38.34 22.976-85.635 22.976m36.301-43.696c0.0463-0.026 0.09-0.051 0.13625-0.077-0.0463 0.026-0.09 0.051-0.13625 0.077"/>
   <path id="path5167" d="m305.59 950.84c-47.118 0-85.315-10.249-85.315-22.89 0-6.689 10.698-12.709 27.751-16.894 0.0362 0.03 0.07 0.06 0.10625 0.09-16.925 4.169-27.536 10.154-27.536 16.804 0 12.594 38.052 22.804 84.994 22.804 46.94 0 84.992-10.21 84.992-22.804 0-6.6499-10.611-12.635-27.536-16.804 0.0362-0.03 0.0713-0.06 0.10625-0.09 17.054 4.1845 27.751 10.204 27.751 16.894 0 12.641-38.196 22.89-85.314 22.89m36.166-43.531c0.0438-0.026 0.0913-0.054 0.135-0.079-0.0438 0.025-0.0913 0.053-0.135 0.079"/>
   <path id="path5169" d="m305.59 950.75c-46.941 0-84.994-10.21-84.994-22.804 0-6.6499 10.611-12.635 27.536-16.804 0.0363 0.031 0.07 0.06 0.10625 0.091-16.796 4.1513-27.321 10.102-27.321 16.712 0 12.546 37.909 22.717 84.673 22.717 46.762 0 84.672-10.171 84.672-22.717 0-6.6099-10.525-12.561-27.322-16.712 0.0362-0.031 0.0712-0.06 0.10625-0.091 16.925 4.169 27.536 10.154 27.536 16.804 0 12.594-38.052 22.804-84.992 22.804m36.029-43.368c0.0463-0.026 0.0913-0.052 0.1375-0.077-0.0463 0.025-0.0913 0.051-0.1375 0.077"/>
   <path id="path5171" d="m305.59 950.66c-46.764 0-84.673-10.171-84.673-22.717 0-6.6099 10.525-12.561 27.321-16.712 0.0362 0.03 0.0712 0.06 0.10625 0.09-16.668 4.1353-27.108 10.053-27.108 16.622 0 12.499 37.766 22.631 84.353 22.631 46.586 0 84.351-10.133 84.351-22.631 0-6.5699-10.439-12.487-27.108-16.622 0.0362-0.03 0.0712-0.06 0.10625-0.09 16.798 4.1514 27.322 10.102 27.322 16.712 0 12.546-37.91 22.717-84.672 22.717m35.891-43.204c0.0463-0.026 0.0913-0.051 0.1375-0.078-0.0463 0.026-0.0913 0.051-0.1375 0.078"/>
   <path id="path5173" d="m305.59 950.58c-46.586 0-84.353-10.133-84.353-22.631 0-6.5699 10.44-12.487 27.108-16.622 0.0362 0.031 0.0713 0.062 0.1075 0.091-16.541 4.1176-26.894 10-26.894 16.531 0 12.451 37.621 22.545 84.031 22.545 46.409 0 84.031-10.094 84.031-22.545 0-6.5313-10.352-12.414-26.894-16.531 0.035-0.03 0.0712-0.06 0.10625-0.091 16.669 4.1353 27.108 10.053 27.108 16.622 0 12.499-37.765 22.631-84.351 22.631m35.754-43.04c0.0463-0.025 0.0925-0.051 0.1375-0.078-0.045 0.026-0.0912 0.053-0.1375 0.078"/>
   <path id="path5175" d="m305.59 950.49c-46.41 0-84.031-10.094-84.031-22.545 0-6.5312 10.352-12.414 26.894-16.531 0.035 0.03 0.0712 0.06 0.1075 0.091-16.415 4.1001-26.681 9.9487-26.681 16.44 0 12.404 37.479 22.459 83.711 22.459 46.231 0 83.71-10.055 83.71-22.459 0-6.4913-10.266-12.34-26.68-16.44 0.0362-0.031 0.0712-0.062 0.1075-0.091 16.541 4.1176 26.894 10 26.894 16.531 0 12.451-37.622 22.545-84.031 22.545m35.616-42.876c0.045-0.025 0.0913-0.051 0.1375-0.078-0.0463 0.026-0.0925 0.052-0.1375 0.078"/>
   <path id="path5177" d="m305.59 950.41c-46.233 0-83.711-10.055-83.711-22.459 0-6.4912 10.266-12.34 26.681-16.44 0.035 0.03 0.0713 0.06 0.1075 0.09-16.289 4.084-26.468 9.8975-26.468 16.35 0 12.356 37.335 22.373 83.39 22.373s83.39-10.016 83.39-22.373c0-6.4526-10.18-12.266-26.468-16.35 0.0362-0.03 0.0713-0.06 0.1075-0.09 16.414 4.1001 26.68 9.9488 26.68 16.44 0 12.404-37.479 22.459-83.71 22.459m35.476-42.712c0.0463-0.026 0.0937-0.053 0.14-0.079-0.0463 0.026-0.0937 0.052-0.14 0.079"/>
   <path id="path5179" d="m305.59 950.32c-46.055 0-83.39-10.016-83.39-22.373 0-6.4526 10.179-12.266 26.468-16.35 0.0362 0.03 0.0713 0.06 0.1075 0.091-16.159 4.0664-26.254 9.8461-26.254 16.259 0 12.309 37.19 22.288 83.069 22.288 45.878 0 83.069-9.979 83.069-22.288 0-6.4126-10.095-12.192-26.255-16.259 0.0362-0.03 0.0725-0.061 0.10875-0.091 16.288 4.084 26.468 9.8975 26.468 16.35 0 12.356-37.335 22.373-83.39 22.373m35.338-42.547c0.0463-0.026 0.0925-0.053 0.13875-0.078-0.0463 0.025-0.0925 0.051-0.13875 0.078"/>
   <path id="path5181" d="m305.59 950.23c-45.879 0-83.069-9.979-83.069-22.288 0-6.4126 10.095-12.192 26.254-16.259 0.0362 0.03 0.0725 0.06 0.10875 0.09-16.031 4.0488-26.042 9.7965-26.042 16.169 0 12.261 37.048 22.201 82.749 22.201 45.7 0 82.748-9.9399 82.748-22.201 0-6.3725-10.011-12.12-26.041-16.169 0.035-0.03 0.0713-0.06 0.1075-0.09 16.16 4.0663 26.255 9.8461 26.255 16.259 0 12.309-37.191 22.288-83.069 22.288m35.198-42.386c0.0463-0.025 0.0937-0.051 0.14-0.076-0.0463 0.025-0.0937 0.051-0.14 0.076"/>
   <path id="path5183" d="m305.59 950.15c-45.701 0-82.749-9.94-82.749-22.201 0-6.3725 10.011-12.12 26.042-16.169 0.0362 0.031 0.0725 0.062 0.10875 0.091-15.906 4.0313-25.83 9.7441-25.83 16.078 0 12.214 36.904 22.115 82.428 22.115 45.522 0 82.428-9.9009 82.428-22.115 0-6.3335-9.9238-12.046-25.83-16.078 0.0362-0.03 0.0725-0.06 0.10875-0.091 16.03 4.0489 26.041 9.7965 26.041 16.169 0 12.261-37.048 22.201-82.748 22.201m35.056-42.223c0.0487-0.026 0.0925-0.05 0.14125-0.077-0.0487 0.027-0.0925 0.051-0.14125 0.077"/>
   <path id="path5185" d="m305.59 950.06c-45.524 0-82.428-9.9009-82.428-22.115 0-6.3335 9.9238-12.046 25.83-16.078 0.0362 0.03 0.0725 0.062 0.10875 0.091-15.779 4.0137-25.619 9.6914-25.619 15.986 0 12.166 36.761 22.029 82.108 22.029 45.346 0 82.106-9.8628 82.106-22.029 0-6.2949-9.8388-11.973-25.619-15.986 0.0362-0.03 0.0738-0.061 0.11-0.091 15.906 4.0313 25.83 9.7442 25.83 16.078 0 12.214-36.905 22.115-82.428 22.115m34.915-42.059c0.0463-0.025 0.095-0.051 0.14125-0.078-0.0463 0.026-0.095 0.053-0.14125 0.078"/>
   <path id="path5187" d="m305.59 949.98c-45.346 0-82.108-9.8628-82.108-22.029 0-6.2949 9.84-11.973 25.619-15.986 0.0363 0.03 0.0738 0.06 0.11 0.09-15.652 3.9977-25.408 9.6417-25.408 15.896 0 12.119 36.616 21.942 81.786 21.942 45.169 0 81.785-9.8237 81.785-21.942 0-6.2548-9.7538-11.899-25.406-15.896 0.0362-0.03 0.0725-0.06 0.10875-0.09 15.78 4.0138 25.619 9.6915 25.619 15.986 0 12.166-36.76 22.029-82.106 22.029m34.772-41.895c0.0487-0.026 0.0937-0.051 0.1425-0.078-0.0487 0.026-0.0937 0.051-0.1425 0.078"/>
   <path id="path5189" d="m305.59 949.89c-45.17 0-81.786-9.8237-81.786-21.942 0-6.2549 9.755-11.899 25.408-15.896 0.0362 0.03 0.0725 0.062 0.11 0.091-15.528 3.9799-25.196 9.5889-25.196 15.805 0 12.071 36.472 21.856 81.465 21.856 44.991 0 81.465-9.7852 81.465-21.856 0-6.2162-9.67-11.825-25.196-15.805 0.0362-0.03 0.0738-0.061 0.11-0.091 15.652 3.9976 25.406 9.6416 25.406 15.896 0 12.119-36.616 21.942-81.785 21.942m34.63-41.731c0.0475-0.025 0.0962-0.053 0.1425-0.078-0.0463 0.025-0.095 0.052-0.1425 0.078"/>
   <path id="path5191" d="m305.59 949.8c-44.993 0-81.465-9.7852-81.465-21.856 0-6.2162 9.6688-11.825 25.196-15.805 0.0362 0.03 0.0738 0.062 0.11 0.091-15.398 3.9614-24.986 9.5377-24.986 15.714 0 12.024 36.33 21.77 81.145 21.77 44.814 0 81.144-9.7461 81.144-21.77 0-6.1762-9.5875-11.752-24.985-15.714 0.0362-0.03 0.0737-0.061 0.11-0.091 15.526 3.9799 25.196 9.5889 25.196 15.805 0 12.071-36.474 21.856-81.465 21.856m34.488-41.569c0.0487-0.025 0.095-0.05 0.1425-0.076-0.0475 0.026-0.0937 0.051-0.1425 0.076"/>
   <path id="path5193" d="m305.59 949.72c-44.815 0-81.145-9.7461-81.145-21.77 0-6.1762 9.5888-11.752 24.986-15.714 0.0362 0.029 0.0737 0.06 0.11 0.09-15.272 3.9448-24.775 9.4858-24.775 15.624 0 11.976 36.186 21.685 80.824 21.685s80.822-9.709 80.822-21.685c0-6.1377-9.5012-11.679-24.775-15.624 0.0362-0.03 0.075-0.062 0.11125-0.09 15.398 3.9614 24.985 9.5377 24.985 15.714 0 12.024-36.33 21.77-81.144 21.77m34.344-41.405c0.0463-0.025 0.0963-0.052 0.14375-0.077-0.0475 0.025-0.0975 0.052-0.14375 0.077"/>
  </g>
  <g>
   <path id="path5195" d="m305.59 949.63c-44.638 0-80.824-9.709-80.824-21.685 0-6.1377 9.5025-11.679 24.775-15.624 0.0387 0.031 0.0725 0.06 0.11125 0.091-15.146 3.9278-24.566 9.4351-24.566 15.533 0 11.929 36.042 21.599 80.504 21.599 44.46 0 80.502-9.6699 80.502-21.599 0-6.0977-9.42-11.605-24.566-15.533 0.0387-0.031 0.0725-0.06 0.11125-0.091 15.274 3.9448 24.775 9.4858 24.775 15.624 0 11.976-36.185 21.685-80.822 21.685m34.199-41.244c0.0487-0.025 0.0962-0.05 0.145-0.077-0.0487 0.026-0.0962 0.051-0.145 0.077" fill="#feffff"/>
   <path id="path5197" d="m305.59 949.55c-44.461 0-80.504-9.67-80.504-21.599 0-6.0976 9.42-11.605 24.566-15.533 0.0362 0.03 0.075 0.062 0.11125 0.091-15.022 3.9101-24.356 9.3827-24.356 15.441 0 11.881 35.899 21.513 80.183 21.513 44.282 0 80.181-9.6313 80.181-21.513 0-6.0586-9.3338-11.531-24.356-15.441 0.0375-0.03 0.075-0.061 0.11125-0.091 15.146 3.9278 24.566 9.4352 24.566 15.533 0 11.929-36.042 21.599-80.502 21.599m34.054-41.08c0.0487-0.026 0.0962-0.051 0.145-0.077-0.0487 0.026-0.0962 0.051-0.145 0.077" fill="#feffff"/>
   <path id="path5199" d="m305.59 949.46c-44.284 0-80.183-9.6313-80.183-21.513 0-6.0586 9.3338-11.531 24.356-15.441 0.0362 0.029 0.075 0.062 0.11125 0.09-14.895 3.8922-24.146 9.3327-24.146 15.351 0 11.834 35.755 21.426 79.861 21.426s79.861-9.5923 79.861-21.426c0-6.0185-9.2512-11.459-24.148-15.351 0.0362-0.029 0.075-0.062 0.11125-0.09 15.022 3.9102 24.356 9.3828 24.356 15.441 0 11.881-35.899 21.513-80.181 21.513m33.909-40.917c0.0487-0.025 0.0962-0.05 0.145-0.077-0.0487 0.026-0.0962 0.051-0.145 0.077" fill="#fefeff"/>
   <path id="path5201" d="m305.59 949.37c-44.106 0-79.861-9.5923-79.861-21.426 0-6.0185 9.2512-11.459 24.146-15.351 0.0387 0.031 0.0738 0.06 0.1125 0.091-14.77 3.8755-23.939 9.2802-23.939 15.26 0 11.786 35.611 21.34 79.541 21.34 43.929 0 79.54-9.5537 79.54-21.34 0-5.98-9.1675-11.385-23.939-15.26 0.0387-0.031 0.0737-0.06 0.1125-0.091 14.896 3.8921 24.148 9.3326 24.148 15.351 0 11.834-35.755 21.426-79.861 21.426m33.762-40.754c0.0463-0.025 0.0988-0.052 0.14625-0.077-0.0475 0.025-0.1 0.052-0.14625 0.077" fill="#fefefe"/>
   <path id="path5203" d="m305.59 949.29c-43.93 0-79.541-9.5537-79.541-21.34 0-5.98 9.1688-11.385 23.939-15.26 0.0362 0.03 0.0763 0.062 0.1125 0.091-14.645 3.8565-23.73 9.2276-23.73 15.169 0 11.739 35.468 21.255 79.22 21.255 43.751 0 79.219-9.5162 79.219-21.255 0-5.9414-9.0838-11.312-23.73-15.169 0.0375-0.03 0.0763-0.061 0.1125-0.091 14.771 3.8755 23.939 9.2802 23.939 15.26 0 11.786-35.611 21.34-79.54 21.34m33.615-40.591c0.0487-0.025 0.0975-0.051 0.1475-0.076-0.05 0.025-0.0987 0.051-0.1475 0.076" fill="#fefefe"/>
   <path id="path5205" d="m305.59 949.2c-43.753 0-79.22-9.5161-79.22-21.255 0-5.9414 9.085-11.312 23.73-15.169 0.0387 0.031 0.0738 0.059 0.1125 0.09-14.521 3.8399-23.522 9.1773-23.522 15.079 0 11.691 35.325 21.169 78.9 21.169s78.899-9.4776 78.899-21.169c0-5.9013-9.0012-11.239-23.522-15.079 0.0387-0.031 0.0737-0.059 0.1125-0.09 14.646 3.8565 23.73 9.2276 23.73 15.169 0 11.739-35.468 21.255-79.219 21.255m33.468-40.43c0.0513-0.026 0.0963-0.05 0.1475-0.077-0.0512 0.026-0.0962 0.05-0.1475 0.077" fill="#fdfefe"/>
   <path id="path5207" d="m305.59 949.12c-43.575 0-78.9-9.4776-78.9-21.169 0-5.9014 9.0012-11.239 23.522-15.079l0.11375 0.091c-14.395 3.8207-23.315 9.125-23.315 14.987 0 11.644 35.181 21.083 78.579 21.083s78.578-9.439 78.578-21.083c0-5.8622-8.92-11.166-23.315-14.987 0.0375-0.029 0.0775-0.062 0.11375-0.091 14.521 3.8399 23.522 9.1772 23.522 15.079 0 11.691-35.324 21.169-78.899 21.169m33.319-40.268c0.0487-0.025 0.0987-0.051 0.14875-0.076-0.05 0.025-0.1 0.051-0.14875 0.076" fill="#fdfefe"/>
   <path id="path5209" d="m305.59 949.03c-43.398 0-78.579-9.4389-78.579-21.082 0-5.8622 8.92-11.166 23.315-14.987 0.0387 0.031 0.075 0.06 0.11375 0.091-14.271 3.8042-23.108 9.0727-23.108 14.896 0 11.596 35.036 20.996 78.258 20.996 43.22 0 78.258-9.3999 78.258-20.996 0-5.8238-8.8362-11.092-23.109-14.896 0.04-0.031 0.075-0.06 0.11375-0.091 14.395 3.8207 23.315 9.125 23.315 14.987 0 11.644-35.18 21.082-78.578 21.082m33.17-40.105c0.0487-0.025 0.1-0.051 0.14875-0.076-0.0487 0.025-0.1 0.051-0.14875 0.076" fill="#fdfdfe"/>
   <path id="path5211" d="m305.59 948.94c-43.221 0-78.258-9.3999-78.258-20.996 0-5.8237 8.8362-11.092 23.108-14.896 0.0362 0.029 0.0775 0.062 0.11375 0.091-14.146 3.7851-22.901 9.0214-22.901 14.805 0 11.549 34.894 20.91 77.938 20.91 43.042 0 77.936-9.3614 77.936-20.91 0-5.7837-8.755-11.02-22.901-14.805l0.11375-0.091c14.272 3.8042 23.109 9.0727 23.109 14.896 0 11.596-35.038 20.996-78.258 20.996m33.02-39.942c0.0487-0.025 0.10125-0.051 0.15-0.076-0.0487 0.025-0.10125 0.051-0.15 0.076" fill="#fdfdfd"/>
   <path id="path5213" d="m305.59 948.86c-43.044 0-77.938-9.3614-77.938-20.91 0-5.7837 8.755-11.02 22.901-14.805 0.04 0.031 0.0762 0.06 0.115 0.09-14.025 3.7686-22.695 8.9697-22.695 14.715 0 11.501 34.75 20.824 77.616 20.824s77.615-9.3223 77.615-20.824c0-5.7452-8.67-10.946-22.694-14.715 0.0387-0.03 0.075-0.059 0.11375-0.09 14.146 3.7851 22.901 9.0214 22.901 14.805 0 11.549-34.894 20.91-77.936 20.91m32.87-39.78c0.0512-0.026 0.0987-0.05 0.15-0.076-0.0513 0.026-0.0988 0.05-0.15 0.076" fill="#fdfdfd"/>
   <path id="path5215" d="m305.59 948.77c-42.866 0-77.616-9.3222-77.616-20.824 0-5.7451 8.67-10.946 22.695-14.715 0.0362 0.03 0.0775 0.062 0.115 0.091-13.901 3.75-22.489 8.9175-22.489 14.624 0 11.454 34.606 20.737 77.295 20.737s77.295-9.2836 77.295-20.737c0-5.706-8.5888-10.874-22.489-14.624 0.0362-0.029 0.0775-0.062 0.115-0.091 14.024 3.7687 22.694 8.9698 22.694 14.715 0 11.502-34.749 20.824-77.615 20.824m32.719-39.618c0.05-0.025 0.10125-0.051 0.15125-0.076-0.05 0.025-0.10125 0.051-0.15125 0.076" fill="#fcfdfd"/>
   <path id="path5217" d="m305.59 948.68c-42.689 0-77.295-9.2837-77.295-20.737 0-5.706 8.5875-10.874 22.489-14.624 0.0388 0.031 0.0763 0.06 0.115 0.091-13.778 3.7315-22.284 8.8653-22.284 14.533 0 11.406 34.462 20.652 76.975 20.652 42.511 0 76.974-9.2461 76.974-20.652 0-5.6675-8.5062-10.801-22.284-14.533 0.04-0.031 0.0762-0.059 0.11625-0.091 13.9 3.75 22.489 8.9175 22.489 14.624 0 11.454-34.606 20.737-77.295 20.737m32.566-39.455c0.0525-0.026 0.10125-0.05 0.1525-0.076-0.0512 0.026-0.1 0.05-0.1525 0.076" fill="#fcfdfd"/>
   <path id="path5219" d="m305.59 948.6c-42.513 0-76.975-9.2461-76.975-20.652 0-5.6675 8.5062-10.801 22.284-14.533 0.0387 0.031 0.0763 0.06 0.11625 0.091-13.651 3.7138-22.079 8.8138-22.079 14.441 0 11.359 34.319 20.566 76.654 20.566 42.334 0 76.654-9.2075 76.654-20.566 0-5.6275-8.4275-10.728-22.079-14.441 0.0387-0.031 0.0763-0.06 0.115-0.091 13.778 3.7315 22.284 8.8652 22.284 14.533 0 11.406-34.462 20.652-76.974 20.652m32.414-39.294c0.05-0.025 0.10375-0.051 0.1525-0.077-0.0487 0.025-0.1025 0.051-0.1525 0.077" fill="#fcfcfd"/>
   <path id="path5221" d="m305.59 948.51c-42.335 0-76.654-9.2075-76.654-20.566 0-5.6275 8.4275-10.728 22.079-14.441 0.0362 0.029 0.0787 0.062 0.11625 0.091-13.53 3.6954-21.875 8.7613-21.875 14.35 0 11.311 34.176 20.48 76.334 20.48s76.332-9.1689 76.332-20.48c0-5.5889-8.345-10.655-21.874-14.35 0.0375-0.029 0.0788-0.062 0.11625-0.091 13.651 3.7139 22.079 8.8139 22.079 14.441 0 11.359-34.32 20.566-76.654 20.566m32.261-39.133c0.0512-0.025 0.10125-0.05 0.1525-0.075-0.0512 0.025-0.10125 0.05-0.1525 0.075" fill="#fcfcfc"/>
   <path id="path5223" d="m305.59 948.43c-42.158 0-76.334-9.1689-76.334-20.48 0-5.5889 8.345-10.655 21.875-14.35 0.0387 0.03 0.0763 0.06 0.11625 0.091-13.405 3.6762-21.67 8.709-21.67 14.259 0 11.264 34.031 20.394 76.013 20.394 41.98 0 76.011-9.1299 76.011-20.394 0-5.5497-8.2638-10.582-21.669-14.259 0.0387-0.031 0.0775-0.061 0.11625-0.091 13.529 3.6954 21.874 8.7612 21.874 14.35 0 11.311-34.175 20.48-76.332 20.48m32.108-38.97c0.0513-0.026 0.1025-0.05 0.15375-0.076-0.0512 0.026-0.1025 0.05-0.15375 0.076" fill="#fbfcfc"/>
   <path id="path5225" d="m305.59 948.34c-41.981 0-76.013-9.1299-76.013-20.394 0-5.5497 8.265-10.582 21.67-14.259 0.0387 0.03 0.0775 0.06 0.11625 0.09-13.284 3.6602-21.465 8.6577-21.465 14.169 0 11.216 33.888 20.308 75.691 20.308 41.802 0 75.691-9.0914 75.691-20.308 0-5.5113-8.1825-10.509-21.466-14.169 0.04-0.03 0.0775-0.06 0.1175-0.09 13.405 3.6762 21.669 8.709 21.669 14.259 0 11.264-34.031 20.394-76.011 20.394m31.952-38.809c0.0513-0.025 0.1025-0.05 0.155-0.075-0.0525 0.025-0.10375 0.05-0.155 0.075" fill="#fbfcfc"/>
   <path id="path5227" d="m305.59 948.25c-41.804 0-75.691-9.0913-75.691-20.308 0-5.5112 8.1812-10.509 21.465-14.169 0.04 0.031 0.0787 0.062 0.1175 0.091-13.161 3.6411-21.262 8.605-21.262 14.078 0 11.169 33.745 20.221 75.371 20.221s75.37-9.0522 75.37-20.221c0-5.4726-8.1012-10.436-21.262-14.078 0.04-0.03 0.0788-0.06 0.1175-0.091 13.284 3.6603 21.466 8.6578 21.466 14.169 0 11.216-33.889 20.308-75.691 20.308m31.798-38.646c0.0513-0.025 0.10375-0.051 0.155-0.076-0.0512 0.025-0.10375 0.051-0.155 0.076" fill="#fbfbfb"/>
   <path id="path5229" d="m305.59 948.17c-41.626 0-75.371-9.0522-75.371-20.221 0-5.4726 8.1012-10.436 21.262-14.078 0.04 0.031 0.0787 0.062 0.1175 0.091-13.038 3.6226-21.059 8.5527-21.059 13.986 0 11.12 33.601 20.136 75.05 20.136s75.049-9.0161 75.049-20.136c0-5.4337-8.02-10.364-21.059-13.986 0.04-0.03 0.0788-0.06 0.1175-0.091 13.161 3.6411 21.262 8.605 21.262 14.078 0 11.169-33.744 20.221-75.37 20.221m31.641-38.485c0.0513-0.025 0.10375-0.05 0.15625-0.075-0.0525 0.025-0.105 0.05-0.15625 0.075" fill="#fbfbfb"/>
   <path id="path5231" d="m305.59 948.08c-41.449 0-75.05-9.0161-75.05-20.136 0-5.4336 8.0212-10.364 21.059-13.986 0.04 0.03 0.0788 0.062 0.11875 0.091-12.916 3.604-20.858 8.5-20.858 13.895 0 11.072 33.458 20.05 74.73 20.05 41.271 0 74.729-8.9775 74.729-20.05 0-5.395-7.94-10.291-20.858-13.895 0.04-0.03 0.0787-0.061 0.11875-0.091 13.039 3.6227 21.059 8.5528 21.059 13.986 0 11.12-33.6 20.136-75.049 20.136m31.484-38.325l0.1575-0.075-0.1575 0.075" fill="#fafbfb"/>
   <path id="path5233" d="m305.59 948c-41.273 0-74.73-8.9775-74.73-20.05 0-5.395 7.9412-10.291 20.858-13.895 0.04 0.03 0.0788 0.062 0.11875 0.091-12.792 3.585-20.655 8.4488-20.655 13.804 0 11.025 33.314 19.964 74.409 19.964 41.094 0 74.408-8.939 74.408-19.964 0-5.355-7.8612-10.219-20.654-13.804 0.0387-0.03 0.0787-0.062 0.1175-0.091 12.918 3.604 20.858 8.5 20.858 13.895 0 11.072-33.458 20.05-74.729 20.05m31.326-38.162c0.0525-0.026 0.105-0.051 0.1575-0.077-0.0525 0.025-0.105 0.051-0.1575 0.077" fill="#fafbfb"/>
   <path id="path5235" d="m305.59 947.91c-41.095 0-74.409-8.939-74.409-19.964 0-5.355 7.8625-10.219 20.655-13.804 0.04 0.03 0.0788 0.061 0.11875 0.091-12.672 3.5658-20.452 8.396-20.452 13.712 0 10.978 33.17 19.878 74.088 19.878s74.088-8.9 74.088-19.878c0-5.3163-7.7812-10.146-20.454-13.712 0.04-0.03 0.08-0.062 0.12-0.091 12.792 3.585 20.654 8.4487 20.654 13.804 0 11.025-33.314 19.964-74.408 19.964m31.168-38.002c0.0525-0.025 0.10625-0.051 0.15875-0.075-0.0525 0.023-0.10625 0.05-0.15875 0.075" fill="#fafafa"/>
   <path id="path5237" d="m305.59 947.82c-40.918 0-74.088-8.9-74.088-19.878 0-5.3164 7.78-10.146 20.452-13.712 0.04 0.03 0.08 0.061 0.12 0.091-12.55 3.5474-20.252 8.3438-20.252 13.621 0 10.93 33.028 19.791 73.768 19.791s73.766-8.8609 73.766-19.791c0-5.2774-7.7012-10.074-20.251-13.621 0.0387-0.03 0.0788-0.062 0.11875-0.091 12.672 3.5659 20.454 8.396 20.454 13.712 0 10.978-33.17 19.878-74.088 19.878m31.009-37.84c0.0537-0.026 0.105-0.05 0.15875-0.075-0.0537 0.025-0.105 0.049-0.15875 0.075" fill="#fafafa"/>
   <path id="path5239" d="m305.59 947.74c-40.74 0-73.768-8.8609-73.768-19.791 0-5.2774 7.7025-10.074 20.252-13.621 0.04 0.03 0.08 0.061 0.12 0.091-12.431 3.5282-20.051 8.291-20.051 13.53 0 10.882 32.882 19.705 73.446 19.705 40.562 0 73.445-8.8227 73.445-19.705 0-5.2387-7.6188-10.002-20.05-13.53 0.0388-0.03 0.08-0.062 0.12-0.091 12.55 3.5474 20.251 8.3437 20.251 13.621 0 10.93-33.026 19.791-73.766 19.791m30.849-37.679c0.0512-0.025 0.1075-0.051 0.16-0.075-0.0525 0.023-0.10875 0.05-0.16 0.075" fill="#f9fafa"/>
   <path id="path5241" d="m305.59 947.65c-40.564 0-73.446-8.8227-73.446-19.705 0-5.2387 7.62-10.002 20.051-13.53 0.04 0.03 0.08 0.061 0.12 0.091-12.31 3.5102-19.851 8.2387-19.851 13.439 0 10.835 32.74 19.619 73.126 19.619 40.385 0 73.125-8.7836 73.125-19.619 0-5.2003-7.54-9.9288-19.851-13.439 0.04-0.03 0.0813-0.061 0.12125-0.091 12.431 3.5282 20.05 8.291 20.05 13.53 0 10.882-32.882 19.705-73.445 19.705m30.688-37.518c0.055-0.026 0.10625-0.05 0.16125-0.075-0.055 0.026-0.10625 0.049-0.16125 0.075" fill="#f9f9f9"/>
   <path id="path5243" d="m305.59 947.57c-40.386 0-73.126-8.7837-73.126-19.619 0-5.2002 7.5412-9.9287 19.851-13.439 0.04 0.03 0.0813 0.062 0.12125 0.091-12.188 3.4911-19.651 8.1865-19.651 13.348 0 10.788 32.596 19.534 72.805 19.534s72.804-8.746 72.804-19.534c0-5.1611-7.4638-9.8565-19.65-13.348 0.04-0.03 0.08-0.061 0.12-0.091 12.311 3.5103 19.851 8.2388 19.851 13.439 0 10.835-32.74 19.619-73.125 19.619m30.526-37.357c0.0538-0.025 0.10625-0.049 0.16125-0.074-0.055 0.025-0.1075 0.049-0.16125 0.074" fill="#f9f9f9"/>
   <path id="path5245" d="m305.59 947.48c-40.209 0-72.805-8.7461-72.805-19.534 0-5.1611 7.4638-9.8565 19.651-13.348 0.0412 0.031 0.0788 0.059 0.12125 0.091-12.068 3.4726-19.451 8.1339-19.451 13.256 0 10.74 32.451 19.448 72.484 19.448 40.031 0 72.484-8.7075 72.484-19.448 0-5.1225-7.3838-9.7838-19.452-13.256 0.0425-0.032 0.08-0.06 0.1225-0.091 12.186 3.4911 19.65 8.1865 19.65 13.348 0 10.788-32.595 19.534-72.804 19.534m30.362-37.197c0.055-0.025 0.10875-0.05 0.16375-0.075-0.055 0.025-0.10875 0.05-0.16375 0.075" fill="#f8f9f9"/>
   <path id="path5247" d="m305.59 947.39c-40.033 0-72.484-8.7075-72.484-19.448 0-5.1225 7.3838-9.7837 19.451-13.256 0.04 0.03 0.0813 0.062 0.12125 0.091-11.949 3.4537-19.252 8.08-19.252 13.165 0 10.692 32.309 19.361 72.164 19.361 39.854 0 72.162-8.669 72.162-19.361 0-5.085-7.3038-9.7113-19.252-13.165 0.04-0.03 0.0825-0.061 0.12125-0.091 12.069 3.4727 19.452 8.1339 19.452 13.256 0 10.74-32.452 19.448-72.484 19.448m30.2-37.037c0.0525-0.023 0.11-0.051 0.1625-0.075-0.0525 0.024-0.11 0.051-0.1625 0.075" fill="#f8f8f8"/>
   <path id="path5249" d="m305.59 947.31c-39.855 0-72.164-8.6689-72.164-19.361 0-5.085 7.3038-9.7114 19.252-13.165 0.04 0.029 0.0825 0.062 0.1225 0.091-11.828 3.4351-19.054 8.0274-19.054 13.074 0 10.645 32.165 19.275 71.843 19.275s71.841-8.6299 71.841-19.275c0-5.0464-7.225-9.6387-19.054-13.074 0.04-0.03 0.0825-0.062 0.1225-0.091 11.949 3.4536 19.252 8.08 19.252 13.165 0 10.692-32.309 19.361-72.162 19.361m30.035-36.876c0.055-0.024 0.11-0.049 0.165-0.074-0.055 0.025-0.11 0.05-0.165 0.074" fill="#f8f8f8"/>
   <path id="path5251" d="m305.59 947.22c-39.678 0-71.843-8.6299-71.843-19.275 0-5.0464 7.2262-9.6386 19.054-13.074 0.0425 0.031 0.0812 0.059 0.1225 0.091-11.708 3.416-18.855 7.975-18.855 12.982 0 10.598 32.021 19.189 71.521 19.189s71.521-8.5913 71.521-19.189c0-5.0073-7.1488-9.5663-18.856-12.982 0.0425-0.033 0.0813-0.06 0.1225-0.091 11.829 3.4351 19.054 8.0273 19.054 13.074 0 10.645-32.164 19.275-71.841 19.275m29.87-36.715c0.0575-0.026 0.10875-0.049 0.165-0.075-0.0563 0.026-0.1075 0.049-0.165 0.075" fill="#f7f8f8"/>
   <path id="path5253" d="m305.59 947.14c-39.5 0-71.521-8.5914-71.521-19.189 0-5.0074 7.1475-9.5664 18.855-12.982 0.04 0.029 0.0837 0.061 0.12375 0.091-11.589 3.3975-18.659 7.9224-18.659 12.891 0 10.55 31.878 19.102 71.201 19.102 39.322 0 71.2-8.5528 71.2-19.102 0-4.9688-7.07-9.4937-18.658-12.891 0.04-0.03 0.0825-0.062 0.1225-0.091 11.708 3.416 18.856 7.975 18.856 12.982 0 10.598-32.021 19.189-71.521 19.189m29.704-36.555c0.055-0.024 0.11125-0.049 0.16625-0.074-0.055 0.025-0.11125 0.05-0.16625 0.074" fill="#f7f7f7"/>
   <path id="path5255" d="m305.59 947.05c-39.324 0-71.201-8.5528-71.201-19.103 0-4.9687 7.07-9.4936 18.659-12.891 0.0425 0.031 0.0813 0.06 0.12375 0.091-11.47 3.3784-18.461 7.8696-18.461 12.8 0 10.502 31.734 19.016 70.88 19.016s70.88-8.5137 70.88-19.016c0-4.9301-6.9925-9.4213-18.461-12.8 0.0425-0.031 0.0813-0.06 0.12375-0.091 11.588 3.3975 18.658 7.9224 18.658 12.891 0 10.55-31.878 19.103-71.2 19.103m29.538-36.394c0.055-0.025 0.11125-0.05 0.16625-0.075-0.055 0.025-0.11125 0.05-0.16625 0.075" fill="#f6f7f7"/>
   <path id="path5257" d="m305.59 946.96c-39.146 0-70.88-8.5136-70.88-19.016 0-4.9301 6.9912-9.4214 18.461-12.8 0.04 0.028 0.0837 0.061 0.12375 0.091-11.349 3.3588-18.265 7.8178-18.265 12.709 0 10.455 31.591 18.931 70.56 18.931s70.559-8.476 70.559-18.931c0-4.8912-6.915-9.3502-18.265-12.709 0.0412-0.03 0.085-0.062 0.125-0.091 11.469 3.3783 18.461 7.8696 18.461 12.8 0 10.502-31.734 19.016-70.88 19.016m29.37-36.233c0.0563-0.025 0.11-0.049 0.1675-0.074-0.0575 0.025-0.11125 0.049-0.1675 0.074" fill="#f6f6f7"/>
   <path id="path5259" d="m305.59 946.88c-38.969 0-70.56-8.4761-70.56-18.931 0-4.8911 6.9162-9.3501 18.265-12.709 0.0425 0.031 0.0825 0.06 0.125 0.091-11.232 3.3403-18.069 7.7651-18.069 12.618 0 10.408 31.446 18.845 70.239 18.845 38.791 0 70.238-8.4374 70.238-18.845 0-4.8525-6.8362-9.2773-18.068-12.618 0.0425-0.031 0.0813-0.06 0.12375-0.091 11.35 3.3589 18.265 7.8179 18.265 12.709 0 10.455-31.59 18.931-70.559 18.931m29.201-36.075c0.055-0.024 0.11375-0.05 0.16875-0.074-0.055 0.023-0.11375 0.05-0.16875 0.074" fill="#f6f6f6"/>
   <path id="path5261" d="m305.59 946.79c-38.793 0-70.239-8.4374-70.239-18.845 0-4.8525 6.8362-9.2774 18.069-12.618 0.04 0.029 0.0838 0.062 0.125 0.091-11.114 3.3213-17.872 7.7114-17.872 12.526 0 10.36 31.302 18.759 69.918 18.759 38.614 0 69.918-8.399 69.918-18.759 0-4.815-6.76-9.2051-17.872-12.526 0.04-0.03 0.085-0.062 0.125-0.091 11.231 3.3402 18.068 7.7651 18.068 12.618 0 10.408-31.446 18.845-70.238 18.845m29.031-35.915c0.0575-0.025 0.1125-0.049 0.17-0.074-0.0575 0.025-0.1125 0.048-0.17 0.074" fill="#f5f6f6"/>
   <path id="path5263" d="m305.59 946.71c-38.615 0-69.918-8.3989-69.918-18.759 0-4.815 6.7588-9.2051 17.872-12.526 0.0425 0.031 0.0825 0.06 0.125 0.091-10.995 3.3027-17.678 7.6587-17.678 12.435 0 10.312 31.16 18.672 69.598 18.672s69.596-8.3599 69.596-18.672c0-4.7763-6.6825-9.1323-17.678-12.435 0.0425-0.031 0.0838-0.06 0.12625-0.091 11.112 3.3213 17.872 7.7114 17.872 12.526 0 10.36-31.304 18.759-69.918 18.759m28.861-35.755c0.0562-0.025 0.1125-0.049 0.17-0.074-0.0575 0.025-0.11375 0.048-0.17 0.074" fill="#f5f5f5"/>
   <path id="path5265" d="m305.59 946.62c-38.438 0-69.598-8.3599-69.598-18.672 0-4.7764 6.6825-9.1324 17.678-12.435 0.0425 0.031 0.0838 0.06 0.12625 0.091-10.878 3.2828-17.482 7.6065-17.482 12.344 0 10.265 31.016 18.586 69.276 18.586s69.276-8.3213 69.276-18.586c0-4.7373-6.6062-9.061-17.484-12.344 0.0437-0.031 0.0838-0.06 0.12625-0.091 10.995 3.3026 17.678 7.6586 17.678 12.435 0 10.312-31.159 18.672-69.596 18.672m28.689-35.595c0.055-0.024 0.11625-0.05 0.1725-0.074-0.0563 0.024-0.1175 0.05-0.1725 0.074" fill="#f5f5f5"/>
   <path id="path5267" d="m305.59 946.53c-38.26 0-69.276-8.3213-69.276-18.586 0-4.7372 6.605-9.061 17.482-12.344 0.0425 0.031 0.0837 0.061 0.12625 0.091-10.758 3.2637-17.288 7.5537-17.288 12.252 0 10.217 30.871 18.5 68.955 18.5 38.082 0 68.955-8.2828 68.955-18.5 0-4.6988-6.5312-8.9888-17.289-12.252 0.0425-0.03 0.0838-0.06 0.12625-0.091 10.878 3.2827 17.484 7.6065 17.484 12.344 0 10.265-31.016 18.586-69.276 18.586m28.516-35.435c0.0575-0.025 0.115-0.049 0.1725-0.074-0.0575 0.025-0.115 0.049-0.1725 0.074" fill="#f4f4f4"/>
   <path id="path5269" d="m305.59 946.45c-38.084 0-68.955-8.2827-68.955-18.5 0-4.6987 6.53-8.9887 17.288-12.252 0.0412 0.03 0.0863 0.062 0.1275 0.091-10.642 3.2436-17.095 7.5-17.095 12.161 0 10.17 30.729 18.415 68.635 18.415 37.905 0 68.634-8.2452 68.634-18.415 0-4.6611-6.4525-8.9175-17.094-12.161 0.04-0.029 0.0863-0.062 0.12625-0.091 10.758 3.2638 17.289 7.5538 17.289 12.252 0 10.217-30.872 18.5-68.955 18.5m28.344-35.276c0.0588-0.025 0.1125-0.047 0.1725-0.072-0.06 0.025-0.11375 0.047-0.1725 0.072" fill="#f4f4f4"/>
   <path id="path5271" d="m305.59 946.36c-37.906 0-68.635-8.2452-68.635-18.415 0-4.6611 6.4525-8.9175 17.095-12.161 0.0425 0.031 0.085 0.061 0.1275 0.092-10.524 3.2236-16.901 7.4464-16.901 12.069 0 10.122 30.585 18.329 68.314 18.329s68.314-8.2061 68.314-18.329c0-4.6225-6.3775-8.8453-16.902-12.069 0.0437-0.031 0.085-0.061 0.12875-0.092 10.641 3.2436 17.094 7.5 17.094 12.161 0 10.17-30.729 18.415-68.634 18.415m28.169-35.118c0.0575-0.024 0.11625-0.049 0.175-0.074-0.0587 0.025-0.1175 0.05-0.175 0.074" fill="#f3f3f3"/>
   <path id="path5273" d="m305.59 946.28c-37.729 0-68.314-8.2061-68.314-18.329 0-4.6225 6.3775-8.8452 16.901-12.069 0.0425 0.03 0.085 0.06 0.1275 0.091-10.406 3.205-16.709 7.3935-16.709 11.978 0 10.075 30.441 18.243 67.994 18.243 37.551 0 67.992-8.1674 67.992-18.243 0-4.584-6.3012-8.7725-16.709-11.978 0.0425-0.031 0.085-0.061 0.1275-0.091 10.525 3.2237 16.902 7.4464 16.902 12.069 0 10.122-30.585 18.329-68.314 18.329m27.992-34.958c0.0588-0.025 0.11875-0.05 0.17625-0.074-0.0575 0.024-0.1175 0.049-0.17625 0.074" fill="#f3f3f2"/>
   <path id="path5275" d="m305.59 946.19c-37.553 0-67.994-8.1674-67.994-18.243 0-4.584 6.3025-8.7725 16.709-11.978 0.0437 0.03 0.0863 0.062 0.12875 0.091-10.289 3.1851-16.516 7.3413-16.516 11.886 0 10.027 30.298 18.156 67.673 18.156 37.374 0 67.672-8.1289 67.672-18.156 0-4.5449-6.2288-8.7011-16.518-11.886 0.0437-0.03 0.0862-0.062 0.12875-0.091 10.408 3.205 16.709 7.3935 16.709 11.978 0 10.075-30.441 18.243-67.992 18.243m27.816-34.799c0.06-0.025 0.11625-0.047 0.17625-0.073-0.06 0.025-0.11625 0.048-0.17625 0.073" fill="#f2f2f2"/>
   <path id="path5277" d="m305.59 946.1c-37.375 0-67.673-8.1289-67.673-18.156 0-4.5449 6.2275-8.7011 16.516-11.886 0.0437 0.03 0.0863 0.061 0.12875 0.091-10.172 3.165-16.324 7.2875-16.324 11.795 0 9.98 30.154 18.07 67.351 18.07 37.198 0 67.351-8.0899 67.351-18.07 0-4.5073-6.1512-8.6298-16.325-11.795 0.0425-0.03 0.0862-0.062 0.12875-0.091 10.289 3.1851 16.518 7.3413 16.518 11.886 0 10.027-30.299 18.156-67.672 18.156m27.639-34.64c0.0588-0.024 0.12-0.049 0.1775-0.072-0.0575 0.023-0.11875 0.049-0.1775 0.072" fill="#f2f1f1"/>
   <path id="path5279" d="m305.59 946.02c-37.198 0-67.351-8.0898-67.351-18.07 0-4.5074 6.1512-8.6299 16.324-11.795 0.0438 0.031 0.0875 0.061 0.13 0.092-10.056 3.145-16.134 7.2339-16.134 11.703 0 9.9326 30.011 17.984 67.031 17.984s67.03-8.0513 67.03-17.984c0-4.4688-6.0775-8.5577-16.134-11.703 0.0438-0.031 0.0875-0.061 0.13-0.092 10.174 3.165 16.325 7.2875 16.325 11.795 0 9.98-30.154 18.07-67.351 18.07m27.46-34.48c0.06-0.025 0.11875-0.049 0.17875-0.074-0.06 0.025-0.11875 0.049-0.17875 0.074" fill="#f1f1f1"/>
   <path id="path5281" d="m305.59 945.93c-37.02 0-67.031-8.0513-67.031-17.984 0-4.4687 6.0775-8.5576 16.134-11.703 0.0438 0.03 0.0875 0.062 0.13 0.091-9.94 3.125-15.942 7.1802-15.942 11.611 0 9.8847 29.866 17.897 66.71 17.897 36.842 0 66.71-8.0127 66.71-17.897 0-4.4312-6.0038-8.4864-15.944-11.611 0.0438-0.03 0.0875-0.061 0.13-0.091 10.056 3.145 16.134 7.2339 16.134 11.703 0 9.9326-30.01 17.984-67.03 17.984m27.281-34.321c0.06-0.025 0.11875-0.049 0.17875-0.073-0.06 0.024-0.11875 0.048-0.17875 0.073" fill="#f0f0f0"/>
   <path id="path5283" d="m305.59 945.84c-36.844 0-66.71-8.0127-66.71-17.898 0-4.4311 6.0025-8.4864 15.942-11.611 0.0437 0.03 0.0875 0.062 0.13125 0.091-9.825 3.1064-15.754 7.1274-15.754 11.52 0 9.8374 29.724 17.812 66.39 17.812 36.665 0 66.389-7.9751 66.389-17.812 0-4.3926-5.9275-8.4136-15.752-11.52 0.0425-0.03 0.0875-0.061 0.13-0.091 9.94 3.125 15.944 7.1803 15.944 11.611 0 9.8848-29.868 17.898-66.71 17.898m27.1-34.163c0.06-0.024 0.12-0.049 0.18125-0.072-0.0612 0.023-0.12125 0.049-0.18125 0.072" fill="#f0f0ef"/>
   <path id="path5285" d="m305.59 945.76c-36.666 0-66.39-7.9751-66.39-17.812 0-4.3926 5.9288-8.4136 15.754-11.52 0.045 0.031 0.085 0.06 0.13125 0.091-9.7112 3.0865-15.564 7.0738-15.564 11.429 0 9.79 29.58 17.726 66.069 17.726s66.068-7.936 66.068-17.726c0-4.355-5.8525-8.3423-15.562-11.429 0.045-0.031 0.085-0.06 0.13125-0.091 9.825 3.1064 15.752 7.1274 15.752 11.52 0 9.8374-29.724 17.812-66.389 17.812m26.918-34.005l0.1825-0.073c-0.06 0.024-0.12125 0.049-0.1825 0.073" fill="#efefef"/>
   <path id="path5287" d="m305.59 945.67c-36.489 0-66.069-7.9361-66.069-17.726 0-4.355 5.8525-8.3422 15.564-11.429 0.0425 0.03 0.0875 0.062 0.13125 0.092-9.5938 3.0648-15.374 7.02-15.374 11.336 0 9.7427 29.436 17.64 65.748 17.64 36.311 0 65.748-7.8975 65.748-17.64 0-4.3163-5.78-8.2715-15.375-11.336 0.0437-0.03 0.0887-0.062 0.1325-0.092 9.71 3.0865 15.562 7.0737 15.562 11.429 0 9.79-29.579 17.726-66.068 17.726m26.735-33.846c0.06-0.023 0.1225-0.049 0.1825-0.072-0.06 0.023-0.1225 0.049-0.1825 0.072" fill="#eee"/>
   <path id="path5289" d="m305.59 945.59c-36.311 0-65.748-7.8976-65.748-17.64 0-4.3164 5.78-8.2715 15.374-11.336 0.0438 0.03 0.0888 0.062 0.1325 0.091-9.4812 3.0465-15.186 6.9665-15.186 11.245 0 9.6949 29.292 17.554 65.428 17.554 36.134 0 65.426-7.8588 65.426-17.554 0-4.2787-5.7038-8.1987-15.185-11.245 0.0425-0.03 0.0888-0.061 0.13125-0.091 9.595 3.0649 15.375 7.02 15.375 11.336 0 9.7426-29.436 17.64-65.748 17.64m26.551-33.688c0.0625-0.025 0.12125-0.048 0.18375-0.073-0.0625 0.025-0.12125 0.048-0.18375 0.073" fill="#eeeeed"/>
   <path id="path5291" d="m305.59 945.5c-36.135 0-65.428-7.8588-65.428-17.554 0-4.2787 5.705-8.1987 15.186-11.245 0.045 0.031 0.0863 0.06 0.1325 0.091-9.3675 3.0262-14.998 6.9135-14.998 11.154 0 9.6475 29.149 17.467 65.106 17.467 35.956 0 65.106-7.8198 65.106-17.467 0-4.2402-5.6312-8.1275-14.999-11.154 0.0463-0.031 0.0875-0.06 0.13375-0.091 9.4812 3.0464 15.185 6.9664 15.185 11.245 0 9.6949-29.292 17.554-65.426 17.554m26.365-33.53c0.0613-0.024 0.125-0.049 0.18625-0.071-0.0613 0.023-0.125 0.047-0.18625 0.071" fill="#ededec"/>
   <path id="path5293" d="m305.59 945.41c-35.958 0-65.106-7.8198-65.106-17.467 0-4.2402 5.63-8.1275 14.998-11.154 0.0437 0.03 0.09 0.062 0.13375 0.092-9.2512 3.0053-14.811 6.8588-14.811 11.062 0 9.6001 29.006 17.381 64.786 17.381s64.785-7.7812 64.785-17.381c0-4.2027-5.5588-8.0562-14.81-11.062 0.0425-0.03 0.09-0.062 0.1325-0.092 9.3675 3.0262 14.999 6.9135 14.999 11.154 0 9.6475-29.15 17.467-65.106 17.467m26.179-33.371c0.0625-0.024 0.12375-0.047 0.18625-0.072-0.0625 0.025-0.12375 0.048-0.18625 0.072" fill="#ededec"/>
   <path id="path5295" d="m305.59 945.33c-35.78 0-64.786-7.7813-64.786-17.381 0-4.2026 5.56-8.0561 14.811-11.062 0.045 0.032 0.0875 0.06 0.13375 0.091-9.1388 2.9854-14.624 6.8066-14.624 10.97 0 9.5527 28.862 17.295 64.465 17.295 35.602 0 64.465-7.7422 64.465-17.295 0-4.1637-5.485-7.9849-14.624-10.97 0.045-0.031 0.0875-0.059 0.13375-0.091 9.2512 3.0054 14.81 6.8589 14.81 11.062 0 9.6001-29.005 17.381-64.785 17.381m25.991-33.214c0.0625-0.024 0.12375-0.047 0.1875-0.071-0.0625 0.024-0.125 0.047-0.1875 0.071" fill="#ececeb"/>
   <path id="path5297" d="m305.59 945.24c-35.603 0-64.465-7.7421-64.465-17.295 0-4.1636 5.485-7.9849 14.624-10.97 0.0437 0.03 0.0913 0.062 0.13375 0.093-9.0238 2.9638-14.436 6.751-14.436 10.878 0 9.5048 28.718 17.21 64.144 17.21 35.425 0 64.144-7.7051 64.144-17.21 0-4.1265-5.4125-7.9137-14.438-10.878 0.0438-0.03 0.0913-0.062 0.135-0.093 9.1388 2.9853 14.624 6.8066 14.624 10.97 0 9.5528-28.862 17.295-64.465 17.295m25.802-33.055c0.0625-0.024 0.125-0.049 0.18875-0.073-0.0637 0.024-0.12625 0.049-0.18875 0.073" fill="#ecebea"/>
   <path id="path5299" d="m305.59 945.16c-35.426 0-64.144-7.7051-64.144-17.21 0-4.1265 5.4125-7.9136 14.436-10.878 0.0463 0.031 0.09 0.06 0.13625 0.091-8.9125 2.9439-14.252 6.6973-14.252 10.786 0 9.4575 28.575 17.124 63.824 17.124s63.822-7.6661 63.822-17.124c0-4.0888-5.34-7.8422-14.251-10.786 0.0462-0.031 0.0888-0.06 0.135-0.091 9.025 2.9639 14.438 6.751 14.438 10.878 0 9.5049-28.719 17.21-64.144 17.21m25.611-32.899c0.0637-0.023 0.1275-0.047 0.19125-0.071-0.0637 0.023-0.1275 0.047-0.19125 0.071" fill="#ebebea"/>
   <path id="path5301" d="m305.59 945.07c-35.249 0-63.824-7.6661-63.824-17.124 0-4.0889 5.34-7.8422 14.252-10.786 0.0425 0.03 0.0913 0.062 0.135 0.091-8.7988 2.9249-14.066 6.6452-14.066 10.695 0 9.4101 28.431 17.038 63.503 17.038 35.071 0 63.502-7.6275 63.502-17.038 0-4.0497-5.2675-7.77-14.068-10.695 0.0437-0.029 0.0925-0.062 0.13625-0.091 8.9112 2.9439 14.251 6.6973 14.251 10.786 0 9.4575-28.574 17.124-63.822 17.124m25.42-32.741c0.0625-0.024 0.12875-0.047 0.19125-0.071-0.0625 0.024-0.12875 0.048-0.19125 0.071" fill="#eaeae9"/>
   <path id="path5303" d="m305.59 944.98c-35.071 0-63.503-7.6275-63.503-17.038 0-4.0497 5.2675-7.77 14.066-10.695 0.0463 0.031 0.09 0.061 0.13625 0.092-8.685 2.9038-13.881 6.5898-13.881 10.602 0 9.3623 28.286 16.951 63.181 16.951 34.894 0 63.181-7.5889 63.181-16.951 0-4.0127-5.1962-7.6987-13.882-10.602 0.0463-0.031 0.0913-0.061 0.13625-0.092 8.8 2.9249 14.068 6.6452 14.068 10.695 0 9.4101-28.431 17.038-63.502 17.038m25.228-32.584c0.065-0.024 0.1275-0.046 0.1925-0.071-0.065 0.025-0.1275 0.048-0.1925 0.071" fill="#eaeae8"/>
   <path id="path5305" d="m305.59 944.9c-34.895 0-63.181-7.5889-63.181-16.951 0-4.0127 5.1962-7.6987 13.881-10.602 0.0462 0.031 0.0913 0.061 0.13625 0.091-8.5725 2.8838-13.698 6.5376-13.698 10.511 0 9.315 28.144 16.865 62.861 16.865 34.716 0 62.86-7.5497 62.86-16.865 0-3.9737-5.125-7.6275-13.698-10.511 0.0462-0.03 0.0913-0.06 0.13625-0.091 8.6862 2.9038 13.882 6.5898 13.882 10.602 0 9.3623-28.288 16.951-63.181 16.951m25.032-32.426c0.0637-0.022 0.13125-0.047 0.195-0.071-0.0637 0.024-0.13125 0.049-0.195 0.071" fill="#e9e9e8"/>
   <path id="path5307" d="m305.59 944.81c-34.718 0-62.861-7.5498-62.861-16.865 0-3.9736 5.125-7.6275 13.698-10.511 0.0462 0.031 0.0913 0.061 0.1375 0.092-8.46 2.8628-13.514 6.483-13.514 10.419 0 9.2676 28 16.779 62.54 16.779s62.54-7.5112 62.54-16.779c0-3.936-5.0538-7.5562-13.515-10.419 0.0462-0.031 0.0912-0.061 0.1375-0.092 8.5725 2.8837 13.698 6.5376 13.698 10.511 0 9.315-28.144 16.865-62.86 16.865m24.838-32.268c0.065-0.024 0.13-0.047 0.195-0.071-0.065 0.024-0.13 0.047-0.195 0.071" fill="#e9e8e7"/>
   <path id="path5309" d="m305.59 944.73c-34.54 0-62.54-7.5112-62.54-16.779 0-3.936 5.0538-7.5561 13.514-10.419 0.0462 0.031 0.0925 0.062 0.13875 0.093-8.35 2.8413-13.332 6.4273-13.332 10.326 0 9.2203 27.858 16.694 62.22 16.694s62.219-7.4736 62.219-16.694c0-3.8988-4.9825-7.4848-13.331-10.326 0.0463-0.031 0.0913-0.062 0.1375-0.093 8.4612 2.8629 13.515 6.483 13.515 10.419 0 9.2676-28 16.779-62.54 16.779m24.64-32.111c0.0663-0.024 0.13125-0.047 0.1975-0.071-0.0662 0.024-0.13125 0.047-0.1975 0.071" fill="#e8e8e6"/>
   <path id="path5311" d="m305.59 944.64c-34.363 0-62.22-7.4736-62.22-16.694 0-3.8989 4.9825-7.4849 13.332-10.326 0.0462 0.03 0.0913 0.06 0.13875 0.091-8.2375 2.8199-13.15 6.3735-13.15 10.235 0 9.1723 27.712 16.607 61.899 16.607 34.185 0 61.899-7.4351 61.899-16.607 0-3.8614-4.9125-7.415-13.15-10.235 0.0462-0.03 0.0925-0.062 0.13875-0.091 8.3488 2.8412 13.331 6.4272 13.331 10.326 0 9.2203-27.856 16.694-62.219 16.694m24.441-31.957c0.0662-0.022 0.1325-0.046 0.19875-0.07-0.0662 0.024-0.1325 0.047-0.19875 0.07" fill="#e7e7e6"/>
   <path id="path5313" d="m305.59 944.55c-34.186 0-61.899-7.435-61.899-16.607 0-3.8614 4.9125-7.415 13.15-10.235 0.0463 0.031 0.0925 0.061 0.13875 0.092-8.1262 2.7989-12.968 6.3199-12.968 10.143 0 9.1235 27.569 16.522 61.578 16.522 34.008 0 61.578-7.398 61.578-16.522 0-3.8228-4.8425-7.3438-12.969-10.143 0.0475-0.031 0.0937-0.061 0.14-0.092 8.2375 2.8199 13.15 6.3735 13.15 10.235 0 9.1724-27.714 16.607-61.899 16.607m24.241-31.799c0.0687-0.024 0.1325-0.046 0.2-0.071-0.0675 0.026-0.13125 0.048-0.2 0.071" fill="#e7e6e5"/>
   <path id="path5315" d="m305.59 944.47c-34.009 0-61.578-7.398-61.578-16.522 0-3.8227 4.8412-7.3437 12.968-10.143 0.0462 0.03 0.0937 0.062 0.14 0.091-8.0162 2.7787-12.788 6.2661-12.788 10.051 0 9.0777 27.426 16.435 61.258 16.435 33.831 0 61.256-7.3574 61.256-16.435 0-3.7851-4.7712-7.2725-12.786-10.051 0.0462-0.03 0.0925-0.061 0.13875-0.091 8.1262 2.7989 12.969 6.3199 12.969 10.143 0 9.1235-27.57 16.522-61.578 16.522m24.04-31.643c0.0662-0.022 0.13625-0.046 0.20125-0.07-0.065 0.024-0.135 0.048-0.20125 0.07" fill="#e6e6e4"/>
   <path id="path5317" d="m305.59 944.38c-33.831 0-61.258-7.3575-61.258-16.435 0-3.7851 4.7712-7.2725 12.788-10.051 0.0463 0.031 0.0937 0.062 0.14 0.092-7.9062 2.7578-12.606 6.2115-12.606 9.959 0 9.0287 27.281 16.349 60.936 16.349 33.654 0 60.936-7.3199 60.936-16.349 0-3.7475-4.7012-7.2012-12.608-9.959 0.0475-0.03 0.095-0.061 0.14125-0.092 8.015 2.7787 12.786 6.2661 12.786 10.051 0 9.0776-27.425 16.435-61.256 16.435m23.838-31.485c0.0687-0.024 0.135-0.048 0.2025-0.071-0.0675 0.024-0.13375 0.047-0.2025 0.071" fill="#e5e5e3"/>
   <path id="path5319" d="m305.59 944.3c-33.655 0-60.936-7.3199-60.936-16.349 0-3.7475 4.7-7.2011 12.606-9.959 0.0462 0.03 0.095 0.062 0.14125 0.093-7.795 2.7364-12.428 6.1563-12.428 9.8663 0 8.9815 27.139 16.263 60.616 16.263 33.476 0 60.615-7.2812 60.615-16.263 0-3.71-4.6312-7.1299-12.428-9.8663 0.0475-0.031 0.095-0.062 0.14125-0.093 7.9062 2.7579 12.608 6.2115 12.608 9.959 0 9.0288-27.282 16.349-60.936 16.349m23.632-31.329c0.0687-0.024 0.1375-0.047 0.205-0.07-0.0675 0.022-0.13625 0.046-0.205 0.07" fill="#e4e4e3"/>
   <path id="path5321" d="m305.59 944.21c-33.478 0-60.616-7.2812-60.616-16.263 0-3.71 4.6325-7.1299 12.428-9.8662 0.0463 0.03 0.095 0.061 0.14125 0.091-7.685 2.7162-12.248 6.1025-12.248 9.7748 0 8.9337 26.995 16.176 60.295 16.176s60.294-7.2426 60.294-16.176c0-3.6723-4.5612-7.0586-12.248-9.7748 0.0463-0.03 0.095-0.062 0.14125-0.091 7.7962 2.7363 12.428 6.1562 12.428 9.8662 0 8.9815-27.139 16.263-60.615 16.263m23.428-31.173c0.0675-0.024 0.1375-0.046 0.205-0.07-0.0675 0.024-0.1375 0.046-0.205 0.07" fill="#e4e3e2"/>
   <path id="path5323" d="m305.59 944.12c-33.3 0-60.295-7.2427-60.295-16.176 0-3.6724 4.5625-7.0586 12.248-9.7749 0.05 0.032 0.0937 0.061 0.1425 0.092-7.5775 2.6939-12.069 6.0479-12.069 9.6827 0 8.8862 26.851 16.091 59.974 16.091 33.122 0 59.974-7.2051 59.974-16.091 0-3.6348-4.4925-6.9888-12.07-9.6827 0.0487-0.031 0.0937-0.06 0.1425-0.092 7.6862 2.7163 12.248 6.1025 12.248 9.7749 0 8.9336-26.994 16.176-60.294 16.176m23.22-31.016c0.0675-0.024 0.13875-0.048 0.2075-0.07-0.0688 0.022-0.14 0.046-0.2075 0.07" fill="#e3e3e1"/>
   <path id="path5325" d="m305.59 944.04c-33.123 0-59.974-7.205-59.974-16.091 0-3.6347 4.4912-6.9887 12.069-9.6826 0.0475 0.03 0.0962 0.062 0.14375 0.093-7.4675 2.6724-11.892 5.9922-11.892 9.5899 0 8.8388 26.708 16.005 59.654 16.005 32.945 0 59.652-7.166 59.652-16.005 0-3.5977-4.4238-6.9175-11.891-9.5899 0.0463-0.03 0.0962-0.062 0.1425-0.093 7.5775 2.6939 12.07 6.0479 12.07 9.6826 0 8.8863-26.851 16.091-59.974 16.091m23.01-30.861c0.0713-0.024 0.13875-0.046 0.21-0.07-0.0713 0.024-0.13875 0.046-0.21 0.07" fill="#e2e2e0"/>
   <path id="path5327" d="m305.59 943.95c-32.946 0-59.654-7.166-59.654-16.005 0-3.5976 4.425-6.9175 11.892-9.5899 0.0487 0.031 0.0937 0.06 0.14375 0.091-7.36 2.6528-11.715 5.939-11.715 9.499 0 8.791 26.564 15.919 59.333 15.919 32.768 0 59.332-7.128 59.332-15.919 0-3.56-4.3562-6.8462-11.715-9.499 0.0488-0.031 0.095-0.06 0.14375-0.091 7.4675 2.6724 11.891 5.9923 11.891 9.5899 0 8.8389-26.708 16.005-59.652 16.005m22.799-30.706c0.0712-0.022 0.14125-0.046 0.21125-0.069-0.07 0.023-0.14 0.046-0.21125 0.069" fill="#e2e1df"/>
   <path id="path5329" d="m305.59 943.87c-32.769 0-59.333-7.128-59.333-15.919 0-3.56 4.355-6.8462 11.715-9.499 0.0462 0.03 0.0962 0.063 0.14375 0.093-7.2512 2.6298-11.539 5.8837-11.539 9.4062 0 8.7436 26.421 15.832 59.013 15.832 32.591 0 59.011-7.0889 59.011-15.832 0-3.5225-4.2875-6.7764-11.539-9.4062 0.0475-0.03 0.0975-0.062 0.145-0.093 7.3588 2.6527 11.715 5.939 11.715 9.499 0 8.791-26.565 15.919-59.332 15.919m22.586-30.55c0.0687-0.022 0.14375-0.047 0.2125-0.07-0.0688 0.022-0.14375 0.047-0.2125 0.07" fill="#e1e0df"/>
   <path id="path5331" d="m305.59 943.78c-32.591 0-59.013-7.0889-59.013-15.832 0-3.5225 4.2875-6.7764 11.539-9.4062 0.0487 0.031 0.0962 0.061 0.145 0.092-7.1425 2.6088-11.362 5.8291-11.362 9.314 0 8.6962 26.276 15.746 58.691 15.746 32.414 0 58.69-7.0499 58.69-15.746 0-3.4849-4.22-6.7052-11.361-9.314 0.0488-0.031 0.095-0.061 0.14375-0.092 7.2512 2.6298 11.539 5.8837 11.539 9.4062 0 8.7436-26.42 15.832-59.011 15.832m22.372-30.395c0.0725-0.022 0.14-0.045 0.21375-0.069-0.0738 0.024-0.14125 0.046-0.21375 0.069" fill="#e0e0de"/>
   <path id="path5333" d="m305.59 943.69c-32.415 0-58.691-7.0498-58.691-15.746 0-3.4849 4.22-6.7051 11.362-9.314 0.0462 0.03 0.0987 0.062 0.145 0.093-7.0362 2.586-11.186 5.7735-11.186 9.2213 0 8.6488 26.132 15.66 58.37 15.66 32.236 0 58.37-7.0113 58.37-15.66 0-3.4478-4.1512-6.6353-11.188-9.2213 0.0475-0.03 0.0987-0.062 0.14625-0.093 7.1412 2.6089 11.361 5.8291 11.361 9.314 0 8.6963-26.276 15.746-58.69 15.746m22.155-30.239c0.0713-0.023 0.14625-0.046 0.2175-0.07-0.0712 0.024-0.14625 0.047-0.2175 0.07" fill="#e0dfdd"/>
   <path id="path5335" d="m305.59 943.61c-32.238 0-58.37-7.0113-58.37-15.66 0-3.4477 4.15-6.6352 11.186-9.2212 0.05 0.031 0.0975 0.061 0.1475 0.092-6.9288 2.5648-11.014 5.7187-11.014 9.1288 0 8.6012 25.99 15.575 58.05 15.575s58.049-6.974 58.049-15.575c0-3.4101-4.085-6.564-11.012-9.1288 0.0487-0.031 0.0962-0.061 0.14625-0.092 7.0362 2.586 11.188 5.7735 11.188 9.2212 0 8.6489-26.134 15.66-58.37 15.66m21.938-30.084c0.0738-0.022 0.14375-0.045 0.2175-0.069-0.0737 0.024-0.14375 0.046-0.2175 0.069" fill="#dfdedc"/>
   <path id="path5337" d="m305.59 943.52c-32.06 0-58.05-6.9741-58.05-15.575 0-3.4101 4.085-6.564 11.014-9.1289 0.0487 0.031 0.0975 0.062 0.14625 0.093-6.8212 2.5425-10.839 5.6637-10.839 9.0362 0 8.5537 25.846 15.489 57.729 15.489 31.882 0 57.729-6.935 57.729-15.489 0-3.3725-4.0175-6.4937-10.84-9.0362 0.05-0.031 0.0975-0.062 0.1475-0.093 6.9275 2.5649 11.012 5.7188 11.012 9.1289 0 8.6011-25.989 15.575-58.049 15.575m21.718-29.93c0.0738-0.023 0.14625-0.045 0.22-0.069-0.0737 0.024-0.14625 0.046-0.22 0.069" fill="#dedddb"/>
   <path id="path5339" d="m305.59 943.44c-31.883 0-57.729-6.935-57.729-15.489 0-3.3725 4.0175-6.4936 10.839-9.0361 0.05 0.031 0.0987 0.061 0.1475 0.092-6.715 2.5215-10.666 5.6089-10.666 8.9439 0 8.5064 25.702 15.402 57.409 15.402 31.705 0 57.408-6.8959 57.408-15.402 0-3.335-3.9512-6.4224-10.666-8.9439 0.05-0.031 0.0988-0.061 0.1475-0.092 6.8225 2.5425 10.84 5.6636 10.84 9.0361 0 8.5538-25.846 15.489-57.729 15.489m21.495-29.775c0.0738-0.023 0.14875-0.046 0.2225-0.069-0.0737 0.022-0.14875 0.046-0.2225 0.069" fill="#dddcda"/>
   <path id="path5341" d="m305.59 943.35c-31.706 0-57.409-6.896-57.409-15.402 0-3.335 3.9512-6.4224 10.666-8.9439 0.05 0.03 0.1 0.062 0.14875 0.093-6.61 2.4987-10.494 5.5538-10.494 8.8512 0 8.459 25.559 15.316 57.088 15.316 31.528 0 57.086-6.8574 57.086-15.316 0-3.2974-3.8838-6.3525-10.494-8.8512 0.05-0.031 0.0987-0.062 0.14875-0.093 6.715 2.5215 10.666 5.6089 10.666 8.9439 0 8.5064-25.702 15.402-57.408 15.402m21.27-29.62c0.0737-0.023 0.15125-0.046 0.225-0.069-0.0738 0.022-0.15125 0.046-0.225 0.069" fill="#dddcda"/>
   <path id="path5343" d="m305.59 943.26c-31.529 0-57.088-6.8574-57.088-15.316 0-3.2974 3.8838-6.3525 10.494-8.8511 0.05 0.03 0.1025 0.062 0.15125 0.094-6.505 2.4761-10.324 5.4946-10.324 8.7535 0 8.415 25.414 15.233 56.768 15.233s56.768-6.8179 56.768-15.233c0-3.2589-3.8212-6.2789-10.326-8.7549 0.05-0.03 0.10125-0.062 0.15-0.092 6.61 2.4986 10.494 5.5538 10.494 8.8511 0 8.459-25.559 15.316-57.086 15.316m21.034-29.462c0.0775-0.024 0.15875-0.048 0.23625-0.071-0.0775 0.023-0.15875 0.047-0.23625 0.071" fill="#dcdbd9"/>
   <path id="path5345" d="m312.32 927.95c0 0.9975-3.0112 1.8051-6.7262 1.8051s-6.7275-0.8076-6.7275-1.8051c0-0.9961 3.0125-1.8051 6.7275-1.8051s6.7262 0.809 6.7262 1.8051" fill="#100f0d"/>
  </g>
  <g id="g5429" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g5431" clip-path="url(#clipPath5433-1)">
    <path id="path5445" d="m4824.7 4372.2c0 105.26-86.13 191.39-191.39 191.39h-73.44c-10.55 0-20.91-0.87-31-2.53v1128.4c0 30.46-24.7 55.16-55.16 55.16-30.47 0-55.16-24.7-55.16-55.16v-1188.6c-31.07-34.05-50.07-79.28-50.07-128.72v1289.7c0 105.26 86.12 191.38 191.39 191.38h73.44c105.26 0 191.39-86.12 191.39-191.38v-1289.7" fill="url(#linearGradient5437)"/>
   </g>
  </g>
  <g id="g5447" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g5449" clip-path="url(#clipPath5451-9)">
    <path id="path5461" d="m4824.7 1400.7c-70.09 29.76-147.18 46.22-228.11 46.22-80.94 0-158.03-16.46-228.11-46.22v2971.5c0 49.44 19 94.67 50.07 128.72v-2914.1c0-30.47 24.69-55.16 55.16-55.16 30.46 0 55.16 24.69 55.16 55.16v2974.2c10.09 1.66 20.45 2.53 31 2.53h73.44c105.26 0 191.39-86.13 191.39-191.39v-2971.5" fill="url(#linearGradient5455)"/>
   </g>
  </g>
  <g id="g5463" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g5465" clip-path="url(#clipPath5467-5)">
    <path id="path5477" d="m5180.7 862.75c0-322.64-261.55-584.18-584.18-584.18-322.64 0-584.18 261.54-584.18 584.18 0 322.63 261.54 584.18 584.18 584.18 322.63 0 584.18-261.55 584.18-584.18" fill="url(#radialGradient5503-8)"/>
   </g>
  </g>
  <g id="g5479" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g5481" clip-path="url(#clipPath5483-2)">
    <path id="path5493" d="m4939 1171.8v2.47-1.23-1.24" fill="url(#radialGradient5503-8)"/>
   </g>
  </g>
  <g id="g5495" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g5497" clip-path="url(#clipPath5499-6)">
    <path id="path5509" d="m4756.2 980.86c108.77 36.381 182.9 108.79 182.9 192.18v-1.24c-0.73-82.87-74.67-154.73-182.9-190.94m182.9 192.18c0 44.74-21.34 86.31-57.92 120.86 36.24-34.23 57.53-75.36 57.92-119.63v-1.23" fill="url(#radialGradient5503-8)"/>
   </g>
  </g>
  <g id="g5511" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g5513" clip-path="url(#clipPath5515-6)">
    <g id="g5519" transform="matrix(696.2,0,0,453.2,4247.9,945.9)">
     <image id="image5521" xlink:href="data:image/png;base64,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" transform="matrix(1,0,0,-1,0,1)" height="1" width="1" preserveAspectRatio="none"/>
    </g>
   </g>
  </g>
  <path id="path5523" d="m310.18 204.53h-9.18c-21.739 0-39.424 17.685-39.424 39.422v523.07c-27.34 15.644-44.509 44.775-44.509 76.826 0 48.811 39.711 88.522 88.523 88.522 48.811 0 88.521-39.712 88.521-88.522 0-32.052-17.168-61.182-44.509-76.826v-523.07c0-21.738-17.685-39.422-39.422-39.422m0 15.5c13.158 0 23.924 10.765 23.924 23.922v532.65c26.16 11.106 44.509 37.031 44.509 67.242 0 40.33-32.694 73.022-73.022 73.022-40.33 0-73.023-32.692-73.023-73.022 0-30.211 18.349-56.136 44.509-67.242v-532.65c0-13.158 10.765-23.922 23.924-23.922h9.18" fill="#100f0d"/>
  <g id="g5525" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g5527" clip-path="url(#clipPath5529-7)">
    <path id="path5543" d="m4633.3 5941.9h-73.44c-154.37 0-279.96-125.59-279.96-279.96v-4205.5c-218.11-116.22-356.07-343.22-356.07-593.7 0-370.96 301.79-672.75 672.75-672.75 370.95 0 672.74 301.79 672.74 672.75 0 250.48-137.95 477.48-356.07 593.7v4205.5c0 154.37-125.59 279.96-279.95 279.96m0-88.58c105.26 0 191.39-86.12 191.39-191.38v-4261.2c209.28-88.85 356.07-296.25 356.07-537.94 0-322.63-261.55-584.18-584.18-584.18-322.64 0-584.18 261.55-584.18 584.18 0 241.69 146.78 449.09 356.07 537.94v4261.2c0 105.26 86.12 191.38 191.39 191.38h73.44" fill="url(#linearGradient5533)"/>
   </g>
  </g>
  <g id="g5545" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g5547" clip-path="url(#clipPath5549-6)">
    <path id="path5561" d="m4418.5 4501v1188.6c0 30.46 24.69 55.16 55.16 55.16 30.46 0 55.16-24.7 55.16-55.16v-1128.4c-43.33-7.14-81.89-28.96-110.32-60.14" fill="url(#linearGradient5553)"/>
   </g>
  </g>
  <g id="g5563" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g5565" clip-path="url(#clipPath5567-7)">
    <path id="path5577" d="m4473.7 1531.7c-30.47 0-55.16 24.69-55.16 55.16v2914.1c28.43 31.18 66.99 53 110.32 60.14v-2974.2c0-30.47-24.7-55.16-55.16-55.16" fill="url(#linearGradient5571)"/>
   </g>
  </g>
  <g id="g6117" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g6119" clip-path="url(#clipPath6121-3)">
    <g id="g6125" transform="matrix(915.2,0,0,253.2,4139.9,62.9)">
     <image id="image6127" xlink:href="data:image/png;base64,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" transform="matrix(1,0,0,-1,0,1)" height="1" width="1" preserveAspectRatio="none"/>
    </g>
   </g>
  </g>
 </g>
</svg>
\",\"data:image/svg+xml;base64,<svg id="svg6934" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="210.87mm" width="49.966mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 177.04501 747.16249" xmlns:dc="http://purl.org/dc/elements/1.1/">
 <defs id="defs6936">
  <clipPath id="clipPath6133" clipPathUnits="userSpaceOnUse">
   <path id="path6135" clip-rule="evenodd" d="m6215 190.03c0 48.239 145.89 87.391 325.8 87.391s325.8-39.152 325.8-87.391c0-48.332-145.89-87.48-325.8-87.48s-325.8 39.148-325.8 87.48"/>
  </clipPath>
  <clipPath id="clipPath6081" clipPathUnits="userSpaceOnUse">
   <path id="path6083" d="m6417.9 1531.7c-30.47 0-55.16 24.69-55.16 55.16v4102.7c0 30.46 24.69 55.16 55.16 55.16 30.46 0 55.16-24.7 55.16-55.16v-4102.7c0-30.47-24.7-55.16-55.16-55.16"/>
  </clipPath>
  <linearGradient id="linearGradient6085" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1e-7 -2349.1 -2349.1 -1e-7 6540.8 3469.2)">
   <stop id="stop6087" stop-color="#f1485f" offset="0"/>
   <stop id="stop6089" stop-color="#a17d5a" offset="1"/>
  </linearGradient>
  <clipPath id="clipPath6061" clipPathUnits="userSpaceOnUse">
   <path id="path6063" d="m6577.5 5941.9h-73.44c-154.37 0-279.96-125.59-279.96-279.96v-4205.5c-218.1-116.2-356.1-343.2-356.1-593.65 0-370.96 301.8-672.75 672.8-672.75 370.96 0 672.75 301.79 672.75 672.75 0 250.48-137.96 477.48-356.07 593.7v4205.5c0 154.37-125.59 279.96-279.96 279.96m0-88.58c105.26 0 191.39-86.12 191.39-191.38v-4261.2c209.28-88.85 356.07-296.25 356.07-537.94 0-322.63-261.55-584.18-584.18-584.18s-584.18 261.55-584.18 584.18c0 241.69 146.79 449.09 356.07 537.94v4261.2c0 105.26 86.13 191.38 191.39 191.38h73.44"/>
  </clipPath>
  <linearGradient id="linearGradient6065" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1345.5 0 0 -1345.5 5868 3065.9)">
   <stop id="stop6067" stop-color="#b3b3b2" offset="0"/>
   <stop id="stop6069" stop-color="#b3b3b2" offset=".1"/>
   <stop id="stop6071" stop-color="#feffff" offset=".24731"/>
   <stop id="stop6073" stop-color="#a3a3a1" offset="1"/>
  </linearGradient>
  <clipPath id="clipPath6047" clipPathUnits="userSpaceOnUse">
   <path id="path6049" d="m6540.8 955.89c-189.16 0-342.5 97.219-342.5 217.15 0 119.92 153.34 217.14 342.5 217.14 127.83 0 239.3-44.4 298.14-110.2 28.23-31.56 44.35-68.06 44.35-106.94 0-65-45.04-123.33-116.42-163.12-60.32-33.631-139.44-54.029-226.07-54.029"/>
  </clipPath>
  <clipPath id="clipPath6031" clipPathUnits="userSpaceOnUse">
   <path id="path6033" d="m6766.8 1009.9c71.38 39.79 116.42 98.12 116.42 163.12v-1.24c-0.56-64.5-45.49-122.34-116.42-161.88m116.42 163.12c0 38.88-16.12 75.38-44.35 106.94 27.94-31.23 44.02-67.29 44.35-105.71v-1.23"/>
  </clipPath>
  <radialGradient id="radialGradient6035" gradientUnits="userSpaceOnUse" cy="0" cx="0" gradientTransform="matrix(584.18 0 0 -584.18 6540.8 862.75)" r="1">
   <stop id="stop6037" stop-color="#ed1c24" offset="0"/>
   <stop id="stop6039" stop-color="#632d16" offset="1"/>
  </radialGradient>
  <clipPath id="clipPath6015" clipPathUnits="userSpaceOnUse">
   <path id="path6017" d="m6883.2 1171.8v1.24 1.23c0.01-0.41 0.01-0.82 0.01-1.23s0-0.83-0.01-1.24"/>
  </clipPath>
  <clipPath id="clipPath5999" clipPathUnits="userSpaceOnUse">
   <path id="path6001" d="m7124.9 862.75c0-322.64-261.55-584.18-584.18-584.18s-584.18 261.54-584.18 584.18c0 322.63 261.55 584.18 584.18 584.18s584.18-261.55 584.18-584.18"/>
  </clipPath>
  <clipPath id="clipPath5983" clipPathUnits="userSpaceOnUse">
   <path id="path5985" d="m6312.6 1400.7v4261.2c0 105.26 86.13 191.38 191.39 191.38h73.44c105.26 0 191.39-86.12 191.39-191.38v-4261.2c-70.08 29.76-147.18 46.22-228.11 46.22s-158.03-16.46-228.11-46.22m105.23 4344c-30.47 0-55.16-24.7-55.16-55.16v-4102.7c0-30.47 24.69-55.16 55.16-55.16 30.46 0 55.16 24.69 55.16 55.16v4102.7c0 30.46-24.7 55.16-55.16 55.16"/>
  </clipPath>
  <linearGradient id="linearGradient5987" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1e-7 -2349.1 -2349.1 -1e-7 6540.8 3469.2)">
   <stop id="stop5989" stop-color="#ed1c24" offset="0"/>
   <stop id="stop5991" stop-color="#632d16" offset="1"/>
  </linearGradient>
  <clipPath id="clipPath5965" clipPathUnits="userSpaceOnUse">
   <path id="path5967" d="m6768.9 1326.8c0-105.26-86.13-191.39-191.39-191.39h-73.44c-105.26 0-191.39 86.13-191.39 191.39v4335.2c0 105.26 86.13 191.38 191.39 191.38h73.44c105.26 0 191.39-86.12 191.39-191.38v-4335.2"/>
  </clipPath>
  <linearGradient id="linearGradient5969" gradientUnits="userSpaceOnUse" gradientTransform="matrix(456.22 0 0 -456.22 6312.6 3494.3)">
   <stop id="stop5971" stop-color="#a3a3a1" offset="0"/>
   <stop id="stop5973" stop-color="#ececec" offset=".75269"/>
   <stop id="stop5975" stop-color="#b3b3b2" offset="1"/>
  </linearGradient>
 </defs>
 <g id="layer1" transform="translate(-231.37 -176.67)">
  <g fill="#fff">
   <path id="path5579" d="m319.89 923.83c-48.889 0-88.522-10.632-88.522-23.75 0-7.0864 11.572-13.449 29.919-17.8 0.0362 0.0298 0.0675 0.0585 0.1025 0.0897-18.219 4.335-29.7 10.663-29.7 17.71 0 13.069 39.489 23.664 88.201 23.664s88.201-10.595 88.201-23.664c0-7.0474-11.48-13.375-29.7-17.71 0.035-0.0312 0.0675-0.0585 0.1025-0.0897 18.348 4.351 29.918 10.713 29.918 17.8 0 13.118-39.632 23.75-88.521 23.75"/>
   <path id="path5581" d="m319.89 923.74c-48.712 0-88.201-10.595-88.201-23.664 0-7.0474 11.481-13.375 29.7-17.71 0.0337 0.0289 0.07 0.0611 0.10375 0.0914-18.09 4.3174-29.482 10.611-29.482 17.619 0 13.021 39.345 23.578 87.88 23.578s87.88-10.557 87.88-23.578c0-7.0074-11.392-13.301-29.482-17.619 0.0338-0.0302 0.07-0.0625 0.10375-0.0914 18.22 4.335 29.7 10.663 29.7 17.71 0 13.069-39.489 23.664-88.201 23.664"/>
   <path id="path5583" d="m319.89 923.66c-48.535 0-87.88-10.557-87.88-23.578 0-7.0074 11.392-13.301 29.482-17.619 0.035 0.0297 0.0675 0.0586 0.1025 0.0899-17.959 4.3026-29.265 10.562-29.265 17.529 0 12.974 39.202 23.491 87.56 23.491s87.56-10.518 87.56-23.491c0-6.9672-11.306-13.226-29.265-17.529 0.035-0.0312 0.0675-0.0601 0.1025-0.0899 18.09 4.3174 29.482 10.611 29.482 17.619 0 13.021-39.345 23.578-87.88 23.578"/>
   <path id="path5585" d="m319.89 923.57c-48.358 0-87.56-10.518-87.56-23.491 0-6.9672 11.306-13.226 29.265-17.529 0.0337 0.0288 0.07 0.061 0.10375 0.0897-17.83 4.2866-29.048 10.511-29.048 17.439 0 12.926 39.058 23.406 87.239 23.406 48.18 0 87.239-10.48 87.239-23.406 0-6.9278-11.218-13.152-29.048-17.438 0.0337-0.0303 0.07-0.0625 0.10375-0.0913 17.959 4.3026 29.265 10.562 29.265 17.529 0 12.974-39.202 23.491-87.56 23.491"/>
   <path id="path5587" d="m319.89 923.49c-48.181 0-87.239-10.48-87.239-23.406 0-6.9278 11.218-13.152 29.048-17.439 0.035 0.0312 0.0687 0.0601 0.10375 0.0914-17.701 4.269-28.831 10.459-28.831 17.348 0 12.879 38.915 23.32 86.919 23.32s86.918-10.441 86.918-23.32c0-6.8886-11.129-13.079-28.83-17.348 0.035-0.0312 0.0687-0.0601 0.10375-0.0899 17.83 4.2851 29.048 10.51 29.048 17.438 0 12.926-39.059 23.406-87.239 23.406"/>
   <path id="path5589" d="m319.89 923.4c-48.004 0-86.919-10.441-86.919-23.32 0-6.8886 11.13-13.079 28.831-17.348 0.0362 0.0312 0.0687 0.06 0.105 0.0902-17.57 4.2525-28.615 10.41-28.615 17.257 0 12.831 38.771 23.234 86.598 23.234 47.826 0 86.598-10.403 86.598-23.234 0-6.8476-11.045-13.005-28.614-17.256 0.035-0.0312 0.0687-0.06 0.10375-0.0912 17.701 4.269 28.83 10.459 28.83 17.348 0 12.879-38.914 23.32-86.918 23.32"/>
   <path id="path5591" d="m319.89 923.31c-47.826 0-86.598-10.403-86.598-23.234 0-6.8476 11.045-13.005 28.615-17.257 0.0325 0.0299 0.07 0.0625 0.10375 0.0914-17.441 4.2349-28.398 10.357-28.398 17.166 0 12.784 38.626 23.147 86.276 23.147 47.649 0 86.276-10.364 86.276-23.147 0-6.8086-10.956-12.931-28.398-17.166 0.0337-0.0289 0.0712-0.0615 0.105-0.0904 17.569 4.2515 28.614 10.409 28.614 17.256 0 12.831-38.771 23.234-86.598 23.234"/>
   <path id="path5593" d="m319.89 923.23c-47.65 0-86.276-10.364-86.276-23.148 0-6.8086 10.956-12.931 28.398-17.166 0.0362 0.0308 0.0687 0.0595 0.105 0.0899-17.314 4.2196-28.182 10.308-28.182 17.076 0 12.736 38.484 23.061 85.956 23.061s85.956-10.325 85.956-23.061c0-6.7685-10.872-12.856-28.182-17.075 0.0363-0.0312 0.07-0.06 0.105-0.0908 17.441 4.2349 28.398 10.357 28.398 17.166 0 12.784-38.628 23.147-86.276 23.147"/>
   <path id="path5595" d="m319.89 923.14c-47.472 0-85.956-10.325-85.956-23.061 0-6.7685 10.869-12.856 28.182-17.076 0.035 0.0312 0.07 0.061 0.105 0.0913-17.184 4.2021-27.966 10.256-27.966 16.985 0 12.688 38.34 22.976 85.635 22.976s85.635-10.288 85.635-22.976c0-6.729-10.782-12.783-27.966-16.985 0.035-0.0303 0.07-0.06 0.105-0.0904 17.31 4.2188 28.182 10.307 28.182 17.075 0 12.736-38.484 23.061-85.956 23.061"/>
   <path id="path5597" d="m319.89 923.06c-47.295 0-85.635-10.288-85.635-22.976 0-6.729 10.782-12.783 27.966-16.985 0.0337 0.0289 0.0725 0.0625 0.10625 0.0914-17.055 4.1845-27.752 10.204-27.752 16.894 0 12.641 38.198 22.89 85.315 22.89 47.118 0 85.314-10.249 85.314-22.89 0-6.689-10.696-12.709-27.751-16.894 0.0337-0.0289 0.0725-0.0625 0.10625-0.0914 17.184 4.2021 27.966 10.256 27.966 16.985 0 12.688-38.34 22.976-85.635 22.976"/>
   <path id="path5599" d="m319.89 922.97c-47.118 0-85.315-10.249-85.315-22.89 0-6.689 10.698-12.709 27.752-16.894 0.035 0.0298 0.07 0.0595 0.105 0.0897-16.925 4.169-27.536 10.154-27.536 16.804 0 12.594 38.052 22.804 84.994 22.804 46.94 0 84.994-10.21 84.994-22.804 0-6.6499-10.611-12.635-27.536-16.804 0.035-0.0303 0.07-0.06 0.105-0.0897 17.055 4.1845 27.751 10.204 27.751 16.894 0 12.641-38.196 22.89-85.314 22.89"/>
   <path id="path5601" d="m319.89 922.88c-46.941 0-84.994-10.21-84.994-22.804 0-6.6499 10.611-12.635 27.536-16.804 0.0362 0.0312 0.0713 0.0601 0.10625 0.0914-16.799 4.1514-27.321 10.101-27.321 16.712 0 12.546 37.909 22.717 84.672 22.717 46.764 0 84.672-10.171 84.672-22.717 0-6.6099-10.525-12.561-27.321-16.712 0.035-0.0312 0.07-0.0601 0.10625-0.0914 16.925 4.169 27.536 10.154 27.536 16.804 0 12.594-38.054 22.804-84.994 22.804"/>
   <path id="path5603" d="m319.89 922.8c-46.764 0-84.672-10.171-84.672-22.717 0-6.6114 10.522-12.561 27.321-16.712 0.0362 0.0297 0.0713 0.06 0.1075 0.0899-16.669 4.1352-27.109 10.053-27.109 16.622 0 12.499 37.766 22.631 84.352 22.631s84.351-10.133 84.351-22.631c0-6.5699-10.439-12.487-27.106-16.622 0.035-0.0299 0.07-0.0601 0.10625-0.0899 16.796 4.1514 27.321 10.102 27.321 16.712 0 12.546-37.909 22.717-84.672 22.717"/>
   <path id="path5605" d="m319.89 922.71c-46.586 0-84.352-10.133-84.352-22.631 0-6.5699 10.44-12.487 27.109-16.622 0.035 0.0312 0.07 0.0615 0.10625 0.0913-16.541 4.1176-26.894 10-26.894 16.531 0 12.451 37.622 22.545 84.031 22.545s84.031-10.094 84.031-22.545c0-6.5312-10.352-12.414-26.894-16.531 0.0362-0.0298 0.0712-0.06 0.1075-0.0913 16.668 4.1352 27.106 10.053 27.106 16.622 0 12.499-37.765 22.631-84.351 22.631"/>
   <path id="path5607" d="m319.89 922.62c-46.409 0-84.031-10.094-84.031-22.545 0-6.5312 10.352-12.414 26.894-16.531 0.0362 0.0297 0.0713 0.06 0.1075 0.0899-16.414 4.1015-26.681 9.9501-26.681 16.441 0 12.404 37.479 22.459 83.711 22.459s83.71-10.055 83.71-22.459c0-6.4912-10.265-12.34-26.68-16.44 0.0362-0.0312 0.0712-0.0615 0.1075-0.0912 16.541 4.1176 26.894 10 26.894 16.531 0 12.451-37.622 22.545-84.031 22.545"/>
   <path id="path5609" d="m319.89 922.54c-46.232 0-83.711-10.055-83.711-22.459 0-6.4912 10.268-12.34 26.681-16.441 0.0362 0.0312 0.0712 0.0615 0.1075 0.0912-16.288 4.084-26.468 9.8975-26.468 16.35 0 12.356 37.335 22.373 83.39 22.373s83.39-10.016 83.39-22.373c0-6.4526-10.18-12.266-26.468-16.35 0.0362-0.0297 0.0713-0.06 0.1075-0.0899 16.415 4.1001 26.68 9.9488 26.68 16.44 0 12.404-37.478 22.459-83.71 22.459"/>
   <path id="path5611" d="m319.89 922.45c-46.055 0-83.39-10.016-83.39-22.373 0-6.4526 10.18-12.266 26.468-16.35 0.0363 0.0303 0.0725 0.0601 0.10875 0.0914-16.16 4.0664-26.255 9.8461-26.255 16.259 0 12.309 37.191 22.288 83.069 22.288s83.069-9.979 83.069-22.288c0-6.4126-10.095-12.192-26.254-16.259 0.035-0.0299 0.0712-0.0611 0.1075-0.0914 16.288 4.084 26.468 9.8975 26.468 16.35 0 12.356-37.335 22.373-83.39 22.373"/>
   <path id="path5613" d="m319.89 922.37c-45.878 0-83.069-9.979-83.069-22.288 0-6.4126 10.095-12.192 26.255-16.259 0.035 0.0303 0.0712 0.06 0.1075 0.0898-16.03 4.0489-26.042 9.7965-26.042 16.169 0 12.261 37.049 22.201 82.749 22.201s82.748-9.9399 82.748-22.201c0-6.3725-10.011-12.12-26.041-16.169 0.0362-0.0298 0.0725-0.0595 0.10875-0.0898 16.159 4.0664 26.254 9.8461 26.254 16.259 0 12.309-37.191 22.288-83.069 22.288"/>
   <path id="path5615" d="m319.89 922.28c-45.7 0-82.749-9.94-82.749-22.201 0-6.3725 10.012-12.12 26.042-16.169 0.0363 0.0304 0.0725 0.0616 0.10875 0.0914-15.906 4.0312-25.83 9.7441-25.83 16.078 0 12.214 36.904 22.115 82.428 22.115s82.428-9.9009 82.428-22.115c0-6.3335-9.9238-12.046-25.83-16.078 0.0362-0.0298 0.0725-0.0601 0.10875-0.0914 16.03 4.0489 26.041 9.7965 26.041 16.169 0 12.261-37.048 22.201-82.748 22.201"/>
   <path id="path5617" d="m319.89 922.19c-45.524 0-82.428-9.9008-82.428-22.115 0-6.3335 9.9238-12.046 25.83-16.078 0.0362 0.0303 0.0737 0.0615 0.11 0.0913-15.78 4.0138-25.619 9.6915-25.619 15.986 0 12.166 36.76 22.029 82.106 22.029s82.106-9.8628 82.106-22.029c0-6.2949-9.8388-11.973-25.618-15.986 0.0363-0.0297 0.0725-0.061 0.10875-0.0913 15.906 4.0312 25.83 9.7441 25.83 16.078 0 12.214-36.904 22.115-82.428 22.115"/>
   <path id="path5619" d="m319.89 922.11c-45.346 0-82.106-9.8628-82.106-22.029 0-6.2949 9.8388-11.973 25.619-15.986 0.035 0.0304 0.0725 0.0601 0.10875 0.0899-15.652 3.9976-25.408 9.6416-25.408 15.896 0 12.119 36.618 21.942 81.786 21.942 45.169 0 81.786-9.8237 81.786-21.942 0-6.2549-9.755-11.899-25.408-15.896 0.0362-0.0297 0.0737-0.0595 0.11-0.0899 15.779 4.0138 25.618 9.6915 25.618 15.986 0 12.166-36.76 22.029-82.106 22.029"/>
   <path id="path5621" d="m319.89 922.02c-45.169 0-81.786-9.8238-81.786-21.942 0-6.2549 9.755-11.899 25.408-15.896 0.0362 0.0303 0.0737 0.0615 0.11 0.0914-15.526 3.9799-25.196 9.5889-25.196 15.805 0 12.071 36.472 21.856 81.465 21.856 44.991 0 81.465-9.7852 81.465-21.856 0-6.2162-9.67-11.825-25.196-15.805 0.0362-0.0299 0.0738-0.0611 0.11-0.0914 15.652 3.9976 25.408 9.6416 25.408 15.896 0 12.119-36.618 21.942-81.786 21.942"/>
   <path id="path5623" d="m319.89 921.94c-44.992 0-81.465-9.7851-81.465-21.856 0-6.2162 9.67-11.825 25.196-15.805 0.0363 0.0302 0.0738 0.0615 0.11 0.0912-15.398 3.9614-24.985 9.5376-24.985 15.714 0 12.024 36.329 21.77 81.144 21.77s81.144-9.7461 81.144-21.77c0-6.1762-9.5875-11.752-24.985-15.714 0.0362-0.0297 0.0737-0.061 0.11-0.0912 15.526 3.9799 25.196 9.5889 25.196 15.805 0 12.071-36.474 21.856-81.465 21.856"/>
   <path id="path5625" d="m319.89 921.85c-44.815 0-81.144-9.7461-81.144-21.77 0-6.1762 9.5875-11.752 24.985-15.714 0.0362 0.0289 0.0738 0.0601 0.11125 0.0904-15.274 3.9448-24.776 9.4858-24.776 15.624 0 11.976 36.186 21.685 80.824 21.685s80.824-9.709 80.824-21.685c0-6.1378-9.5025-11.679-24.775-15.624 0.0362-0.0303 0.0738-0.0601 0.11-0.0904 15.398 3.9614 24.985 9.5376 24.985 15.714 0 12.024-36.329 21.77-81.144 21.77"/>
  </g>
  <g>
   <path id="path5627" d="m319.89 921.77c-44.638 0-80.824-9.709-80.824-21.685 0-6.1378 9.5025-11.679 24.776-15.624 0.0375 0.0308 0.0713 0.0595 0.11 0.0907-15.145 3.9278-24.565 9.4352-24.565 15.533 0 11.929 36.042 21.599 80.502 21.599s80.502-9.6699 80.502-21.599c0-6.0976-9.42-11.605-24.565-15.533 0.0387-0.0312 0.0725-0.0585 0.11125-0.0907 15.272 3.9448 24.775 9.4858 24.775 15.624 0 11.976-36.186 21.685-80.824 21.685" fill="#feffff"/>
   <path id="path5629" d="m319.89 921.68c-44.46 0-80.502-9.6699-80.502-21.599 0-6.0976 9.42-11.605 24.565-15.533 0.0362 0.0303 0.075 0.0615 0.11125 0.0914-15.021 3.9086-24.356 9.3827-24.356 15.441 0 11.881 35.899 21.513 80.182 21.513 44.284 0 80.182-9.6314 80.182-21.513 0-6.0586-9.335-11.531-24.356-15.441 0.0362-0.0299 0.075-0.0611 0.11125-0.0914 15.145 3.9278 24.565 9.4351 24.565 15.533 0 11.929-36.042 21.599-80.502 21.599" fill="#feffff"/>
   <path id="path5631" d="m319.89 921.59c-44.284 0-80.182-9.6314-80.182-21.513 0-6.0586 9.335-11.533 24.356-15.441 0.0375 0.0287 0.0762 0.06 0.1125 0.0902-14.896 3.8921-24.148 9.3326-24.148 15.351 0 11.834 35.755 21.426 79.861 21.426s79.861-9.5923 79.861-21.426c0-6.0185-9.2512-11.459-24.148-15.351 0.0375-0.0287 0.075-0.0615 0.1125-0.0902 15.021 3.9101 24.356 9.3828 24.356 15.441 0 11.881-35.899 21.513-80.182 21.513" fill="#fefeff"/>
   <path id="path5633" d="m319.89 921.51c-44.106 0-79.861-9.5923-79.861-21.426 0-6.0185 9.2512-11.459 24.148-15.351 0.0387 0.0312 0.0725 0.0601 0.11125 0.0909-14.77 3.8755-23.939 9.2802-23.939 15.26 0 11.786 35.612 21.34 79.541 21.34s79.54-9.5537 79.54-21.34c0-5.98-9.1675-11.385-23.938-15.26 0.0387-0.0308 0.0725-0.0596 0.11125-0.0909 14.896 3.8921 24.148 9.3326 24.148 15.351 0 11.834-35.755 21.426-79.861 21.426" fill="#fefefe"/>
   <path id="path5635" d="m319.89 921.42c-43.929 0-79.541-9.5537-79.541-21.34 0-5.98 9.1688-11.385 23.939-15.26 0.0375 0.0303 0.0762 0.0615 0.11375 0.0913-14.646 3.8564-23.731 9.2276-23.731 15.169 0 11.739 35.468 21.255 79.22 21.255 43.751 0 79.22-9.5161 79.22-21.255 0-5.9414-9.085-11.312-23.73-15.169 0.0363-0.0298 0.075-0.061 0.1125-0.0913 14.77 3.8755 23.938 9.2802 23.938 15.26 0 11.786-35.611 21.34-79.54 21.34" fill="#fefefe"/>
   <path id="path5637" d="m319.89 921.33c-43.752 0-79.22-9.5161-79.22-21.255 0-5.9414 9.085-11.312 23.731-15.169 0.0387 0.0312 0.0738 0.0591 0.1125 0.0904-14.521 3.8399-23.522 9.1772-23.522 15.079 0 11.691 35.324 21.169 78.899 21.169s78.899-9.4776 78.899-21.169c0-5.9014-9.0012-11.239-23.522-15.078 0.0387-0.0312 0.075-0.0601 0.11375-0.0914 14.645 3.8565 23.73 9.2276 23.73 15.169 0 11.739-35.469 21.255-79.22 21.255" fill="#fdfefe"/>
   <path id="path5639" d="m319.89 921.25c-43.575 0-78.899-9.4776-78.899-21.169 0-5.9014 9.0012-11.239 23.522-15.079 0.0362 0.0297 0.0762 0.0625 0.1125 0.0914-14.394 3.8208-23.315 9.125-23.315 14.987 0 11.644 35.181 21.083 78.579 21.083s78.579-9.439 78.579-21.083c0-5.8622-8.9212-11.166-23.315-14.987 0.0362-0.0289 0.0763-0.0616 0.1125-0.0904 14.521 3.8389 23.522 9.1762 23.522 15.078 0 11.691-35.324 21.169-78.899 21.169" fill="#fdfefe"/>
   <path id="path5641" d="m319.89 921.16c-43.398 0-78.579-9.439-78.579-21.083 0-5.8622 8.9212-11.166 23.315-14.987 0.04 0.0312 0.075 0.06 0.11375 0.0907-14.271 3.8042-23.108 9.0728-23.108 14.896 0 11.596 35.036 20.996 78.258 20.996 43.22 0 78.258-9.3999 78.258-20.996 0-5.8238-8.8362-11.092-23.108-14.896 0.0387-0.0308 0.075-0.0595 0.11375-0.0907 14.394 3.8208 23.315 9.125 23.315 14.987 0 11.644-35.181 21.083-78.579 21.083" fill="#fdfdfe"/>
   <path id="path5643" d="m319.89 921.08c-43.221 0-78.258-9.3999-78.258-20.996 0-5.8238 8.8362-11.092 23.108-14.896 0.0375 0.0289 0.0775 0.0615 0.115 0.0914-14.146 3.7851-22.901 9.0214-22.901 14.805 0 11.549 34.892 20.91 77.936 20.91 43.042 0 77.936-9.3613 77.936-20.91 0-5.7838-8.755-11.02-22.901-14.805 0.0375-0.0299 0.0775-0.0625 0.115-0.0914 14.271 3.8042 23.108 9.0728 23.108 14.896 0 11.596-35.038 20.996-78.258 20.996" fill="#fdfdfd"/>
   <path id="path5645" d="m319.89 920.99c-43.044 0-77.936-9.3613-77.936-20.91 0-5.7838 8.755-11.02 22.901-14.805 0.0387 0.0312 0.075 0.06 0.11375 0.0902-14.024 3.7686-22.695 8.9697-22.695 14.715 0 11.501 34.75 20.824 77.616 20.824s77.616-9.3223 77.616-20.824c0-5.7451-8.67-10.946-22.695-14.715 0.0387-0.0303 0.075-0.059 0.11375-0.0902 14.146 3.7851 22.901 9.0214 22.901 14.805 0 11.549-34.894 20.91-77.936 20.91" fill="#fdfdfd"/>
   <path id="path5647" d="m319.89 920.9c-42.866 0-77.616-9.3223-77.616-20.824 0-5.7451 8.6712-10.946 22.695-14.715 0.0375 0.0299 0.0788 0.0625 0.115 0.0914-13.9 3.75-22.489 8.9175-22.489 14.624 0 11.454 34.606 20.737 77.295 20.737s77.295-9.2837 77.295-20.737c0-5.706-8.5888-10.874-22.489-14.624 0.0375-0.0289 0.0775-0.0615 0.115-0.0914 14.025 3.7686 22.695 8.9697 22.695 14.715 0 11.501-34.75 20.824-77.616 20.824" fill="#fcfdfd"/>
   <path id="path5649" d="m319.89 920.82c-42.689 0-77.295-9.2837-77.295-20.737 0-5.706 8.5888-10.874 22.489-14.624 0.0387 0.0312 0.0763 0.0595 0.115 0.0907-13.776 3.7315-22.284 8.8652-22.284 14.533 0 11.406 34.462 20.652 76.975 20.652 42.511 0 76.974-9.2461 76.974-20.652 0-5.6675-8.5062-10.801-22.282-14.533 0.0387-0.0312 0.0762-0.0595 0.115-0.0907 13.9 3.75 22.489 8.9175 22.489 14.624 0 11.454-34.606 20.737-77.295 20.737" fill="#fcfdfd"/>
   <path id="path5651" d="m319.89 920.73c-42.512 0-76.975-9.2461-76.975-20.652 0-5.6675 8.5075-10.801 22.284-14.533 0.04 0.0312 0.0775 0.0601 0.11625 0.0914-13.651 3.7139-22.079 8.8139-22.079 14.441 0 11.359 34.319 20.566 76.654 20.566s76.654-9.2075 76.654-20.566c0-5.6275-8.4275-10.728-22.079-14.441 0.04-0.0312 0.0763-0.0601 0.11625-0.0914 13.776 3.7315 22.282 8.8652 22.282 14.533 0 11.406-34.462 20.652-76.974 20.652" fill="#fcfcfd"/>
   <path id="path5653" d="m319.89 920.65c-42.335 0-76.654-9.2075-76.654-20.566 0-5.6275 8.4275-10.728 22.079-14.441 0.0375 0.0287 0.0788 0.0615 0.11625 0.0912-13.529 3.6954-21.874 8.7613-21.874 14.35 0 11.311 34.175 20.48 76.332 20.48 42.158 0 76.332-9.1689 76.332-20.48 0-5.5889-8.3438-10.655-21.874-14.35 0.04-0.0312 0.0775-0.06 0.11625-0.0912 13.651 3.7139 22.079 8.8139 22.079 14.441 0 11.359-34.319 20.566-76.654 20.566" fill="#fcfcfc"/>
   <path id="path5655" d="m319.89 920.56c-42.158 0-76.332-9.1689-76.332-20.48 0-5.5889 8.345-10.655 21.874-14.35 0.0388 0.0303 0.0775 0.0601 0.11625 0.0904-13.405 3.6772-21.67 8.71-21.67 14.26 0 11.264 34.032 20.394 76.012 20.394s76.012-9.1299 76.012-20.394c0-5.5498-8.265-10.582-21.67-14.259 0.0375-0.0299 0.08-0.0625 0.11625-0.0914 13.53 3.6954 21.874 8.7612 21.874 14.35 0 11.311-34.175 20.48-76.332 20.48" fill="#fbfcfc"/>
   <path id="path5657" d="m319.89 920.47c-41.98 0-76.012-9.1299-76.012-20.394 0-5.5498 8.265-10.582 21.67-14.26 0.0387 0.0308 0.0775 0.061 0.1175 0.0908-13.284 3.6592-21.466 8.6578-21.466 14.169 0 11.216 33.888 20.308 75.691 20.308 41.804 0 75.691-9.0914 75.691-20.308 0-5.5112-8.1812-10.509-21.466-14.169 0.04-0.0298 0.0787-0.06 0.1175-0.0898 13.405 3.6762 21.67 8.709 21.67 14.259 0 11.264-34.032 20.394-76.012 20.394" fill="#fbfcfc"/>
   <path id="path5659" d="m319.89 920.39c-41.804 0-75.691-9.0914-75.691-20.308 0-5.5112 8.1825-10.51 21.466-14.169 0.0387 0.0312 0.0775 0.0616 0.1175 0.0914-13.161 3.6411-21.262 8.605-21.262 14.078 0 11.169 33.744 20.221 75.37 20.221s75.37-9.0522 75.37-20.221c0-5.4726-8.1012-10.436-21.261-14.078 0.0387-0.0298 0.0775-0.0601 0.11625-0.0914 13.285 3.6602 21.466 8.6578 21.466 14.169 0 11.216-33.888 20.308-75.691 20.308" fill="#fbfbfb"/>
   <path id="path5661" d="m319.89 920.3c-41.626 0-75.37-9.0522-75.37-20.221 0-5.4726 8.1012-10.436 21.262-14.078 0.0387 0.0312 0.0775 0.0615 0.1175 0.0913-13.039 3.6226-21.06 8.5528-21.06 13.986 0 11.12 33.601 20.136 75.05 20.136s75.05-9.0161 75.05-20.136c0-5.4336-8.0212-10.364-21.06-13.986 0.04-0.0297 0.0788-0.06 0.11875-0.0913 13.16 3.6411 21.261 8.605 21.261 14.078 0 11.169-33.744 20.221-75.37 20.221" fill="#fbfbfb"/>
   <path id="path5663" d="m319.89 920.22c-41.449 0-75.05-9.0161-75.05-20.136 0-5.4336 8.0212-10.364 21.06-13.986 0.0388 0.0304 0.0788 0.0616 0.1175 0.0914-12.916 3.604-20.856 8.5-20.856 13.895 0 11.072 33.456 20.05 74.729 20.05 41.271 0 74.729-8.9776 74.729-20.05 0-5.395-7.94-10.291-20.856-13.895 0.0387-0.0298 0.0787-0.0601 0.1175-0.0914 13.039 3.6226 21.06 8.5528 21.06 13.986 0 11.12-33.601 20.136-75.05 20.136" fill="#fafbfb"/>
   <path id="path5665" d="m319.89 920.13c-41.272 0-74.729-8.9776-74.729-20.05 0-5.395 7.94-10.291 20.856-13.895 0.04 0.0297 0.08 0.0615 0.11875 0.0912-12.795 3.585-20.655 8.4472-20.655 13.804 0 11.025 33.314 19.964 74.409 19.964s74.409-8.939 74.409-19.964c0-5.355-7.8625-10.219-20.655-13.804 0.0387-0.0298 0.0787-0.0615 0.11875-0.0912 12.916 3.604 20.856 8.5 20.856 13.895 0 11.072-33.458 20.05-74.729 20.05" fill="#fafbfb"/>
   <path id="path5667" d="m319.89 920.04c-41.095 0-74.409-8.939-74.409-19.964 0-5.3565 7.86-10.219 20.655-13.804 0.04 0.0299 0.08 0.0611 0.12 0.0914-12.674 3.5658-20.454 8.396-20.454 13.712 0 10.978 33.17 19.877 74.088 19.877s74.088-8.8999 74.088-19.877c0-5.3164-7.78-10.146-20.452-13.712 0.0387-0.0302 0.0788-0.0615 0.11875-0.0914 12.792 3.585 20.655 8.4488 20.655 13.804 0 11.025-33.314 19.964-74.409 19.964" fill="#fafafa"/>
   <path id="path5669" d="m319.89 919.96c-40.918 0-74.088-8.8999-74.088-19.877 0-5.3164 7.78-10.146 20.454-13.712 0.0387 0.0297 0.08 0.061 0.11875 0.0913-12.55 3.5474-20.251 8.3438-20.251 13.621 0 10.93 33.026 19.791 73.766 19.791s73.766-8.8609 73.766-19.791c0-5.2774-7.7012-10.074-20.251-13.621 0.04-0.0303 0.08-0.0615 0.12-0.0913 12.672 3.5659 20.452 8.396 20.452 13.712 0 10.978-33.17 19.877-74.088 19.877" fill="#fafafa"/>
   <path id="path5671" d="m319.89 919.87c-40.74 0-73.766-8.8609-73.766-19.791 0-5.2774 7.7012-10.074 20.251-13.621 0.04 0.0299 0.08 0.0596 0.12 0.0914-12.431 3.5282-20.051 8.291-20.051 13.53 0 10.882 32.882 19.705 73.446 19.705 40.562 0 73.446-8.8227 73.446-19.705 0-5.2388-7.62-10.002-20.051-13.53 0.04-0.0303 0.08-0.0615 0.12-0.0914 12.55 3.5474 20.251 8.3438 20.251 13.621 0 10.93-33.026 19.791-73.766 19.791" fill="#f9fafa"/>
   <path id="path5673" d="m319.89 919.79c-40.564 0-73.446-8.8227-73.446-19.705 0-5.2388 7.62-10.002 20.051-13.53 0.04 0.0298 0.0813 0.061 0.12125 0.0907-12.311 3.5102-19.851 8.2388-19.851 13.439 0 10.835 32.739 19.619 73.125 19.619s73.125-8.7836 73.125-19.619c0-5.2002-7.54-9.9272-19.85-13.439 0.0387-0.0297 0.08-0.061 0.12-0.0907 12.431 3.5282 20.051 8.291 20.051 13.53 0 10.882-32.884 19.705-73.446 19.705" fill="#f9f9f9"/>
   <path id="path5675" d="m319.89 919.7c-40.386 0-73.125-8.7836-73.125-19.619 0-5.2002 7.54-9.9288 19.851-13.439 0.0387 0.0303 0.08 0.0601 0.12 0.0914-12.188 3.4911-19.651 8.1865-19.651 13.348 0 10.788 32.596 19.534 72.805 19.534s72.804-8.7461 72.804-19.534c0-5.1611-7.4625-9.8565-19.65-13.348 0.04-0.0299 0.0812-0.0611 0.12125-0.0914 12.31 3.5118 19.85 8.2388 19.85 13.439 0 10.835-32.739 19.619-73.125 19.619" fill="#f9f9f9"/>
   <path id="path5677" d="m319.89 919.61c-40.209 0-72.805-8.7461-72.805-19.534 0-5.1611 7.4638-9.8565 19.651-13.348 0.0425 0.0312 0.08 0.059 0.12125 0.0912-12.068 3.4726-19.451 8.1339-19.451 13.256 0 10.74 32.452 19.448 72.484 19.448 40.031 0 72.484-8.7075 72.484-19.448 0-5.1225-7.3838-9.7838-19.451-13.256 0.0425-0.0322 0.0787-0.06 0.12125-0.0912 12.188 3.4911 19.65 8.1865 19.65 13.348 0 10.788-32.595 19.534-72.804 19.534" fill="#f8f9f9"/>
   <path id="path5679" d="m319.89 919.53c-40.031 0-72.484-8.7075-72.484-19.448 0-5.1225 7.3838-9.7838 19.451-13.256 0.04 0.0289 0.0825 0.0615 0.1225 0.0914-11.949 3.4536-19.252 8.08-19.252 13.165 0 10.692 32.308 19.361 72.162 19.361 39.855 0 72.162-8.669 72.162-19.361 0-5.085-7.3038-9.7114-19.252-13.165 0.04-0.0299 0.0825-0.0611 0.1225-0.0914 12.068 3.4726 19.451 8.1339 19.451 13.256 0 10.74-32.452 19.448-72.484 19.448" fill="#f8f8f8"/>
   <path id="path5681" d="m319.89 919.44c-39.855 0-72.162-8.669-72.162-19.361 0-5.085 7.3038-9.7114 19.252-13.165 0.04 0.0288 0.0812 0.0615 0.12125 0.0913-11.828 3.4351-19.054 8.0274-19.054 13.074 0 10.645 32.165 19.275 71.842 19.275 39.678 0 71.842-8.6299 71.842-19.275 0-5.0464-7.2262-9.6386-19.054-13.074 0.04-0.0298 0.0813-0.0625 0.12125-0.0913 11.949 3.4536 19.252 8.08 19.252 13.165 0 10.692-32.308 19.361-72.162 19.361" fill="#f8f8f8"/>
   <path id="path5683" d="m319.89 919.35c-39.678 0-71.842-8.6299-71.842-19.275 0-5.0464 7.2262-9.6386 19.054-13.074 0.0425 0.0312 0.0813 0.0586 0.12375 0.0914-11.709 3.416-18.856 7.975-18.856 12.982 0 10.598 32.021 19.189 71.521 19.189s71.521-8.5913 71.521-19.189c0-5.0074-7.1475-9.5664-18.856-12.982 0.0425-0.0312 0.0813-0.0601 0.12375-0.0914 11.828 3.4351 19.054 8.0274 19.054 13.074 0 10.645-32.165 19.275-71.842 19.275" fill="#f7f8f8"/>
   <path id="path5685" d="m319.89 919.27c-39.5 0-71.521-8.5913-71.521-19.189 0-5.0074 7.1475-9.5664 18.856-12.982 0.04 0.0288 0.0825 0.061 0.1225 0.0913-11.588 3.3975-18.659 7.9224-18.659 12.891 0 10.55 31.879 19.103 71.201 19.103s71.2-8.5528 71.2-19.103c0-4.9688-7.0688-9.4936-18.658-12.891 0.04-0.0303 0.0825-0.0625 0.1225-0.0913 11.709 3.416 18.856 7.975 18.856 12.982 0 10.598-32.021 19.189-71.521 19.189" fill="#f7f7f7"/>
   <path id="path5687" d="m319.89 919.18c-39.322 0-71.201-8.5528-71.201-19.103 0-4.9688 7.0712-9.4936 18.659-12.891 0.0425 0.0312 0.0812 0.0601 0.12375 0.0914-11.47 3.3784-18.461 7.8696-18.461 12.8 0 10.502 31.734 19.016 70.88 19.016s70.88-8.5136 70.88-19.016c0-4.9301-6.9912-9.4214-18.461-12.8 0.0425-0.0312 0.0813-0.0601 0.12375-0.0914 11.589 3.3975 18.658 7.9224 18.658 12.891 0 10.55-31.878 19.103-71.2 19.103" fill="#f6f7f7"/>
   <path id="path5689" d="m319.89 919.1c-39.146 0-70.88-8.5136-70.88-19.016 0-4.9301 6.9912-9.4214 18.461-12.8 0.04 0.0282 0.0838 0.061 0.12375 0.0907-11.349 3.3589-18.264 7.8179-18.264 12.709 0 10.455 31.59 18.931 70.559 18.931s70.559-8.476 70.559-18.931c0-4.8911-6.915-9.3501-18.264-12.709 0.04-0.0297 0.0838-0.0625 0.12375-0.0907 11.47 3.3784 18.461 7.8696 18.461 12.8 0 10.502-31.734 19.016-70.88 19.016" fill="#f6f6f7"/>
   <path id="path5691" d="m319.89 919.01c-38.969 0-70.559-8.476-70.559-18.931 0-4.8911 6.915-9.3501 18.264-12.709 0.0425 0.0312 0.0825 0.0601 0.125 0.0914-11.231 3.3402-18.069 7.7651-18.069 12.618 0 10.408 31.448 18.845 70.239 18.845s70.239-8.4375 70.239-18.845c0-4.8525-6.8362-9.2774-18.069-12.618 0.0425-0.0312 0.0825-0.0601 0.125-0.0914 11.349 3.3589 18.264 7.8179 18.264 12.709 0 10.455-31.59 18.931-70.559 18.931" fill="#f6f6f6"/>
   <path id="path5693" d="m319.89 918.93c-38.791 0-70.239-8.4375-70.239-18.845 0-4.8525 6.8375-9.2774 18.069-12.618 0.04 0.0287 0.085 0.0615 0.125 0.0912-11.112 3.3213-17.872 7.7114-17.872 12.526 0 10.36 31.302 18.759 69.918 18.759 38.614 0 69.918-8.3989 69.918-18.759 0-4.815-6.76-9.2051-17.872-12.526 0.04-0.0297 0.085-0.0625 0.125-0.0912 11.232 3.3402 18.069 7.7651 18.069 12.618 0 10.408-31.448 18.845-70.239 18.845" fill="#f5f6f6"/>
   <path id="path5695" d="m319.89 918.84c-38.615 0-69.918-8.3989-69.918-18.759 0-4.815 6.76-9.2051 17.872-12.526 0.0425 0.0312 0.0825 0.0601 0.12625 0.0914-10.995 3.3026-17.679 7.6586-17.679 12.435 0 10.312 31.16 18.672 69.598 18.672s69.596-8.3599 69.596-18.672c0-4.7764-6.6825-9.1324-17.676-12.435 0.0425-0.0312 0.0825-0.0601 0.125-0.0914 11.112 3.3213 17.872 7.7114 17.872 12.526 0 10.36-31.304 18.759-69.918 18.759" fill="#f5f5f5"/>
   <path id="path5697" d="m319.89 918.75c-38.438 0-69.598-8.3599-69.598-18.672 0-4.7764 6.6838-9.1324 17.679-12.435 0.0425 0.0312 0.0825 0.06 0.125 0.0913-10.876 3.2828-17.482 7.6065-17.482 12.344 0 10.265 31.016 18.586 69.276 18.586s69.276-8.3213 69.276-18.586c0-4.7372-6.6062-9.061-17.482-12.344 0.0425-0.0312 0.0825-0.06 0.12625-0.0913 10.994 3.3026 17.676 7.6586 17.676 12.435 0 10.312-31.159 18.672-69.596 18.672" fill="#f5f5f5"/>
   <path id="path5699" d="m319.89 918.67c-38.26 0-69.276-8.3213-69.276-18.586 0-4.7372 6.6062-9.061 17.482-12.344 0.0412 0.0297 0.0863 0.0625 0.1275 0.0912-10.759 3.2638-17.289 7.5538-17.289 12.252 0 10.217 30.872 18.5 68.955 18.5 38.082 0 68.955-8.2828 68.955-18.5 0-4.6988-6.53-8.9888-17.289-12.252 0.0437-0.0303 0.085-0.06 0.1275-0.0912 10.876 3.2828 17.482 7.6065 17.482 12.344 0 10.265-31.016 18.586-69.276 18.586" fill="#f4f4f4"/>
   <path id="path5701" d="m319.89 918.58c-38.082 0-68.955-8.2828-68.955-18.5 0-4.6988 6.53-8.9888 17.289-12.252 0.0425 0.0312 0.0838 0.0611 0.12625 0.0914-10.641 3.2436-17.095 7.5-17.095 12.161 0 10.17 30.729 18.415 68.635 18.415s68.634-8.2452 68.634-18.415c0-4.6611-6.4525-8.9165-17.094-12.16 0.04-0.0299 0.0863-0.0625 0.12625-0.0924 10.759 3.2638 17.289 7.5538 17.289 12.252 0 10.217-30.872 18.5-68.955 18.5" fill="#f4f4f4"/>
   <path id="path5703" d="m319.89 918.5c-37.906 0-68.635-8.2452-68.635-18.415 0-4.6611 6.4538-8.9175 17.095-12.161 0.0437 0.0312 0.085 0.061 0.1275 0.0922-10.524 3.2236-16.901 7.4464-16.901 12.069 0 10.122 30.585 18.329 68.314 18.329s68.314-8.2061 68.314-18.329c0-4.6225-6.3775-8.8452-16.901-12.069 0.0425-0.0312 0.085-0.061 0.1275-0.0912 10.641 3.2436 17.094 7.499 17.094 12.16 0 10.17-30.728 18.415-68.634 18.415" fill="#f3f3f3"/>
   <path id="path5705" d="m319.89 918.41c-37.729 0-68.314-8.2061-68.314-18.329 0-4.6225 6.3775-8.8452 16.901-12.069 0.0437 0.0303 0.085 0.0601 0.12875 0.0914-10.408 3.2036-16.71 7.3935-16.71 11.978 0 10.075 30.442 18.243 67.994 18.243 37.551 0 67.992-8.1674 67.992-18.243 0-4.584-6.3012-8.7725-16.709-11.978 0.0437-0.0312 0.0863-0.0611 0.12875-0.0914 10.524 3.2236 16.901 7.4464 16.901 12.069 0 10.122-30.585 18.329-68.314 18.329" fill="#f3f3f2"/>
   <path id="path5707" d="m319.89 918.32c-37.551 0-67.994-8.1674-67.994-18.243 0-4.584 6.3025-8.7739 16.71-11.978 0.0425 0.0298 0.085 0.0615 0.12875 0.0913-10.291 3.1851-16.518 7.3399-16.518 11.886 0 10.027 30.299 18.156 67.672 18.156 37.374 0 67.672-8.1289 67.672-18.156 0-4.5449-6.2288-8.7011-16.516-11.886 0.0425-0.0298 0.085-0.0615 0.1275-0.0913 10.408 3.205 16.709 7.3935 16.709 11.978 0 10.075-30.441 18.243-67.992 18.243" fill="#f2f2f2"/>
   <path id="path5709" d="m319.89 918.24c-37.374 0-67.672-8.1289-67.672-18.156 0-4.5464 6.2262-8.7011 16.518-11.886 0.0425 0.0298 0.085 0.061 0.12875 0.0914-10.174 3.165-16.325 7.2875-16.325 11.795 0 9.98 30.154 18.07 67.351 18.07 37.198 0 67.351-8.0898 67.351-18.07 0-4.5074-6.1512-8.6299-16.325-11.795 0.0437-0.0304 0.0862-0.0616 0.13-0.0914 10.288 3.1851 16.516 7.3414 16.516 11.886 0 10.027-30.299 18.156-67.672 18.156" fill="#f2f1f1"/>
   <path id="path5711" d="m319.89 918.15c-37.198 0-67.351-8.0898-67.351-18.07 0-4.5074 6.1512-8.6299 16.325-11.795 0.0425 0.0312 0.0863 0.061 0.13 0.0913-10.058 3.146-16.135 7.2349-16.135 11.704 0 9.9326 30.011 17.984 67.031 17.984s67.03-8.0513 67.03-17.984c0-4.4688-6.0762-8.5576-16.132-11.703 0.0425-0.0312 0.0863-0.061 0.12875-0.0923 10.174 3.165 16.325 7.2875 16.325 11.795 0 9.98-30.154 18.07-67.351 18.07" fill="#f1f1f1"/>
   <path id="path5713" d="m319.89 918.06c-37.02 0-67.031-8.0513-67.031-17.984 0-4.4688 6.0775-8.5576 16.135-11.704 0.0425 0.0312 0.0863 0.061 0.13 0.0922-9.9438 3.125-15.944 7.1802-15.944 11.611 0 9.8848 29.868 17.897 66.71 17.897s66.71-8.0127 66.71-17.897c0-4.4311-6.0025-8.4864-15.942-11.611 0.0425-0.0297 0.0863-0.061 0.13-0.0913 10.056 3.145 16.132 7.2339 16.132 11.703 0 9.9326-30.01 17.984-67.03 17.984" fill="#f0f0f0"/>
   <path id="path5715" d="m319.89 917.98c-36.842 0-66.71-8.0127-66.71-17.897 0-4.4311 6-8.4864 15.944-11.611 0.0425 0.0304 0.0863 0.0616 0.13 0.0914-9.825 3.1064-15.752 7.1274-15.752 11.52 0 9.8374 29.722 17.812 66.389 17.812 36.665 0 66.389-7.9751 66.389-17.812 0-4.3926-5.9275-8.4136-15.752-11.52 0.0437-0.0298 0.0875-0.061 0.13125-0.0914 9.94 3.125 15.942 7.1802 15.942 11.611 0 9.8848-29.868 17.897-66.71 17.897" fill="#f0f0ef"/>
   <path id="path5717" d="m319.89 917.89c-36.666 0-66.389-7.9751-66.389-17.812 0-4.3926 5.9275-8.4136 15.752-11.52 0.045 0.0312 0.0862 0.06 0.13125 0.0912-9.71 3.0865-15.564 7.0738-15.564 11.429 0 9.79 29.58 17.726 66.069 17.726s66.069-7.9361 66.069-17.726c0-4.355-5.8538-8.3422-15.564-11.429 0.0462-0.0312 0.0863-0.0585 0.13125-0.0912 9.825 3.1064 15.752 7.1274 15.752 11.52 0 9.8374-29.724 17.812-66.389 17.812" fill="#efefef"/>
   <path id="path5719" d="m319.89 917.81c-36.489 0-66.069-7.9361-66.069-17.726 0-4.355 5.8538-8.3422 15.564-11.429 0.0437 0.0299 0.0888 0.0625 0.13125 0.0924-9.5938 3.0649-15.374 7.02-15.374 11.336 0 9.7426 29.436 17.64 65.748 17.64 36.311 0 65.748-7.8975 65.748-17.64 0-4.3164-5.78-8.2715-15.374-11.336 0.0425-0.0299 0.0875-0.0611 0.13125-0.0924 9.71 3.0865 15.564 7.0738 15.564 11.429 0 9.79-29.58 17.726-66.069 17.726" fill="#eee"/>
   <path id="path5721" d="m319.89 917.72c-36.311 0-65.748-7.8975-65.748-17.64 0-4.3164 5.78-8.2715 15.374-11.336 0.0437 0.0302 0.0888 0.0615 0.1325 0.0912-9.4812 3.0464-15.186 6.9664-15.186 11.245 0 9.6949 29.292 17.554 65.428 17.554 36.134 0 65.426-7.8588 65.426-17.554 0-4.2788-5.7038-8.1988-15.185-11.245 0.0438-0.0297 0.0888-0.061 0.1325-0.0912 9.5938 3.0649 15.374 7.02 15.374 11.336 0 9.7426-29.436 17.64-65.748 17.64" fill="#eeeeed"/>
   <path id="path5723" d="m319.89 917.63c-36.135 0-65.428-7.8588-65.428-17.554 0-4.2788 5.705-8.1988 15.186-11.245 0.0462 0.0312 0.0875 0.0601 0.1325 0.0914-9.3662 3.0262-14.998 6.9135-14.998 11.154 0 9.6475 29.149 17.467 65.106 17.467 35.958 0 65.106-7.8198 65.106-17.467 0-4.2402-5.6312-8.1275-14.998-11.154 0.045-0.0312 0.0863-0.0601 0.1325-0.0914 9.4812 3.0464 15.185 6.9664 15.185 11.245 0 9.6949-29.292 17.554-65.426 17.554" fill="#ededec"/>
   <path id="path5725" d="m319.89 917.55c-35.958 0-65.106-7.8198-65.106-17.467 0-4.2402 5.6312-8.1275 14.998-11.154 0.0437 0.0303 0.09 0.0625 0.13375 0.0923-9.2512 3.0054-14.81 6.8589-14.81 11.062 0 9.6001 29.005 17.381 64.785 17.381s64.785-7.7812 64.785-17.381c0-4.2026-5.5588-8.0561-14.81-11.062 0.0437-0.0298 0.09-0.062 0.13375-0.0923 9.3662 3.0262 14.998 6.9135 14.998 11.154 0 9.6475-29.149 17.467-65.106 17.467" fill="#ededec"/>
   <path id="path5727" d="m319.89 917.46c-35.78 0-64.785-7.7812-64.785-17.381 0-4.2026 5.5588-8.0561 14.81-11.062 0.0462 0.0317 0.0888 0.06 0.13375 0.0912-9.1388 2.9854-14.624 6.8066-14.624 10.97 0 9.5528 28.862 17.295 64.465 17.295 35.602 0 64.465-7.7422 64.465-17.295 0-4.1636-5.485-7.9849-14.624-10.97 0.045-0.0312 0.0875-0.0595 0.13375-0.0912 9.2512 3.0054 14.81 6.8589 14.81 11.062 0 9.6001-29.005 17.381-64.785 17.381" fill="#ececeb"/>
   <path id="path5729" d="m319.89 917.37c-35.602 0-64.465-7.7422-64.465-17.295 0-4.1636 5.485-7.9849 14.624-10.97 0.0437 0.0303 0.0913 0.0625 0.135 0.0914-9.025 2.9652-14.438 6.7524-14.438 10.879 0 9.5049 28.718 17.21 64.144 17.21s64.144-7.7051 64.144-17.21c0-4.1265-5.4125-7.9136-14.438-10.878 0.0438-0.0303 0.0913-0.0625 0.135-0.0928 9.1388 2.9854 14.624 6.8066 14.624 10.97 0 9.5528-28.862 17.295-64.465 17.295" fill="#ecebea"/>
   <path id="path5731" d="m319.89 917.29c-35.426 0-64.144-7.7051-64.144-17.21 0-4.1265 5.4125-7.9136 14.438-10.879 0.0463 0.0312 0.0888 0.0615 0.135 0.0928-8.9112 2.9439-14.252 6.6972-14.252 10.786 0 9.4575 28.575 17.124 63.824 17.124s63.822-7.666 63.822-17.124c0-4.0889-5.34-7.8422-14.251-10.786 0.0462-0.0312 0.09-0.0601 0.135-0.0914 9.025 2.9639 14.438 6.751 14.438 10.878 0 9.5049-28.718 17.21-64.144 17.21" fill="#ebebea"/>
   <path id="path5733" d="m319.89 917.2c-35.249 0-63.824-7.666-63.824-17.124 0-4.0889 5.3412-7.8422 14.252-10.786 0.0437 0.0297 0.0913 0.0625 0.135 0.0912-8.7988 2.9234-14.066 6.6452-14.066 10.695 0 9.4101 28.431 17.038 63.502 17.038s63.502-7.6275 63.502-17.038c0-4.0498-5.2675-7.77-14.066-10.695 0.0437-0.0287 0.0913-0.0615 0.135-0.0912 8.9112 2.9439 14.251 6.6972 14.251 10.786 0 9.4575-28.574 17.124-63.822 17.124" fill="#eaeae9"/>
   <path id="path5735" d="m319.89 917.12c-35.071 0-63.502-7.6275-63.502-17.038 0-4.0498 5.2675-7.7715 14.066-10.695 0.0462 0.0312 0.0913 0.0611 0.13625 0.0924-8.685 2.9022-13.881 6.5898-13.881 10.602 0 9.3622 28.286 16.951 63.181 16.951 34.894 0 63.181-7.5889 63.181-16.951 0-4.0128-5.1962-7.6988-13.881-10.602 0.0463-0.0312 0.09-0.0611 0.13625-0.0924 8.7988 2.9249 14.066 6.6451 14.066 10.695 0 9.4101-28.431 17.038-63.502 17.038" fill="#eaeae8"/>
   <path id="path5737" d="m319.89 917.03c-34.895 0-63.181-7.5889-63.181-16.951 0-4.0128 5.1962-7.7002 13.881-10.602 0.0463 0.0312 0.0913 0.061 0.1375 0.0913-8.5725 2.8824-13.699 6.5376-13.699 10.511 0 9.315 28.144 16.865 62.861 16.865 34.718 0 62.861-7.5498 62.861-16.865 0-3.9736-5.1262-7.6275-13.699-10.511 0.0462-0.0303 0.0913-0.06 0.1375-0.0913 8.685 2.9038 13.881 6.5898 13.881 10.602 0 9.3622-28.288 16.951-63.181 16.951" fill="#e9e9e8"/>
   <path id="path5739" d="m319.89 916.94c-34.718 0-62.861-7.5498-62.861-16.865 0-3.9736 5.1262-7.6289 13.699-10.511 0.0462 0.0312 0.0913 0.061 0.1375 0.0923-8.4612 2.8629-13.515 6.483-13.515 10.419 0 9.2676 28 16.779 62.54 16.779s62.54-7.5112 62.54-16.779c0-3.936-5.0538-7.5561-13.515-10.419 0.0462-0.0312 0.0912-0.061 0.1375-0.0923 8.5725 2.8838 13.699 6.5376 13.699 10.511 0 9.315-28.144 16.865-62.861 16.865" fill="#e9e8e7"/>
   <path id="path5741" d="m319.89 916.86c-34.54 0-62.54-7.5112-62.54-16.779 0-3.936 5.0538-7.5561 13.515-10.419 0.0462 0.0312 0.0913 0.0616 0.1375 0.0914-8.35 2.8428-13.331 6.4288-13.331 10.328 0 9.2202 27.856 16.694 62.219 16.694 34.362 0 62.219-7.4736 62.219-16.694 0-3.8989-4.9812-7.4849-13.331-10.326 0.0463-0.0312 0.0913-0.0616 0.1375-0.0929 8.4612 2.8629 13.515 6.483 13.515 10.419 0 9.2676-28 16.779-62.54 16.779" fill="#e8e8e6"/>
   <path id="path5743" d="m319.89 916.77c-34.362 0-62.219-7.4736-62.219-16.694 0-3.8989 4.9812-7.4849 13.331-10.328 0.0462 0.0312 0.0925 0.0615 0.13875 0.0928-8.2375 2.8199-13.15 6.3735-13.15 10.235 0 9.1724 27.712 16.607 61.899 16.607 34.185 0 61.899-7.4351 61.899-16.607 0-3.8614-4.9125-7.415-13.15-10.235 0.0462-0.0303 0.0925-0.0615 0.13875-0.0913 8.35 2.8413 13.331 6.4273 13.331 10.326 0 9.2202-27.856 16.694-62.219 16.694" fill="#e7e7e6"/>
   <path id="path5745" d="m319.89 916.69c-34.186 0-61.899-7.4351-61.899-16.607 0-3.8614 4.9125-7.415 13.15-10.235 0.0462 0.0312 0.0925 0.061 0.13875 0.0922-8.1275 2.7989-12.968 6.3189-12.968 10.143 0 9.1235 27.569 16.521 61.578 16.521s61.578-7.398 61.578-16.521c0-3.8228-4.8412-7.3438-12.968-10.143 0.0463-0.0312 0.0925-0.061 0.13875-0.0922 8.2375 2.8199 13.15 6.3735 13.15 10.235 0 9.1724-27.714 16.607-61.899 16.607" fill="#e7e6e5"/>
   <path id="path5747" d="m319.89 916.6c-34.009 0-61.578-7.398-61.578-16.521 0-3.8238 4.84-7.3438 12.968-10.143 0.0463 0.0304 0.0937 0.0616 0.14 0.0914-8.015 2.7788-12.788 6.2661-12.788 10.051 0 9.0776 27.426 16.435 61.258 16.435 33.831 0 61.258-7.3574 61.258-16.435 0-3.7851-4.7712-7.2725-12.788-10.051 0.0462-0.0298 0.0937-0.061 0.14-0.0914 8.1262 2.7989 12.968 6.3199 12.968 10.143 0 9.1235-27.569 16.521-61.578 16.521" fill="#e6e6e4"/>
   <path id="path5749" d="m319.89 916.52c-33.831 0-61.258-7.3574-61.258-16.435 0-3.7851 4.7725-7.2725 12.788-10.051 0.0462 0.0312 0.0937 0.0625 0.14 0.0922-7.9062 2.7579-12.606 6.2115-12.606 9.959 0 9.0288 27.282 16.349 60.936 16.349s60.936-7.3199 60.936-16.349c0-3.7475-4.7-7.2011-12.606-9.959 0.0463-0.0297 0.0937-0.061 0.14-0.0922 8.0162 2.7788 12.788 6.2661 12.788 10.051 0 9.0776-27.426 16.435-61.258 16.435" fill="#e5e5e3"/>
   <path id="path5751" d="m319.89 916.43c-33.654 0-60.936-7.3199-60.936-16.349 0-3.7475 4.7-7.2011 12.606-9.959 0.0475 0.0303 0.095 0.0615 0.14125 0.0928-7.795 2.7364-12.428 6.1562-12.428 9.8662 0 8.9815 27.139 16.263 60.616 16.263 33.478 0 60.615-7.2812 60.615-16.263 0-3.71-4.6312-7.1299-12.426-9.8662 0.0462-0.0312 0.0937-0.0625 0.14125-0.0928 7.9062 2.7579 12.606 6.2115 12.606 9.959 0 9.0288-27.282 16.349-60.936 16.349" fill="#e4e4e3"/>
   <path id="path5753" d="m319.89 916.34c-33.478 0-60.616-7.2812-60.616-16.263 0-3.71 4.6325-7.1299 12.428-9.8662 0.0475 0.0299 0.095 0.0611 0.1425 0.0914-7.6862 2.7149-12.249 6.1025-12.249 9.7749 0 8.9336 26.995 16.176 60.295 16.176s60.295-7.2426 60.295-16.176c0-3.6724-4.5625-7.0586-12.249-9.7749 0.0475-0.0302 0.095-0.0615 0.1425-0.0914 7.795 2.7364 12.426 6.1562 12.426 9.8662 0 8.9815-27.138 16.263-60.615 16.263" fill="#e4e3e2"/>
   <path id="path5755" d="m319.89 916.26c-33.3 0-60.295-7.2426-60.295-16.176 0-3.6724 4.5625-7.06 12.249-9.7749 0.0487 0.0323 0.0925 0.061 0.1425 0.0922-7.5775 2.6939-12.07 6.0479-12.07 9.6826 0 8.8862 26.851 16.091 59.974 16.091 33.122 0 59.974-7.2051 59.974-16.091 0-3.6348-4.4925-6.9888-12.069-9.6826 0.0487-0.0312 0.0925-0.06 0.14125-0.0922 7.6862 2.7162 12.249 6.1025 12.249 9.7749 0 8.9336-26.995 16.176-60.295 16.176" fill="#e3e3e1"/>
   <path id="path5757" d="m319.89 916.17c-33.122 0-59.974-7.2051-59.974-16.091 0-3.6348 4.4925-6.9888 12.07-9.6826 0.0463 0.0303 0.0962 0.0625 0.1425 0.0928-7.4675 2.6724-11.892 5.9922-11.892 9.5899 0 8.8389 26.709 16.005 59.654 16.005s59.652-7.166 59.652-16.005c0-3.5976-4.4238-6.9175-11.891-9.5899 0.0463-0.0303 0.0962-0.0625 0.14375-0.0928 7.5762 2.6939 12.069 6.0479 12.069 9.6826 0 8.8862-26.851 16.091-59.974 16.091" fill="#e2e2e0"/>
   <path id="path5759" d="m319.89 916.08c-32.945 0-59.654-7.166-59.654-16.005 0-3.5976 4.425-6.9175 11.892-9.5899 0.0487 0.0312 0.095 0.0601 0.14375 0.0909-7.3588 2.6528-11.715 5.939-11.715 9.499 0 8.791 26.564 15.919 59.332 15.919 32.769 0 59.332-7.128 59.332-15.919 0-3.56-4.3562-6.8462-11.715-9.4975 0.0488-0.0322 0.095-0.0611 0.14375-0.0924 7.4675 2.6724 11.891 5.9922 11.891 9.5899 0 8.8389-26.708 16.005-59.652 16.005" fill="#e2e1df"/>
   <path id="path5761" d="m319.89 916c-32.769 0-59.332-7.128-59.332-15.919 0-3.56 4.3562-6.8462 11.715-9.499 0.0463 0.0303 0.0975 0.063 0.14375 0.0928-7.25 2.6299-11.538 5.8838-11.538 9.4062 0 8.7436 26.42 15.833 59.011 15.833s59.011-7.0889 59.011-15.833c0-3.5225-4.2862-6.7764-11.538-9.4062 0.0462-0.0298 0.0975-0.061 0.14375-0.0913 7.3588 2.6512 11.715 5.9375 11.715 9.4975 0 8.791-26.564 15.919-59.332 15.919" fill="#e1e0df"/>
   <path id="path5763" d="m319.89 915.91c-32.591 0-59.011-7.0889-59.011-15.833 0-3.5225 4.2875-6.7764 11.538-9.4062 0.05 0.0312 0.0962 0.061 0.145 0.0922-7.1425 2.6089-11.362 5.8291-11.362 9.314 0 8.6962 26.278 15.746 58.691 15.746 32.414 0 58.691-7.0498 58.691-15.746 0-3.4849-4.22-6.7051-11.362-9.314 0.0488-0.0312 0.095-0.061 0.145-0.0922 7.2512 2.6299 11.538 5.8838 11.538 9.4062 0 8.7436-26.42 15.833-59.011 15.833" fill="#e0e0de"/>
   <path id="path5765" d="m319.89 915.83c-32.414 0-58.691-7.0498-58.691-15.746 0-3.4849 4.22-6.7051 11.362-9.314 0.0475 0.0303 0.0988 0.0625 0.14625 0.0928-7.0362 2.586-11.188 5.7735-11.188 9.2212 0 8.6489 26.132 15.66 58.37 15.66 32.236 0 58.37-7.0113 58.37-15.66 0-3.4478-4.1525-6.6352-11.188-9.2212 0.0475-0.0303 0.0987-0.0625 0.14625-0.0928 7.1425 2.6089 11.362 5.8291 11.362 9.314 0 8.6962-26.278 15.746-58.691 15.746" fill="#e0dfdd"/>
   <path id="path5767" d="m319.89 915.74c-32.238 0-58.37-7.0113-58.37-15.66 0-3.4478 4.1512-6.6352 11.188-9.2212 0.0488 0.0312 0.0962 0.0611 0.14625 0.0924-6.9275 2.5649-11.012 5.7188-11.012 9.1289 0 8.6011 25.989 15.575 58.049 15.575s58.049-6.9741 58.049-15.575c0-3.4101-4.085-6.564-11.012-9.1289 0.05-0.0312 0.0975-0.0611 0.14625-0.0924 7.035 2.586 11.188 5.7735 11.188 9.2212 0 8.6489-26.134 15.66-58.37 15.66" fill="#dfdedc"/>
   <path id="path5769" d="m319.89 915.66c-32.06 0-58.049-6.9741-58.049-15.575 0-3.4101 4.085-6.564 11.012-9.1289 0.0487 0.0312 0.0975 0.0615 0.14625 0.0928-6.8212 2.5425-10.839 5.6636-10.839 9.0361 0 8.5538 25.846 15.489 57.729 15.489 31.882 0 57.729-6.935 57.729-15.489 0-3.3725-4.0175-6.4926-10.839-9.0361 0.0488-0.0312 0.0975-0.0615 0.14625-0.0928 6.9275 2.5649 11.012 5.7188 11.012 9.1289 0 8.6011-25.989 15.575-58.049 15.575" fill="#dedddb"/>
   <path id="path5771" d="m319.89 915.57c-31.882 0-57.729-6.935-57.729-15.489 0-3.3725 4.0175-6.4936 10.839-9.0361 0.05 0.0312 0.0987 0.061 0.14875 0.0922-6.715 2.5215-10.666 5.6089-10.666 8.9439 0 8.5064 25.702 15.402 57.408 15.402 31.705 0 57.408-6.896 57.408-15.402 0-3.335-3.95-6.4224-10.666-8.9439 0.05-0.0312 0.0988-0.061 0.14875-0.0922 6.8212 2.5435 10.839 5.6636 10.839 9.0361 0 8.5538-25.846 15.489-57.729 15.489" fill="#dddcda"/>
   <path id="path5773" d="m319.89 915.48c-31.705 0-57.408-6.896-57.408-15.402 0-3.335 3.9512-6.4224 10.666-8.9439 0.0487 0.0303 0.0987 0.0615 0.14875 0.0928-6.61 2.4986-10.495 5.5538-10.495 8.8511 0 8.459 25.559 15.316 57.088 15.316 31.528 0 57.088-6.8574 57.088-15.316 0-3.2974-3.885-6.3525-10.494-8.8511 0.0487-0.0312 0.0987-0.0625 0.1475-0.0928 6.7162 2.5215 10.666 5.6089 10.666 8.9439 0 8.5064-25.702 15.402-57.408 15.402" fill="#dddcda"/>
   <path id="path5775" d="m319.89 915.4c-31.529 0-57.088-6.8574-57.088-15.316 0-3.2974 3.885-6.3525 10.495-8.8511 0.0487 0.0299 0.0987 0.0611 0.14875 0.0924-6.5038 2.4775-10.322 5.499-10.322 8.7588 0 8.4111 25.415 15.23 56.766 15.23s56.766-6.8188 56.766-15.23c0-3.2598-3.8188-6.2812-10.322-8.7588 0.05-0.0312 0.1-0.0625 0.15-0.0924 6.6088 2.4986 10.494 5.5538 10.494 8.8511 0 8.459-25.56 15.316-57.088 15.316" fill="#dcdbd9"/>
   <path id="path5777" d="m319.89 915.31c-31.351 0-56.766-6.8188-56.766-15.23 0-3.2598 3.8188-6.2812 10.322-8.7588 0.0487 0.0303 0.1 0.061 0.15 0.0923-6.3988 2.4551-10.151 5.4439-10.151 8.6665 0 8.3638 25.271 15.144 56.445 15.144s56.445-6.7798 56.445-15.144c0-3.2226-3.7525-6.2114-10.151-8.6665 0.05-0.0312 0.10125-0.062 0.15-0.0923 6.5038 2.4775 10.322 5.499 10.322 8.7588 0 8.4111-25.415 15.23-56.766 15.23" fill="#dbdad8"/>
   <path id="path5779" d="m319.89 915.22c-31.174 0-56.445-6.7798-56.445-15.144 0-3.2226 3.7525-6.2114 10.151-8.6665 0.0487 0.0303 0.1 0.0615 0.15 0.0928-6.2938 2.4326-9.9812 5.3878-9.9812 8.5738 0 8.3164 25.129 15.058 56.125 15.058s56.125-6.7412 56.125-15.058c0-3.186-3.6875-6.1411-9.9812-8.5738 0.05-0.0312 0.10125-0.0625 0.15-0.0928 6.3988 2.4551 10.151 5.4439 10.151 8.6665 0 8.3638-25.271 15.144-56.445 15.144" fill="#dad9d7"/>
   <path id="path5781" d="m319.89 915.14c-30.996 0-56.125-6.7412-56.125-15.058 0-3.186 3.6875-6.1411 9.9812-8.5738 0.05 0.0298 0.10125 0.061 0.15125 0.0923-6.1875 2.4116-9.8112 5.3326-9.8112 8.4815 0 8.2685 24.984 14.973 55.804 14.973s55.804-6.7042 55.804-14.973c0-3.1489-3.6225-6.0699-9.8112-8.4815 0.05-0.0298 0.10125-0.0625 0.15125-0.0923 6.2938 2.4326 9.9812 5.3878 9.9812 8.5738 0 8.3164-25.129 15.058-56.125 15.058" fill="#d9d8d6"/>
   <path id="path5783" d="m319.89 915.05c-30.82 0-55.804-6.7042-55.804-14.973 0-3.1489 3.6238-6.0699 9.8112-8.4815 0.0525 0.0312 0.1 0.0601 0.1525 0.0929-6.085 2.3886-9.6438 5.2773-9.6438 8.3886 0 8.2212 24.841 14.886 55.484 14.886 30.642 0 55.484-6.665 55.484-14.886 0-3.1114-3.5588-6-9.6438-8.3886 0.0525-0.0312 0.1-0.0616 0.1525-0.0929 6.1888 2.4116 9.8112 5.3326 9.8112 8.4815 0 8.2685-24.984 14.973-55.804 14.973" fill="#d8d7d6"/>
   <path id="path5785" d="m319.89 914.97c-30.642 0-55.484-6.665-55.484-14.886 0-3.1114 3.5588-6 9.6438-8.3886 0.05 0.0298 0.1025 0.0625 0.1525 0.0923-5.9812 2.3663-9.475 5.2211-9.475 8.2964 0 8.1739 24.698 14.8 55.162 14.8 30.465 0 55.162-6.6259 55.162-14.8 0-3.0752-3.4938-5.9301-9.475-8.2964 0.05-0.0298 0.1025-0.0625 0.1525-0.0923 6.085 2.3886 9.6438 5.2773 9.6438 8.3886 0 8.2212-24.841 14.886-55.484 14.886" fill="#d7d6d5"/>
   <path id="path5787" d="m319.89 914.88c-30.465 0-55.162-6.6259-55.162-14.8 0-3.0752 3.4938-5.9301 9.475-8.2964 0.0525 0.0312 0.10125 0.0615 0.15375 0.0928-5.8775 2.3438-9.3075 5.166-9.3075 8.2036 0 8.1265 24.552 14.714 54.841 14.714 30.288 0 54.841-6.5874 54.841-14.714 0-3.0376-3.43-5.8599-9.3075-8.2036 0.0525-0.0312 0.10125-0.06 0.15375-0.0928 5.9812 2.3663 9.475 5.2211 9.475 8.2964 0 8.1739-24.698 14.8-55.162 14.8" fill="#d6d6d4"/>
   <path id="path5789" d="m319.89 914.79c-30.289 0-54.841-6.5874-54.841-14.714 0-3.0376 3.43-5.8599 9.3075-8.2036 0.05 0.0297 0.105 0.0625 0.155 0.0922-5.7762 2.3227-9.1425 5.1114-9.1425 8.1114 0 8.0786 24.41 14.627 54.521 14.627s54.521-6.5488 54.521-14.627c0-3-3.3662-5.7886-9.1425-8.1099 0.0512-0.0303 0.105-0.064 0.155-0.0937 5.8775 2.3438 9.3075 5.166 9.3075 8.2036 0 8.1265-24.554 14.714-54.841 14.714" fill="#d5d5d3"/>
   <path id="path5791" d="m319.89 914.71c-30.111 0-54.521-6.5488-54.521-14.627 0-3 3.3662-5.7886 9.1425-8.1114 0.0525 0.0328 0.1025 0.0625 0.155 0.0937-5.6725 2.2989-8.9762 5.0552-8.9762 8.0176 0 8.0312 24.266 14.541 54.2 14.541s54.2-6.5098 54.2-14.541c0-2.9624-3.3038-5.7188-8.9762-8.0176 0.0525-0.0312 0.1025-0.061 0.155-0.0922 5.7762 2.3212 9.1425 5.1099 9.1425 8.1099 0 8.0786-24.41 14.627-54.521 14.627" fill="#d4d4d2"/>
   <path id="path5793" d="m319.89 914.62c-29.934 0-54.2-6.5098-54.2-14.541 0-2.9624 3.3038-5.7188 8.9762-8.0176 0.0525 0.0312 0.10375 0.0616 0.15625 0.0929-5.5712 2.2759-8.8125 4.9985-8.8125 7.9248 0 7.9839 24.122 14.455 53.88 14.455 29.756 0 53.879-6.4712 53.879-14.455 0-2.9262-3.24-5.6489-8.8112-7.9248 0.0538-0.0312 0.10375-0.0616 0.15625-0.0929 5.6725 2.2989 8.9762 5.0552 8.9762 8.0176 0 8.0312-24.266 14.541-54.2 14.541" fill="#d4d3d1"/>
   <path id="path5795" d="m319.89 914.54c-29.758 0-53.88-6.4712-53.88-14.455 0-2.9262 3.2412-5.6489 8.8125-7.9248 0.0525 0.0312 0.10375 0.061 0.15625 0.0923-5.47 2.2539-8.6475 4.9439-8.6475 7.8325 0 7.936 23.979 14.37 53.559 14.37 29.579 0 53.559-6.4341 53.559-14.37 0-2.8886-3.1775-5.5786-8.6475-7.8325 0.0525-0.0298 0.10375-0.061 0.15625-0.0923 5.5712 2.2759 8.8112 4.9985 8.8112 7.9248 0 7.9839-24.122 14.455-53.879 14.455" fill="#d3d2d0"/>
   <path id="path5797" d="m319.89 914.45c-29.58 0-53.559-6.4341-53.559-14.37 0-2.8886 3.1775-5.5786 8.6475-7.8325 0.05 0.0297 0.1075 0.064 0.1575 0.0937-5.3688 2.23-8.4838 4.8862-8.4838 7.7388 0 7.8886 23.835 14.284 53.238 14.284 29.402 0 53.238-6.3951 53.238-14.284 0-2.8525-3.115-5.5088-8.4838-7.7388 0.05-0.0298 0.1075-0.064 0.1575-0.0937 5.47 2.2539 8.6475 4.9439 8.6475 7.8325 0 7.936-23.98 14.37-53.559 14.37" fill="#d2d1cf"/>
   <path id="path5799" d="m319.89 914.36c-29.402 0-53.238-6.3951-53.238-14.284 0-2.8525 3.115-5.5088 8.4838-7.7388 0.0525 0.0312 0.10625 0.061 0.15875 0.0922-5.2688 2.2075-8.3225 4.8315-8.3225 7.6465 0 7.8412 23.692 14.197 52.918 14.197 29.225 0 52.918-6.356 52.918-14.197 0-2.815-3.0538-5.439-8.3225-7.6465 0.0525-0.0297 0.10625-0.061 0.15875-0.0922 5.3688 2.23 8.4838 4.8862 8.4838 7.7388 0 7.8886-23.835 14.284-53.238 14.284" fill="#d1d0cf"/>
   <path id="path5801" d="m319.89 914.28c-29.225 0-52.918-6.356-52.918-14.197 0-2.815 3.0538-5.439 8.3225-7.6465 0.055 0.0328 0.10375 0.0615 0.15875 0.0937-5.1675 2.1841-8.16 4.774-8.16 7.5528 0 7.794 23.548 14.111 52.596 14.111 29.049 0 52.596-6.3173 52.596-14.111 0-2.7788-2.9925-5.3686-8.16-7.5528 0.055-0.0322 0.10375-0.061 0.15875-0.0937 5.2688 2.2075 8.3225 4.8315 8.3225 7.6465 0 7.8412-23.692 14.197-52.918 14.197" fill="#d0cfcd"/>
   <path id="path5803" d="m319.89 914.19c-29.049 0-52.596-6.3173-52.596-14.111 0-2.7788 2.9925-5.3686 8.16-7.5528 0.0537 0.0303 0.1075 0.0625 0.16125 0.0928-5.0688 2.1611-8 4.7188-8 7.46 0 7.7461 23.404 14.025 52.275 14.025s52.275-6.2788 52.275-14.025c0-2.7412-2.9312-5.2989-8-7.46 0.0537-0.0303 0.1075-0.0625 0.16125-0.0928 5.1675 2.1841 8.16 4.774 8.16 7.5528 0 7.794-23.548 14.111-52.596 14.111" fill="#cfcecc"/>
   <path id="path5805" d="m319.89 914.1c-28.871 0-52.275-6.2788-52.275-14.025 0-2.7412 2.9312-5.2989 8-7.46 0.0525 0.0312 0.1075 0.0625 0.16 0.0937-4.9688 2.1372-7.84 4.6611-7.84 7.3662 0 7.6988 23.261 13.94 51.955 13.94s51.955-6.2412 51.955-13.94c0-2.7051-2.8712-5.229-7.84-7.3662 0.0525-0.0312 0.1075-0.0625 0.16-0.0937 5.0688 2.1611 8 4.7188 8 7.46 0 7.7461-23.404 14.025-52.275 14.025" fill="#cecdcb"/>
   <path id="path5807" d="m319.89 914.02c-28.694 0-51.955-6.2412-51.955-13.94 0-2.7051 2.8712-5.229 7.84-7.3662 0.0538 0.0299 0.10875 0.0625 0.1625 0.0924-4.87 2.1138-7.6812 4.6064-7.6812 7.2739 0 7.6514 23.118 13.854 51.634 13.854s51.634-6.2021 51.634-13.854c0-2.6675-2.8112-5.1588-7.6812-7.2739 0.0538-0.0299 0.10875-0.0625 0.1625-0.0924 4.9688 2.1372 7.84 4.6611 7.84 7.3662 0 7.6988-23.261 13.94-51.955 13.94" fill="#cdccca"/>
   <path id="path5809" d="m319.89 913.93c-28.516 0-51.634-6.2021-51.634-13.854 0-2.6675 2.8112-5.1601 7.6812-7.2739 0.055 0.0326 0.1075 0.0615 0.1625 0.0937-4.7725 2.0902-7.5238 4.5487-7.5238 7.1801 0 7.6035 22.974 13.768 51.314 13.768s51.312-6.1641 51.312-13.768c0-2.6314-2.7512-5.0899-7.5225-7.1801 0.055-0.0323 0.1075-0.0611 0.1625-0.0937 4.87 2.1151 7.6812 4.6064 7.6812 7.2739 0 7.6514-23.118 13.854-51.634 13.854" fill="#cccbc9"/>
   <path id="path5811" d="m319.89 913.85c-28.34 0-51.314-6.1641-51.314-13.768 0-2.6314 2.7512-5.0899 7.5238-7.1801 0.0537 0.0302 0.11 0.0625 0.16375 0.0927-4.675 2.0674-7.3662 4.4921-7.3662 7.0874 0 7.5561 22.83 13.681 50.992 13.681s50.992-6.125 50.992-13.681c0-2.5938-2.6925-5.02-7.3662-7.0864 0.0537-0.0312 0.11-0.0635 0.16375-0.0937 4.7712 2.0902 7.5225 4.5487 7.5225 7.1801 0 7.6035-22.972 13.768-51.312 13.768" fill="#cbc9c8"/>
   <path id="path5813" d="m319.89 913.76c-28.162 0-50.992-6.125-50.992-13.681 0-2.5952 2.6912-5.02 7.3662-7.0874 0.0562 0.0323 0.10875 0.0625 0.165 0.0937-4.5775 2.0434-7.21 4.436-7.21 6.9936 0 7.5088 22.686 13.595 50.671 13.595s50.671-6.0865 50.671-13.595c0-2.5576-2.6325-4.9502-7.21-6.9936 0.0563-0.0312 0.11-0.0615 0.165-0.0927 4.6738 2.0664 7.3662 4.4926 7.3662 7.0864 0 7.5561-22.83 13.681-50.992 13.681" fill="#cac8c7"/>
   <path id="path5815" d="m319.89 913.68c-27.985 0-50.671-6.0865-50.671-13.595 0-2.5576 2.6325-4.9502 7.21-6.9936 0.055 0.0312 0.10875 0.0625 0.165 0.0937-4.4812 2.02-7.055 4.3784-7.055 6.8999 0 7.4614 22.542 13.509 50.351 13.509 27.808 0 50.351-6.0474 50.351-13.509 0-2.5215-2.5738-4.8799-7.055-6.8999 0.0563-0.0312 0.11-0.0615 0.165-0.0937 4.5775 2.0434 7.21 4.436 7.21 6.9936 0 7.5088-22.686 13.595-50.671 13.595" fill="#c9c7c6"/>
   <path id="path5817" d="m319.89 913.59c-27.809 0-50.351-6.0474-50.351-13.509 0-2.5215 2.5738-4.8799 7.055-6.8999 0.0562 0.0312 0.11 0.0625 0.16625 0.0937-4.385 1.9946-6.9 4.3222-6.9 6.8061 0 7.4136 22.399 13.422 50.03 13.422s50.03-6.0087 50.03-13.422c0-2.4839-2.515-4.8115-6.9-6.8061 0.0563-0.0312 0.11-0.0625 0.16625-0.0937 4.4812 2.02 7.055 4.3784 7.055 6.8999 0 7.4614-22.544 13.509-50.351 13.509" fill="#c8c6c5"/>
   <path id="path5819" d="m319.89 913.5c-27.631 0-50.03-6.0087-50.03-13.422 0-2.4839 2.515-4.8115 6.9-6.8061 0.0538 0.0297 0.11375 0.0635 0.1675 0.0937-4.29 1.9711-6.7475 4.2646-6.7475 6.7124 0 7.3662 22.256 13.337 49.71 13.337s49.709-5.9712 49.709-13.337c0-2.4478-2.4575-4.7412-6.7462-6.7124 0.0562-0.0312 0.11125-0.0625 0.1675-0.0937 4.385 1.9946 6.9 4.3222 6.9 6.8061 0 7.4136-22.399 13.422-50.03 13.422" fill="#c7c5c3"/>
   <path id="path5821" d="m319.89 913.42c-27.454 0-49.71-5.9712-49.71-13.337 0-2.4478 2.4575-4.7412 6.7475-6.7124 0.0587 0.0323 0.11 0.06 0.16875 0.0922-4.195 1.9488-6.595 4.209-6.595 6.6201 0 7.3189 22.112 13.251 49.389 13.251 27.276 0 49.389-5.9326 49.389-13.251 0-2.4111-2.4-4.6714-6.595-6.6186 0.0563-0.0312 0.1125-0.0625 0.16875-0.0937 4.2888 1.9711 6.7462 4.2646 6.7462 6.7124 0 7.3662-22.255 13.337-49.709 13.337" fill="#c6c4c2"/>
   <path id="path5823" d="m319.89 913.33c-27.276 0-49.389-5.9326-49.389-13.251 0-2.4111 2.4-4.6714 6.595-6.6201 0.0562 0.0312 0.1125 0.064 0.16875 0.0937-4.1 1.9239-6.4425 4.1514-6.4425 6.5264 0 7.271 21.968 13.165 49.068 13.165s49.068-5.894 49.068-13.165c0-2.375-2.3425-4.6025-6.4425-6.5264 0.0563-0.0297 0.1125-0.0625 0.16875-0.0922 4.195 1.9472 6.595 4.2075 6.595 6.6186 0 7.3189-22.112 13.251-49.389 13.251" fill="#c4c3c1"/>
   <path id="path5825" d="m319.89 913.25c-27.1 0-49.068-5.894-49.068-13.165 0-2.375 2.3425-4.6025 6.4425-6.5264 0.0563 0.0312 0.115 0.064 0.17125 0.0937-4.0062 1.8999-6.2938 4.0953-6.2938 6.4326 0 7.2236 21.825 13.079 48.748 13.079 26.922 0 48.748-5.855 48.748-13.079 0-2.3374-2.2875-4.5328-6.2938-6.4326 0.0563-0.0297 0.115-0.0625 0.17125-0.0937 4.1 1.9239 6.4425 4.1514 6.4425 6.5264 0 7.271-21.968 13.165-49.068 13.165" fill="#c3c2c0"/>
   <path id="path5827" d="m319.89 913.16c-26.922 0-48.748-5.855-48.748-13.079 0-2.3374 2.2875-4.5328 6.2938-6.4326 0.0563 0.0312 0.115 0.064 0.17125 0.0937-3.9125 1.875-6.1438 4.0376-6.1438 6.3389 0 7.1762 21.681 12.993 48.426 12.993s48.426-5.8164 48.426-12.993c0-2.3012-2.2312-4.4639-6.1438-6.3389 0.0563-0.0297 0.115-0.0625 0.17125-0.0937 4.0062 1.8999 6.2938 4.0953 6.2938 6.4326 0 7.2236-21.825 13.079-48.748 13.079" fill="#c2c1bf"/>
   <path id="path5829" d="m319.89 913.07c-26.745 0-48.426-5.8164-48.426-12.993 0-2.3012 2.2312-4.4639 6.1438-6.3389 0.0587 0.0328 0.11375 0.0625 0.1725 0.0937-3.8212 1.8516-5.9962 3.98-5.9962 6.2451 0 7.1289 21.539 12.906 48.106 12.906 26.568 0 48.105-5.7774 48.105-12.906 0-2.2651-2.175-4.3935-5.995-6.2436 0.0588-0.0328 0.11375-0.0625 0.1725-0.0953 3.9125 1.875 6.1438 4.0376 6.1438 6.3389 0 7.1762-21.681 12.993-48.426 12.993" fill="#c1c0be"/>
   <path id="path5831" d="m319.89 912.99c-26.568 0-48.106-5.7774-48.106-12.906 0-2.2651 2.175-4.3935 5.9962-6.2451 0.0563 0.0312 0.11625 0.064 0.1725 0.0953-3.7275 1.8246-5.8475 3.9214-5.8475 6.1499 0 7.081 21.394 12.82 47.785 12.82s47.785-5.7388 47.785-12.82c0-2.2285-2.12-4.3252-5.8475-6.1499 0.0563-0.0312 0.11625-0.064 0.1725-0.0937 3.82 1.8501 5.995 3.9785 5.995 6.2436 0 7.1289-21.538 12.906-48.105 12.906" fill="#c0bfbd"/>
   <path id="path5833" d="m319.89 912.9c-26.391 0-47.785-5.7388-47.785-12.82 0-2.2285 2.12-4.3252 5.8475-6.1499 0.0588 0.0312 0.11625 0.061 0.175 0.0937-3.6362 1.8012-5.7012 3.8638-5.7012 6.0561 0 7.0328 21.25 12.735 47.464 12.735s47.464-5.7021 47.464-12.735c0-2.1924-2.065-4.2549-5.7012-6.0561 0.0588-0.0312 0.11625-0.0625 0.175-0.0937 3.7275 1.8246 5.8475 3.9214 5.8475 6.1499 0 7.081-21.394 12.82-47.785 12.82" fill="#bfbebc"/>
   <path id="path5835" d="m319.89 912.81c-26.214 0-47.464-5.7021-47.464-12.735 0-2.1924 2.065-4.2549 5.7012-6.0561 0.0587 0.0312 0.11625 0.0625 0.175 0.0937-3.545 1.7759-5.5562 3.8061-5.5562 5.9624 0 6.9849 21.108 12.649 47.144 12.649s47.142-5.664 47.142-12.649c0-2.1562-2.01-4.1865-5.555-5.9624 0.0587-0.0312 0.11625-0.0625 0.175-0.0937 3.6362 1.8012 5.7012 3.8638 5.7012 6.0561 0 7.0328-21.25 12.735-47.464 12.735" fill="#bebdbb"/>
   <path id="path5837" d="m319.89 912.73c-26.036 0-47.144-5.664-47.144-12.649 0-2.1562 2.0112-4.1865 5.5562-5.9624 0.06 0.0312 0.1175 0.0625 0.1775 0.0937-3.4562 1.7524-5.4125 3.7485-5.4125 5.8686 0 6.9375 20.962 12.562 46.822 12.562 25.859 0 46.822-5.625 46.822-12.562 0-2.1201-1.9562-4.1162-5.4125-5.8676 0.06-0.0323 0.1175-0.0635 0.1775-0.0948 3.545 1.7759 5.555 3.8061 5.555 5.9624 0 6.9849-21.106 12.649-47.142 12.649" fill="#bdbcba"/>
   <path id="path5839" d="m319.89 912.64c-25.86 0-46.822-5.625-46.822-12.562 0-2.1201 1.9562-4.1162 5.4125-5.8686 0.0587 0.0323 0.11875 0.0635 0.1775 0.0948-3.3662 1.7265-5.27 3.6899-5.27 5.7739 0 6.8901 20.82 12.476 46.502 12.476s46.501-5.586 46.501-12.476c0-2.084-1.9025-4.0474-5.2688-5.7739 0.0588-0.0312 0.11875-0.0625 0.1775-0.0937 3.4562 1.7514 5.4125 3.7475 5.4125 5.8676 0 6.9375-20.964 12.562-46.822 12.562" fill="#bcbbb9"/>
   <path id="path5841" d="m319.89 912.56c-25.682 0-46.502-5.586-46.502-12.476 0-2.084 1.9038-4.0474 5.27-5.7739 0.0587 0.0312 0.12 0.0625 0.17875 0.0937-3.2775 1.7011-5.1275 3.6328-5.1275 5.6801 0 6.8422 20.676 12.39 46.181 12.39s46.181-5.5479 46.181-12.39c0-2.0464-1.8512-3.979-5.1275-5.6801 0.0588-0.0312 0.12-0.0625 0.17875-0.0937 3.3662 1.7265 5.2688 3.6899 5.2688 5.7739 0 6.8901-20.819 12.476-46.501 12.476" fill="#bbbab8"/>
   <path id="path5843" d="m319.89 912.47c-25.505 0-46.181-5.5479-46.181-12.39 0-2.0474 1.85-3.979 5.1275-5.6801 0.0587 0.0312 0.12 0.0639 0.18 0.0951-3.1888 1.6762-4.9862 3.5738-4.9862 5.585 0 6.7949 20.532 12.304 45.86 12.304s45.86-5.5088 45.86-12.304c0-2.0098-1.7988-3.9088-4.9862-5.585 0.06-0.0312 0.12125-0.0639 0.18-0.0951 3.2762 1.7011 5.1275 3.6337 5.1275 5.6801 0 6.8422-20.676 12.39-46.181 12.39" fill="#bab9b7"/>
   <path id="path5845" d="m319.89 912.38c-25.328 0-45.86-5.5088-45.86-12.304 0-2.0112 1.7975-3.9088 4.9862-5.585 0.0612 0.0327 0.11875 0.0625 0.18125 0.0937-3.1012 1.6514-4.8475 3.5161-4.8475 5.4912 0 6.7475 20.389 12.219 45.54 12.219 25.15 0 45.539-5.4712 45.539-12.219 0-1.9751-1.745-3.8399-4.8462-5.4912 0.0625-0.0312 0.12-0.061 0.18125-0.0937 3.1875 1.6762 4.9862 3.5752 4.9862 5.585 0 6.7949-20.532 12.304-45.86 12.304" fill="#b9b8b6"/>
   <path id="path5847" d="m319.89 912.3c-25.151 0-45.54-5.4712-45.54-12.219 0-1.9751 1.7462-3.8399 4.8475-5.4912 0.0588 0.0312 0.1225 0.0635 0.1825 0.0952-3.0138 1.6245-4.7088 3.457-4.7088 5.396 0 6.7002 20.245 12.132 45.219 12.132s45.219-5.4321 45.219-12.132c0-1.939-1.695-3.7715-4.7088-5.396 0.06-0.0317 0.12375-0.064 0.1825-0.0952 3.1012 1.6514 4.8462 3.5161 4.8462 5.4912 0 6.7475-20.389 12.219-45.539 12.219" fill="#b7b7b5"/>
   <path id="path5849" d="m319.89 912.21c-24.974 0-45.219-5.4321-45.219-12.132 0-1.939 1.695-3.7715 4.7088-5.396 0.0613 0.0323 0.12125 0.062 0.18375 0.0948-2.9275 1.5986-4.5725 3.3989-4.5725 5.3012 0 6.6524 20.102 12.046 44.899 12.046 24.796 0 44.898-5.394 44.898-12.046 0-1.9024-1.6438-3.7026-4.5712-5.3012 0.0625-0.0328 0.1225-0.0625 0.18375-0.0948 3.0138 1.6245 4.7088 3.457 4.7088 5.396 0 6.7002-20.245 12.132-45.219 12.132" fill="#b6b6b4"/>
   <path id="path5851" d="m319.89 912.13c-24.796 0-44.899-5.394-44.899-12.046 0-1.9024 1.645-3.7026 4.5725-5.3012 0.0612 0.0312 0.1225 0.0625 0.185 0.0937-2.8425 1.5751-4.4362 3.3412-4.4362 5.2075 0 6.605 19.958 11.96 44.578 11.96 24.619 0 44.578-5.355 44.578-11.96 0-1.8662-1.595-3.6324-4.4362-5.2075 0.0625-0.0312 0.12375-0.0625 0.185-0.0937 2.9275 1.5986 4.5712 3.3989 4.5712 5.3012 0 6.6524-20.101 12.046-44.898 12.046" fill="#b5b4b3"/>
   <path id="path5853" d="m319.89 912.04c-24.62 0-44.578-5.355-44.578-11.96 0-1.8662 1.5938-3.6324 4.4362-5.2075 0.0588 0.0312 0.12625 0.0649 0.185 0.0952-2.7562 1.5482-4.3 3.2821-4.3 5.1122 0 6.5576 19.814 11.874 44.256 11.874s44.256-5.3159 44.256-11.874c0-1.8301-1.5438-3.564-4.3-5.1122 0.0613-0.0312 0.12375-0.0625 0.185-0.0952 2.8412 1.5751 4.4362 3.3412 4.4362 5.2075 0 6.605-19.959 11.96-44.578 11.96" fill="#b4b3b2"/>
   <path id="path5855" d="m319.89 911.95c-24.442 0-44.256-5.3159-44.256-11.874 0-1.8301 1.5438-3.564 4.3-5.1122 0.065 0.0336 0.1225 0.0625 0.1875 0.0946-2.6725 1.5225-4.1675 3.2236-4.1675 5.0176 0 6.5098 19.671 11.788 43.936 11.788s43.935-5.2778 43.935-11.788c0-1.794-1.4938-3.4951-4.1662-5.0176 0.0625-0.0312 0.125-0.0625 0.1875-0.0946 2.7562 1.5482 4.3 3.2821 4.3 5.1122 0 6.5576-19.814 11.874-44.256 11.874" fill="#b3b2b1"/>
   <path id="path5857" d="m319.89 911.87c-24.265 0-43.936-5.2778-43.936-11.788 0-1.794 1.495-3.4951 4.1675-5.0176 0.0625 0.0312 0.12625 0.064 0.18875 0.0953-2.59 1.4961-4.035 3.1636-4.035 4.9224 0 6.4624 19.528 11.701 43.615 11.701 24.088 0 43.615-5.2388 43.615-11.701 0-1.7588-1.445-3.4262-4.035-4.9224 0.0625-0.0312 0.12625-0.064 0.18875-0.0953 2.6725 1.5225 4.1662 3.2236 4.1662 5.0176 0 6.5098-19.67 11.788-43.935 11.788" fill="#b1b1b0"/>
   <path id="path5859" d="m319.89 911.78c-24.088 0-43.615-5.2388-43.615-11.701 0-1.7588 1.445-3.4262 4.035-4.9224 0.0625 0.0312 0.1275 0.0635 0.19 0.0947-2.5075 1.4702-3.9038 3.105-3.9038 4.8276 0 6.415 19.382 11.616 43.294 11.616 23.91 0 43.294-5.2012 43.294-11.616 0-1.7226-1.3962-3.3574-3.9038-4.8276 0.0625-0.0312 0.1275-0.0635 0.19-0.0947 2.59 1.4961 4.035 3.1636 4.035 4.9224 0 6.4624-19.528 11.701-43.615 11.701" fill="#b0b0af"/>
   <path id="path5861" d="m319.89 911.7c-23.911 0-43.294-5.2012-43.294-11.616 0-1.7226 1.3962-3.3574 3.9038-4.8276 0.065 0.0327 0.12625 0.0625 0.19125 0.0952-2.425 1.4438-3.775 3.0459-3.775 4.7324 0 6.3676 19.24 11.53 42.974 11.53s42.974-5.1622 42.974-11.53c0-1.6865-1.35-3.2886-3.775-4.7324 0.065-0.0312 0.12625-0.0625 0.19125-0.0952 2.5075 1.4702 3.9038 3.105 3.9038 4.8276 0 6.415-19.384 11.616-43.294 11.616" fill="#afafad"/>
   <path id="path5863" d="m319.89 911.61c-23.734 0-42.974-5.1622-42.974-11.53 0-1.6865 1.35-3.2886 3.775-4.7324 0.0625 0.0312 0.13 0.0649 0.1925 0.0961-2.3438 1.416-3.6462 2.9864-3.6462 4.6362 0 6.3199 19.096 11.444 42.652 11.444s42.652-5.124 42.652-11.444c0-1.6499-1.3025-3.2188-3.6462-4.6362 0.0625-0.0312 0.13-0.0649 0.1925-0.0961 2.425 1.4438 3.775 3.0459 3.775 4.7324 0 6.3676-19.24 11.53-42.974 11.53" fill="#aeaeac"/>
   <path id="path5865" d="m319.89 911.52c-23.556 0-42.652-5.124-42.652-11.444 0-1.6499 1.3025-3.2202 3.6462-4.6362 0.0662 0.0312 0.12875 0.0625 0.195 0.0947-2.265 1.3916-3.5212 2.9262-3.5212 4.5415 0 6.2725 18.952 11.357 42.332 11.357 23.379 0 42.331-5.0849 42.331-11.357 0-1.6152-1.255-3.1499-3.52-4.5415 0.0663-0.0322 0.12875-0.0635 0.195-0.0947 2.3438 1.4175 3.6462 2.9864 3.6462 4.6362 0 6.3199-19.096 11.444-42.652 11.444" fill="#adacab"/>
   <path id="path5867" d="m319.89 911.44c-23.38 0-42.332-5.0849-42.332-11.357 0-1.6152 1.2562-3.1499 3.5212-4.5415 0.065 0.0317 0.13 0.064 0.195 0.0952-2.185 1.3652-3.395 2.8676-3.395 4.4462 0 6.2251 18.809 11.271 42.011 11.271 23.201 0 42.011-5.0464 42.011-11.271 0-1.5786-1.21-3.081-3.395-4.4462 0.065-0.0312 0.13-0.0635 0.195-0.0952 2.265 1.3916 3.52 2.9262 3.52 4.5415 0 6.2725-18.952 11.357-42.331 11.357" fill="#acabaa"/>
   <path id="path5869" d="m319.89 911.35c-23.202 0-42.011-5.0464-42.011-11.271 0-1.5786 1.21-3.081 3.395-4.4462 0.065 0.0326 0.13125 0.0639 0.1975 0.0961-2.1075 1.3374-3.2712 2.8076-3.2712 4.3501 0 6.1772 18.665 11.185 41.69 11.185s41.69-5.0078 41.69-11.185c0-1.5425-1.1638-3.0128-3.2712-4.3501 0.0662-0.0322 0.1325-0.0635 0.1975-0.0961 2.185 1.3652 3.395 2.8676 3.395 4.4462 0 6.2251-18.81 11.271-42.011 11.271" fill="#aaaaa9"/>
   <path id="path5871" d="m319.89 911.27c-23.025 0-41.69-5.0078-41.69-11.185 0-1.5425 1.1638-3.0128 3.2712-4.3501 0.065 0.0312 0.1325 0.064 0.1975 0.0953-2.0288 1.311-3.1488 2.7475-3.1488 4.2549 0 6.1299 18.522 11.099 41.37 11.099s41.37-4.9688 41.37-11.099c0-1.5074-1.12-2.9439-3.1488-4.2549 0.065-0.0312 0.1325-0.064 0.1975-0.0953 2.1075 1.3374 3.2712 2.8076 3.2712 4.3501 0 6.1772-18.665 11.185-41.69 11.185" fill="#a9a9a8"/>
   <path id="path5873" d="m319.89 911.18c-22.848 0-41.37-4.9688-41.37-11.099 0-1.5074 1.12-2.9439 3.1488-4.2549 0.0688 0.0322 0.1325 0.0635 0.2 0.0961-1.9512 1.2822-3.0275 2.6875-3.0275 4.1588 0 6.0825 18.378 11.014 41.049 11.014 22.67 0 41.049-4.9311 41.049-11.014 0-1.4712-1.0762-2.875-3.0275-4.1588 0.0675-0.0326 0.13125-0.0639 0.2-0.0961 2.0288 1.311 3.1488 2.7475 3.1488 4.2549 0 6.1299-18.522 11.099-41.37 11.099" fill="#a8a8a7"/>
   <path id="path5875" d="m319.89 911.09c-22.671 0-41.049-4.9311-41.049-11.014 0-1.4712 1.0762-2.8765 3.0275-4.1588 0.0663 0.0312 0.1375 0.065 0.2025 0.0963-1.875 1.2549-2.9062 2.625-2.9062 4.0586 0 6.0415 18.236 10.935 40.725 10.935s40.725-4.8935 40.725-10.935c0-1.4336-1.0312-2.8038-2.9062-4.0586 0.0662-0.0312 0.13625-0.065 0.2025-0.0963 1.9512 1.2838 3.0275 2.6875 3.0275 4.1588 0 6.0825-18.379 11.014-41.049 11.014" fill="#a7a6a5"/>
   <path id="path5877" d="m326.62 900.08c0 0.9975-3.0125 1.8051-6.7275 1.8051s-6.7275-0.80762-6.7275-1.8051c0-0.99612 3.0125-1.8051 6.7275-1.8051s6.7275 0.809 6.7275 1.8051" fill="#100f0d"/>
  </g>
  <g id="g5961" transform="matrix(.125 0 0 -.125 -497.7 923.83)">
   <g id="g5963" clip-path="url(#clipPath5965)">
    <path id="path5977" d="m6768.9 1326.8c0-105.26-86.13-191.39-191.39-191.39h-73.44c-105.26 0-191.39 86.13-191.39 191.39v4335.2c0 105.26 86.13 191.38 191.39 191.38h73.44c105.26 0 191.39-86.12 191.39-191.38v-4335.2" fill="url(#linearGradient5969)"/>
   </g>
  </g>
  <g id="g5979" transform="matrix(.125 0 0 -.125 -497.7 923.83)">
   <g id="g5981" clip-path="url(#clipPath5983)">
    <path id="path5993" d="m6312.6 1400.7v4261.2c0 105.26 86.13 191.38 191.39 191.38h73.44c105.26 0 191.39-86.12 191.39-191.38v-4261.2c-70.08 29.76-147.18 46.22-228.11 46.22s-158.03-16.46-228.11-46.22m105.23 4344c-30.47 0-55.16-24.7-55.16-55.16v-4102.7c0-30.47 24.69-55.16 55.16-55.16 30.46 0 55.16 24.69 55.16 55.16v4102.7c0 30.46-24.7 55.16-55.16 55.16" fill="url(#linearGradient5987)"/>
   </g>
  </g>
  <g id="g5995" transform="matrix(.125 0 0 -.125 -497.7 923.83)">
   <g id="g5997" clip-path="url(#clipPath5999)">
    <path id="path6009" d="m7124.9 862.75c0-322.64-261.55-584.18-584.18-584.18s-584.18 261.54-584.18 584.18c0 322.63 261.55 584.18 584.18 584.18s584.18-261.55 584.18-584.18" fill="url(#radialGradient6035)"/>
   </g>
  </g>
  <g id="g6011" transform="matrix(.125 0 0 -.125 -497.7 923.83)">
   <g id="g6013" clip-path="url(#clipPath6015)">
    <path id="path6025" d="m6883.2 1171.8v2.47c0.01-0.41 0.01-0.82 0.01-1.23s0-0.83-0.01-1.24" fill="url(#radialGradient6035)"/>
   </g>
  </g>
  <g id="g6027" transform="matrix(.125 0 0 -.125 -497.7 923.83)">
   <g id="g6029" clip-path="url(#clipPath6031)">
    <path id="path6041" d="m6766.8 1009.9c71.38 39.79 116.42 98.12 116.42 163.12v-1.24c-0.56-64.5-45.49-122.34-116.42-161.88m116.42 163.12c0 38.88-16.12 75.38-44.35 106.94 27.94-31.23 44.02-67.29 44.35-105.71v-1.23" fill="url(#radialGradient6035)"/>
   </g>
  </g>
  <g id="g6043" transform="matrix(.125 0 0 -.125 -497.7 923.83)">
   <g id="g6045" clip-path="url(#clipPath6047)">
    <g id="g6051" transform="matrix(701.2,0,0,453.2,6191.9,945.9)">
     <image id="image6053" xlink:href="data:image/png;base64,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" transform="matrix(1,0,0,-1,0,1)" height="1" width="1" preserveAspectRatio="none"/>
    </g>
   </g>
  </g>
  <path id="path6055" d="m324.48 176.67h-9.18c-21.738 0-39.422 17.685-39.422 39.422v523.07c-27.341 15.644-44.509 44.775-44.509 76.826 0 48.811 39.71 88.522 88.521 88.522s88.522-39.712 88.522-88.522c0-32.052-17.169-61.182-44.509-76.826v-523.07c0-21.738-17.686-39.422-39.424-39.422m0 15.5c13.158 0 23.924 10.765 23.924 23.922v532.65c26.16 11.106 44.509 37.031 44.509 67.242 0 40.33-32.694 73.022-73.022 73.022-40.329 0-73.022-32.692-73.022-73.022 0-30.211 18.349-56.136 44.509-67.242v-532.65c0-13.158 10.766-23.922 23.924-23.922h9.18" fill="#100f0d"/>
  <g id="g6057" transform="matrix(.125 0 0 -.125 -497.7 923.83)">
   <g id="g6059" clip-path="url(#clipPath6061)">
    <path id="path6075" d="m6577.5 5941.9h-73.44c-154.37 0-279.96-125.59-279.96-279.96v-4205.5c-218.1-116.2-356.1-343.2-356.1-593.65 0-370.96 301.8-672.75 672.8-672.75 370.96 0 672.75 301.79 672.75 672.75 0 250.48-137.96 477.48-356.07 593.7v4205.5c0 154.37-125.59 279.96-279.96 279.96m0-88.58c105.26 0 191.39-86.12 191.39-191.38v-4261.2c209.28-88.85 356.07-296.25 356.07-537.94 0-322.63-261.55-584.18-584.18-584.18s-584.18 261.55-584.18 584.18c0 241.69 146.79 449.09 356.07 537.94v4261.2c0 105.26 86.13 191.38 191.39 191.38h73.44" fill="url(#linearGradient6065)"/>
   </g>
  </g>
  <g id="g6077" transform="matrix(.125 0 0 -.125 -497.7 923.83)">
   <g id="g6079" clip-path="url(#clipPath6081)">
    <path id="path6091" d="m6417.9 1531.7c-30.47 0-55.16 24.69-55.16 55.16v4102.7c0 30.46 24.69 55.16 55.16 55.16 30.46 0 55.16-24.7 55.16-55.16v-4102.7c0-30.47-24.7-55.16-55.16-55.16" fill="url(#linearGradient6085)"/>
   </g>
  </g>
  <g id="g6129" transform="matrix(.125 0 0 -.125 -497.7 923.83)">
   <g id="g6131" clip-path="url(#clipPath6133)">
    <g id="g6137" transform="matrix(661.2,0,0,184.2,6210.9,98.9)">
     <image id="image6139" xlink:href="data:image/png;base64,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" transform="matrix(1,0,0,-1,0,1)" height="1" width="1" preserveAspectRatio="none"/>
    </g>
   </g>
  </g>
 </g>
</svg>
\"],\"markerImageFunction\":\"var res = {\\n url: images[0],\\n size: 40\\n}\\nvar temperature = data[''temperature''];\\nif (typeof temperature !== undefined) {\\n var percent = (temperature + 60)/120;\\n var index = Math.floor(4 * percent);\\n res.url = images[index];\\n}\\nreturn res;\"}],\"fitMapBounds\":true},\"title\":\"OpenStreetMap\"}"}', + 'OpenStreetMap' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( '191d156a-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'analogue_gauges', + 'speed_gauge_canvas_gauges', + '{"type":"latest","sizeX":7,"sizeY":5,"resources":[],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbAnalogueRadialGauge(self.ctx, ''radialGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.getSettingsSchema = function() {\n return TbAnalogueRadialGauge.settingsSchema;\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Speed\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 50 - 25;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 220) {\\n\\tvalue = 220;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"maxValue\":180,\"startAngle\":45,\"ticksAngle\":270,\"showBorder\":false,\"defaultColor\":\"#e65100\",\"needleCircleSize\":7,\"highlights\":[{\"from\":80,\"to\":120,\"color\":\"#fdd835\"},{\"color\":\"#e57373\",\"from\":120,\"to\":180}],\"showUnitTitle\":false,\"colorPlate\":\"#fff\",\"colorMajorTicks\":\"#444\",\"colorMinorTicks\":\"#666\",\"minorTicks\":2,\"valueInt\":3,\"minValue\":0,\"valueDec\":0,\"highlightsWidth\":15,\"valueBox\":true,\"animation\":true,\"animationDuration\":1500,\"animationRule\":\"linear\",\"colorNeedleShadowUp\":\"rgba(2, 255, 255, 0)\",\"colorNeedleShadowDown\":\"rgba(188, 143, 143, 0.78)\",\"units\":\"MPH\",\"majorTicksCount\":9,\"numbersFont\":{\"family\":\"Roboto\",\"size\":22,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#616161\"},\"titleFont\":{\"family\":\"Roboto\",\"size\":24,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#888\"},\"unitsFont\":{\"family\":\"Roboto\",\"size\":28,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#616161\"},\"valueFont\":{\"size\":32,\"style\":\"normal\",\"weight\":\"normal\",\"shadowColor\":\"rgba(0, 0, 0, 0.49)\",\"color\":\"#444\",\"family\":\"Segment7Standard\"},\"colorValueBoxRect\":\"#888\",\"colorValueBoxRectEnd\":\"#666\",\"colorValueBoxBackground\":\"#babab2\",\"colorValueBoxShadow\":\"rgba(0,0,0,1)\"},\"title\":\"Speed gauge - Canvas Gauges\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'Speed gauge - Canvas Gauges' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( '1c58d1ec-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'pie', + '{"type":"latest","sizeX":8,"sizeY":5,"resources":[],"templateHtml":"","templateCss":".legend {\n font-size: 13px;\n line-height: 10px;\n}\n\n.legend table { \n border-spacing: 0px;\n border-collapse: separate;\n}\n\n.pie-label {\n font-size: 12px;\n font-family: ''Roboto'';\n font-weight: bold;\n text-align: center;\n padding: 2px;\n color: white;\n}\n","controllerScript":"self.onInit = function() {\n self.ctx.flot = new TbFlot(self.ctx, ''pie''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.flot.update();\n}\n\nself.onResize = function() {\n self.ctx.flot.resize();\n}\n\nself.onEditModeChanged = function() {\n self.ctx.flot.checkMouseEvents();\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.flot.checkMouseEvents();\n}\n\nself.getSettingsSchema = function() {\n return TbFlot.pieSettingsSchema;\n}\n\nself.getDataKeySettingsSchema = function() {\n return TbFlot.pieDatakeySettingsSchema;\n}\n\nself.onDestroy = function() {\n self.ctx.flot.destroy();\n}\n","settingsSchema":"{}\n","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.6114638304362894,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.9955906536344441,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.9430835931647599,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"radius\":1,\"fontColor\":\"#545454\",\"fontSize\":10,\"decimals\":1,\"legend\":{\"show\":true,\"position\":\"nw\",\"labelBoxBorderColor\":\"#CCCCCC\",\"backgroundColor\":\"#F0F0F0\",\"backgroundOpacity\":0.85},\"innerRadius\":0,\"showLabels\":true,\"stroke\":{\"width\":5},\"tilt\":1,\"animatedPie\":false},\"title\":\"Pie - Flot\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', + 'Pie - Flot' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( '1f712b86-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'timeseries_bars_flot', + '{"type":"timeseries","sizeX":8,"sizeY":5,"resources":[],"templateHtml":"","templateCss":".legend {\n font-size: 13px;\n line-height: 10px;\n}\n\n.legend table { \n border-spacing: 0px;\n border-collapse: separate;\n}\n\n.mouse-events .flot-overlay {\n cursor: crosshair; \n}\n\n","controllerScript":"self.onInit = function() {\n self.ctx.flot = new TbFlot(self.ctx, ''bar''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.flot.update();\n}\n\nself.onResize = function() {\n self.ctx.flot.resize();\n}\n\nself.onEditModeChanged = function() {\n self.ctx.flot.checkMouseEvents();\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.flot.checkMouseEvents();\n}\n\nself.getSettingsSchema = function() {\n return TbFlot.settingsSchema;\n}\n\nself.getDataKeySettingsSchema = function() {\n return TbFlot.datakeySettingsSchema(false);\n}\n\nself.onDestroy = function() {\n self.ctx.flot.destroy();\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{\"showLines\":false,\"fillLines\":false,\"showPoints\":false},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#ffc107\",\"settings\":{\"showLines\":false,\"fillLines\":false,\"showPoints\":false},\"_hash\":0.12775350966079668,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000},\"aggregation\":{\"limit\":200,\"type\":\"AVG\"}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"shadowSize\":4,\"fontColor\":\"#545454\",\"fontSize\":10,\"xaxis\":{\"showLabels\":true,\"color\":\"#545454\"},\"yaxis\":{\"showLabels\":true,\"color\":\"#545454\"},\"grid\":{\"color\":\"#545454\",\"tickColor\":\"#DDDDDD\",\"verticalLines\":true,\"horizontalLines\":true,\"outlineWidth\":1},\"legend\":{\"show\":true,\"position\":\"nw\",\"backgroundColor\":\"#f0f0f0\",\"backgroundOpacity\":0.85,\"labelBoxBorderColor\":\"rgba(1, 1, 1, 0.45)\"},\"decimals\":1,\"stack\":true,\"tooltipIndividual\":false},\"title\":\"Timeseries Bars - Flot\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"mobileHeight\":null}"}', + 'Timeseries Bars - Flot' ); + +INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +VALUES ( '229fb296-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'basic_timeseries', + '{"type":"timeseries","sizeX":8,"sizeY":5,"resources":[],"templateHtml":"","templateCss":".legend {\n font-size: 13px;\n line-height: 10px;\n}\n\n.legend table { \n border-spacing: 0px;\n border-collapse: separate;\n}\n\n.mouse-events .flot-overlay {\n cursor: crosshair; \n}\n\n","controllerScript":"self.onInit = function() {\n self.ctx.flot = new TbFlot(self.ctx); \n}\n\nself.onDataUpdated = function() {\n self.ctx.flot.update();\n}\n\nself.onResize = function() {\n self.ctx.flot.resize();\n}\n\nself.onEditModeChanged = function() {\n self.ctx.flot.checkMouseEvents();\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.flot.checkMouseEvents();\n}\n\nself.getSettingsSchema = function() {\n return TbFlot.settingsSchema;\n}\n\nself.getDataKeySettingsSchema = function() {\n return TbFlot.datakeySettingsSchema(true);\n}\n\nself.onDestroy = function() {\n self.ctx.flot.destroy();\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{\"showLines\":true,\"fillLines\":true,\"showPoints\":false},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#ffc107\",\"settings\":{\"showLines\":true,\"fillLines\":false,\"showPoints\":false},\"_hash\":0.12775350966079668,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"shadowSize\":4,\"fontColor\":\"#545454\",\"fontSize\":10,\"xaxis\":{\"showLabels\":true,\"color\":\"#545454\"},\"yaxis\":{\"showLabels\":true,\"color\":\"#545454\"},\"grid\":{\"color\":\"#545454\",\"tickColor\":\"#DDDDDD\",\"verticalLines\":true,\"horizontalLines\":true,\"outlineWidth\":1},\"legend\":{\"show\":true,\"position\":\"nw\",\"backgroundColor\":\"#f0f0f0\",\"backgroundOpacity\":0.85,\"labelBoxBorderColor\":\"rgba(1, 1, 1, 0.45)\"},\"decimals\":1,\"stack\":false,\"tooltipIndividual\":false},\"title\":\"Timeseries - Flot\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"mobileHeight\":null}"}', + 'Timeseries - Flot' ); + +/** System plugins and rules **/ +INSERT INTO public.plugin ( id, tenant_id, name, state, search_text, api_token, plugin_class, public_access, configuration ) +VALUES ( '60cb2da2-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'System Telemetry Plugin', 'ACTIVE', + 'system telemetry plugin', 'telemetry', + 'org.thingsboard.server.extensions.core.plugin.telemetry.TelemetryStoragePlugin', true, '{}' ); + +INSERT INTO public.rule ( id, tenant_id, name, plugin_token, state, search_text, weight, filters, processor, action ) +VALUES ( '65abad4c-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'System Telemetry Rule', 'telemetry', 'ACTIVE', + 'system telemetry rule', 0, + '[{"clazz":"org.thingsboard.server.extensions.core.filter.MsgTypeFilter", "name":"TelemetryFilter", "configuration": {"messageTypes":["POST_TELEMETRY","POST_ATTRIBUTES","GET_ATTRIBUTES"]}}]', + null, + '{"clazz":"org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction", "name":"TelemetryMsgConverterAction", "configuration":{}}' +); + +INSERT INTO public.plugin ( id, tenant_id, name, state, search_text, api_token, plugin_class, public_access, configuration ) +VALUES ( '6b3b8994-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'System RPC Plugin', 'ACTIVE', + 'system rpc plugin', 'rpc', 'org.thingsboard.server.extensions.core.plugin.rpc.RpcPlugin', true, '{ + "defaultTimeout": 20000 + }' ); + +/** SYSTEM **/ \ No newline at end of file diff --git a/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java b/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java index b1502595cb..26d92237c1 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java +++ b/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java @@ -37,8 +37,8 @@ public class DaoTestSuite { @ClassRule public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit( - Arrays.asList(new ClassPathCQLDataSet("schema.cql", false, false), - new ClassPathCQLDataSet("system-data.cql", false, false), + 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); diff --git a/docker/.env b/docker/.env index 7fa0ea81df..ce577a0d71 100644 --- a/docker/.env +++ b/docker/.env @@ -1,12 +1,15 @@ # cassandra environment variables CASSANDRA_DATA_DIR=/home/docker/cassandra_volume - -# cassandra schema environment variables -CREATE_SCHEMA=true -ADD_SYSTEM_DATA=false -ADD_DEMO_DATA=false CASSANDRA_URL=cassandra # postgres environment variables POSTGRES_DATA_DIR=/home/docker/postgres_volume -POSTGRES_PASSWORD=postgres \ No newline at end of file +POSTGRES_DB=thingsboard +POSTGRES_USER=postgres +POSTGRES_PASSWORD=postgres +POSTGRES_URL=postgres + +# environment variables for schema init and insert system and demo data +CREATE_SCHEMA=true +ADD_SYSTEM_DATA=true +ADD_DEMO_DATA=true \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 29f162928c..fa11fec6bf 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -47,10 +47,23 @@ services: - "2181" restart: always postgres: - image: "thingsboard/postgres:1.2.4" + image: "postgres:9.6" ports: - "5432" environment: + - POSTGRES_DB=${POSTGRES_DB} + - POSTGRES_USER=${POSTGRES_USER} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} volumes: - - "${POSTGRES_DATA_DIR}:/var/lib/postgresql/data" \ No newline at end of file + - "${POSTGRES_DATA_DIR}:/var/lib/postgresql/data" + tb-postgres-schema: + image: "thingsboard/tb-postgres-schema:1.2.4" + environment: + - POSTGRES_URL=${POSTGRES_URL} + - POSTGRES_DB=${POSTGRES_DB} + - POSTGRES_USER=${POSTGRES_USER} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + - CREATE_SCHEMA=${CREATE_SCHEMA} + - ADD_SYSTEM_DATA=${ADD_SYSTEM_DATA} + - ADD_DEMO_DATA=${ADD_DEMO_DATA} + entrypoint: /install-schema.sh \ No newline at end of file diff --git a/docker/postgres/Makefile b/docker/postgres/Makefile deleted file mode 100644 index 179eb6cfc5..0000000000 --- a/docker/postgres/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -VERSION=1.2.4 -PROJECT=thingsboard -APP=postgres - -build: - docker build --pull -t ${PROJECT}/${APP}:${VERSION} -t ${PROJECT}/${APP}:latest . - -push: build - docker push ${PROJECT}/${APP}:${VERSION} - docker push ${PROJECT}/${APP}:latest diff --git a/docker/postgres/init-user-db.sh b/docker/postgres/init-user-db.sh deleted file mode 100644 index 0efc89af45..0000000000 --- a/docker/postgres/init-user-db.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# -# 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. -# - -set -e - -psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL - CREATE DATABASE thingsboard; -EOSQL \ No newline at end of file diff --git a/docker/tb-cassandra-schema/Dockerfile b/docker/tb-cassandra-schema/Dockerfile index d8660d450a..d1675714c1 100644 --- a/docker/tb-cassandra-schema/Dockerfile +++ b/docker/tb-cassandra-schema/Dockerfile @@ -19,9 +19,8 @@ FROM cassandra:3.9 ADD install-schema.sh /root/install-schema.sh RUN apt-get update \ - && apt-get install -y nmap - -RUN chmod +x /root/install-schema.sh + && apt-get install -y nmap \ + && chmod +x /root/install-schema.sh ADD schema.cql /root/schema.cql ADD demo-data.cql /root/demo-data.cql diff --git a/docker/tb-cassandra-schema/Makefile b/docker/tb-cassandra-schema/Makefile index 2262c50611..23d460ad39 100644 --- a/docker/tb-cassandra-schema/Makefile +++ b/docker/tb-cassandra-schema/Makefile @@ -3,9 +3,9 @@ PROJECT=thingsboard APP=tb-cassandra-schema build: - cp ../../dao/src/main/resources/schema.cql . - cp ../../dao/src/main/resources/demo-data.cql . - cp ../../dao/src/main/resources/system-data.cql . + cp ../../dao/src/main/resources/cassandra/schema.cql . + cp ../../dao/src/main/resources/cassandra/demo-data.cql . + cp ../../dao/src/main/resources/cassandra/system-data.cql . docker build --pull -t ${PROJECT}/${APP}:${VERSION} -t ${PROJECT}/${APP}:latest . rm schema.cql demo-data.cql system-data.cql diff --git a/docker/postgres/Dockerfile b/docker/tb-postgres-schema/Dockerfile similarity index 72% rename from docker/postgres/Dockerfile rename to docker/tb-postgres-schema/Dockerfile index ab997750ff..b14356f0f8 100644 --- a/docker/postgres/Dockerfile +++ b/docker/tb-postgres-schema/Dockerfile @@ -16,6 +16,12 @@ FROM postgres:9.6 -ADD init-user-db.sh /docker-entrypoint-initdb.d/init-user-db.sh +ADD install-schema.sh /install-schema.sh -CMD ["postgres"] \ No newline at end of file +RUN apt-get update \ + && apt-get install -y nmap \ + && chmod +x /install-schema.sh + +ADD schema.sql /schema.sql +ADD system-data.sql /system-data.sql +ADD demo-data.sql /demo-data.sql \ No newline at end of file diff --git a/docker/tb-postgres-schema/Makefile b/docker/tb-postgres-schema/Makefile new file mode 100644 index 0000000000..dc7909b863 --- /dev/null +++ b/docker/tb-postgres-schema/Makefile @@ -0,0 +1,14 @@ +VERSION=1.2.4 +PROJECT=thingsboard +APP=tb-postgres-schema + +build: + cp ../../dao/src/main/resources/postgres/schema.sql . + cp ../../dao/src/main/resources/postgres/demo-data.sql . + cp ../../dao/src/main/resources/postgres/system-data.sql . + docker build --pull -t ${PROJECT}/${APP}:${VERSION} -t ${PROJECT}/${APP}:latest . + rm schema.sql demo-data.sql system-data.sql + +push: build + docker push ${PROJECT}/${APP}:${VERSION} + docker push ${PROJECT}/${APP}:latest diff --git a/docker/tb-postgres-schema/install-schema.sh b/docker/tb-postgres-schema/install-schema.sh new file mode 100644 index 0000000000..40af3700f3 --- /dev/null +++ b/docker/tb-postgres-schema/install-schema.sh @@ -0,0 +1,52 @@ +#!/bin/bash +# +# 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. +# + +until nmap $POSTGRES_URL -p 5432 | grep "5432/tcp open" +do + echo "Waiting for $POSTGRES_URL..." + sleep 10 +done + +if [ "$CREATE_SCHEMA" == "true" ]; then + echo "Creating 'Thingsboard' database schema..." + PGPASSWORD="$POSTGRES_PASSWORD" psql -h "$POSTGRES_URL" -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" -f /schema.sql + if [ "$?" -eq 0 ]; then + echo "'Thingsboard' database schema was successfully created!" + else + echo "There were issues while creating 'Thingsboard' database schema!" + fi +fi + +if [ "$ADD_SYSTEM_DATA" == "true" ]; then + echo "Adding system data..." + PGPASSWORD="$POSTGRES_PASSWORD" psql -h "$POSTGRES_URL" -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" -f /system-data.sql + if [ "$?" -eq 0 ]; then + echo "System data was successfully added!" + else + echo "There were issues while adding System data!" + fi +fi + +if [ "$ADD_DEMO_DATA" == "true" ]; then + echo "Adding demo data..." + PGPASSWORD="$POSTGRES_PASSWORD" psql -h "$POSTGRES_URL" -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" -f /demo-data.sql + if [ "$?" -eq 0 ]; then + echo "Demo data was successfully added!" + else + echo "There were issues while adding Demo data!" + fi +fi From 5f92fd29d299eff7bd01f125b98ef56dcfa3429e Mon Sep 17 00:00:00 2001 From: volodymyr-babak Date: Wed, 31 May 2017 18:57:54 +0300 Subject: [PATCH 37/69] Fixed default values for demo and system creation --- docker/.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/.env b/docker/.env index ce577a0d71..ff77f417be 100644 --- a/docker/.env +++ b/docker/.env @@ -11,5 +11,5 @@ POSTGRES_URL=postgres # environment variables for schema init and insert system and demo data CREATE_SCHEMA=true -ADD_SYSTEM_DATA=true -ADD_DEMO_DATA=true \ No newline at end of file +ADD_SYSTEM_DATA=false +ADD_DEMO_DATA=false \ No newline at end of file From 0ce99115cf32debba93d5445d23f63806413e590 Mon Sep 17 00:00:00 2001 From: volodymyr-babak Date: Thu, 1 Jun 2017 10:05:55 +0300 Subject: [PATCH 38/69] Fixed entity save and fixed system widgets retrieve --- .../org/thingsboard/server/dao/sql/JpaAbstractDao.java | 4 ++++ .../server/dao/sql/widget/JpaWidgetsBundleDao.java | 7 +++---- .../server/dao/sql/widget/WidgetsBundleRepository.java | 8 ++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java index a2b2bc9150..756e096e8c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.sql; +import com.datastax.driver.core.utils.UUIDs; import com.google.common.collect.Lists; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; @@ -61,6 +62,9 @@ public abstract class JpaAbstractDao, D> implements Dao< ((SearchTextEntity) entity).setSearchText(((SearchTextEntity) entity).getSearchTextSource().toLowerCase()); } log.debug("Saving entity {}", entity); + if (entity.getId() == null) { + entity.setId(UUIDs.timeBased()); + } entity = getCrudRepository().save(entity); return DaoUtil.getData(entity); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java index b2f0de6b1f..126fb86f99 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java @@ -23,14 +23,13 @@ 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.model.sql.WidgetsBundleEntity; -import org.thingsboard.server.dao.sql.JpaAbstractDao; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import org.thingsboard.server.dao.widget.WidgetsBundleDao; import java.util.List; import java.util.UUID; -import static org.thingsboard.server.dao.model.ModelConstants.WIDGETS_BUNDLE_COLUMN_FAMILY_NAME; +import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; /** * Created by Valerii Sosliuk on 4/23/2017. @@ -62,10 +61,10 @@ public class JpaWidgetsBundleDao extends JpaAbstractSearchTextDao findSystemWidgetsBundles(TextPageLink pageLink) { if (pageLink.getIdOffset() == null) { return DaoUtil.convertDataList(widgetsBundleRepository.findSystemWidgetsBundlesFirstPage(pageLink.getLimit(), - pageLink.getTextSearch())); + pageLink.getTextSearch(), NULL_UUID)); } else { return DaoUtil.convertDataList(widgetsBundleRepository.findSystemWidgetsBundlesNextPage(pageLink.getLimit(), - pageLink.getTextSearch(), pageLink.getIdOffset())); + pageLink.getTextSearch(), pageLink.getIdOffset(), NULL_UUID)); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java index d94dd1370d..9341a841ee 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java @@ -31,15 +31,15 @@ public interface WidgetsBundleRepository extends CrudRepository findSystemWidgetsBundlesFirstPage(Integer limit, String searchText); + List findSystemWidgetsBundlesFirstPage(Integer limit, String searchText, UUID tenantId); - @Query(nativeQuery = true, value = "SELECT * FROM WIDGETS_BUNDLE WHERE TENANT_ID IS NULL " + + @Query(nativeQuery = true, value = "SELECT * FROM WIDGETS_BUNDLE WHERE TENANT_ID = ?4 " + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?2, '%')) " + "AND ID > ?3 ORDER BY ID LIMIT ?1") - List findSystemWidgetsBundlesNextPage(Integer limit, String searchText, UUID idOffset); + List findSystemWidgetsBundlesNextPage(Integer limit, String searchText, UUID idOffset, UUID tenantId); @Query(nativeQuery = true, value = "SELECT * FROM WIDGETS_BUNDLE WHERE TENANT_ID = ?2 " + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + From 03f0bf5865c8ca734d5601ada430b5b38e232e8d Mon Sep 17 00:00:00 2001 From: volodymyr-babak Date: Thu, 1 Jun 2017 15:29:32 +0300 Subject: [PATCH 39/69] Added jpadevicedao implementations --- .../server/dao/device/CassandraDeviceDao.java | 2 +- .../server/dao/device/DeviceDao.java | 2 +- .../server/dao/device/DeviceServiceImpl.java | 7 +-- .../dao/sql/device/DeviceRepository.java | 61 ++++++++++++------- .../server/dao/sql/device/JpaDeviceDao.java | 57 ++++++++++------- .../dao/sql/widget/JpaWidgetsBundleDao.java | 1 - 6 files changed, 80 insertions(+), 50 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceDao.java index 23b3fc9a99..28d97cb933 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceDao.java @@ -121,7 +121,7 @@ public class CassandraDeviceDao extends CassandraAbstractSearchTextDao findDevicesByTenantIdAndName(UUID tenantId, String deviceName) { + public Optional findDeviceByTenantIdAndName(UUID tenantId, String deviceName) { Select select = select().from(DEVICE_BY_TENANT_AND_NAME_VIEW_NAME); Select.Where query = select.where(); query.and(eq(DEVICE_TENANT_ID_PROPERTY, tenantId)); diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java index 3654ca393e..d928a9a12c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java @@ -107,7 +107,7 @@ public interface DeviceDao extends Dao { * @param name the device name * @return the optional device object */ - Optional findDevicesByTenantIdAndName(UUID tenantId, String name); + Optional findDeviceByTenantIdAndName(UUID tenantId, String name); /** * Find tenants device types. 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 b06faa17c1..458d30a8b3 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 @@ -37,7 +37,6 @@ import org.thingsboard.server.common.data.security.DeviceCredentialsType; import org.thingsboard.server.dao.customer.CustomerDao; import org.thingsboard.server.dao.entity.AbstractEntityService; import org.thingsboard.server.dao.exception.DataValidationException; -import org.thingsboard.server.dao.model.TenantDeviceTypeEntity; import org.thingsboard.server.dao.relation.EntitySearchDirection; import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.PaginatedRemover; @@ -88,7 +87,7 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe public Optional findDeviceByTenantIdAndName(TenantId tenantId, String name) { log.trace("Executing findDeviceByTenantIdAndName [{}][{}]", tenantId, name); validateId(tenantId, "Incorrect tenantId " + tenantId); - Optional deviceOpt = deviceDao.findDevicesByTenantIdAndName(tenantId.getId(), name); + Optional deviceOpt = deviceDao.findDeviceByTenantIdAndName(tenantId.getId(), name); if (deviceOpt.isPresent()) { return Optional.of(deviceOpt.get()); } else { @@ -261,7 +260,7 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe @Override protected void validateCreate(Device device) { - deviceDao.findDevicesByTenantIdAndName(device.getTenantId().getId(), device.getName()).ifPresent( + deviceDao.findDeviceByTenantIdAndName(device.getTenantId().getId(), device.getName()).ifPresent( d -> { throw new DataValidationException("Device with such name already exists!"); } @@ -270,7 +269,7 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe @Override protected void validateUpdate(Device device) { - deviceDao.findDevicesByTenantIdAndName(device.getTenantId().getId(), device.getName()).ifPresent( + deviceDao.findDeviceByTenantIdAndName(device.getTenantId().getId(), device.getName()).ifPresent( d -> { if (!d.getUuidId().equals(device.getUuidId())) { throw new DataValidationException("Device with such name already exists!"); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java index ea3e92e7a8..5a43f8e9c9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java @@ -5,7 +5,7 @@ * 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 + * 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, @@ -18,8 +18,7 @@ package org.thingsboard.server.dao.sql.device; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; -import org.springframework.scheduling.annotation.Async; -import org.springframework.util.concurrent.ListenableFuture; +import org.springframework.data.repository.query.Param; import org.thingsboard.server.dao.model.sql.DeviceEntity; import java.util.List; @@ -31,32 +30,52 @@ import java.util.UUID; @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) public interface DeviceRepository extends CrudRepository { - @Query(nativeQuery = true, value = "SELECT * FROM DEVICE WHERE TENANT_ID = ?2 " + - "AND CUSTOMER_ID = ?3 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?4, '%')) " + - "ORDER BY ID LIMIT ?1") - List findByTenantIdAndCustomerIdFirstPage(int limit, UUID tenantId, UUID customerId, String searchText); - @Query(nativeQuery = true, value = "SELECT * FROM DEVICE WHERE TENANT_ID = ?2 " + - "AND CUSTOMER_ID = ?3 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?4, '%')) " + - "AND ID > ?5 ORDER BY ID LIMIT ?1") - List findByTenantIdAndCustomerIdNextPage(int limit, UUID tenantId, UUID customerId, String searchText, UUID idOffset); + @Query(nativeQuery = true, value = "SELECT * FROM DEVICE WHERE TENANT_ID = :tenantId " + + "AND CUSTOMER_ID = :customerId " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:searchText, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findByTenantIdAndCustomerId(@Param("limit") int limit, + @Param("tenantId") UUID tenantId, + @Param("customerId") UUID customerId, + @Param("searchText") String searchText, + @Param("idOffset") UUID idOffset); - @Query(nativeQuery = true, value = "SELECT * FROM DEVICE WHERE TENANT_ID = ?2 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "ORDER BY ID LIMIT ?1") - List findByTenantIdFirstPage(int limit, UUID tenantId, String textSearch); + @Query(nativeQuery = true, value = "SELECT * FROM DEVICE WHERE TENANT_ID = :tenantId " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findByTenantId(@Param("limit") int limit, + @Param("tenantId") UUID tenantId, + @Param("textSearch") String textSearch, + @Param("idOffset") UUID idOffset); - @Query(nativeQuery = true, value = "SELECT * FROM DEVICE WHERE TENANT_ID = ?2 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "AND ID > ?4 ORDER BY ID LIMIT ?1") - List findByTenantIdNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); + @Query(nativeQuery = true, value = "SELECT * FROM DEVICE WHERE TENANT_ID = :tenantId " + + "AND TYPE = :type " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findByTenantIdAndType(@Param("limit") int limit, + @Param("tenantId") UUID tenantId, + @Param("type") String type, + @Param("textSearch") String textSearch, + @Param("idOffset") UUID idOffset); + + @Query(nativeQuery = true, value = "SELECT * FROM DEVICE WHERE TENANT_ID = :tenantId " + + "AND CUSTOMER_ID = :customerId " + + "AND TYPE = :type " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findByTenantIdAndCustomerIdAndType(@Param("limit") int limit, + @Param("tenantId") UUID tenantId, + @Param("customerId") UUID customerId, + @Param("type") String type, + @Param("textSearch") String textSearch, + @Param("idOffset") UUID idOffset); DeviceEntity findByTenantIdAndName(UUID tenantId, String name); List findDevicesByTenantIdAndCustomerIdAndIdIn(UUID tenantId, UUID customerId, List deviceIds); List findDevicesByTenantId(UUID tenantId); + List findDevicesByTenantIdAndIdIn(UUID tenantId, List deviceIds); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java index 6790c7a51f..665be77eb8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java @@ -5,7 +5,7 @@ * 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 + * 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, @@ -35,7 +35,7 @@ import java.util.Optional; import java.util.UUID; import java.util.concurrent.Executors; -import static org.thingsboard.server.dao.model.ModelConstants.DEVICE_COLUMN_FAMILY_NAME; +import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; /** * Created by Valerii Sosliuk on 5/6/2017. @@ -59,13 +59,13 @@ public class JpaDeviceDao extends JpaAbstractSearchTextDao @Override public List findDevicesByTenantId(UUID tenantId, TextPageLink pageLink) { - if (pageLink.getIdOffset() == null) { - return DaoUtil.convertDataList(deviceRepository.findByTenantIdFirstPage( - pageLink.getLimit(), tenantId, pageLink.getTextSearch())); - } else { - return DaoUtil.convertDataList(deviceRepository.findByTenantIdNextPage( - pageLink.getLimit(), tenantId, pageLink.getTextSearch(), pageLink.getIdOffset())); - } + return DaoUtil.convertDataList( + deviceRepository.findByTenantId( + pageLink.getLimit(), + tenantId, + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset()) + ); } @Override @@ -77,13 +77,14 @@ public class JpaDeviceDao extends JpaAbstractSearchTextDao @Override public List findDevicesByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink) { - if (pageLink.getIdOffset() == null) { - return DaoUtil.convertDataList(deviceRepository.findByTenantIdAndCustomerIdFirstPage(pageLink.getLimit(), - tenantId, customerId, pageLink.getTextSearch())); - } else { - return DaoUtil.convertDataList(deviceRepository.findByTenantIdAndCustomerIdNextPage(pageLink.getLimit(), - tenantId, customerId, pageLink.getTextSearch(), pageLink.getIdOffset())); - } + return DaoUtil.convertDataList( + deviceRepository.findByTenantIdAndCustomerId( + pageLink.getLimit(), + tenantId, + customerId, + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset()) + ); } @Override @@ -94,22 +95,34 @@ public class JpaDeviceDao extends JpaAbstractSearchTextDao } @Override - // Probably findDevice, not findDevices? - public Optional findDevicesByTenantIdAndName(UUID tenantId, String name) { + public Optional findDeviceByTenantIdAndName(UUID tenantId, String name) { Device device = DaoUtil.getData(deviceRepository.findByTenantIdAndName(tenantId, name)); return Optional.ofNullable(device); } @Override public List findDevicesByTenantIdAndType(UUID tenantId, String type, TextPageLink pageLink) { - //TODO - return null; + return DaoUtil.convertDataList( + deviceRepository.findByTenantIdAndType( + pageLink.getLimit(), + tenantId, + type, + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset()) + ); } @Override public List findDevicesByTenantIdAndCustomerIdAndType(UUID tenantId, UUID customerId, String type, TextPageLink pageLink) { - //TODO - return null; + return DaoUtil.convertDataList( + deviceRepository.findByTenantIdAndCustomerIdAndType( + pageLink.getLimit(), + tenantId, + customerId, + type, + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset()) + ); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java index 126fb86f99..fab9955d97 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java @@ -56,7 +56,6 @@ public class JpaWidgetsBundleDao extends JpaAbstractSearchTextDao findSystemWidgetsBundles(TextPageLink pageLink) { if (pageLink.getIdOffset() == null) { From 613ebc9065834eec62938d2555089584eceef2d6 Mon Sep 17 00:00:00 2001 From: volodymyr-babak Date: Thu, 1 Jun 2017 16:50:37 +0300 Subject: [PATCH 40/69] Fixed header and tests --- application/src/main/resources/thingsboard.yml | 9 ++++++--- .../test/resources/thingsboard-test.properties | 4 +++- .../server/dao/sql/JpaAbstractDao.java | 3 ++- .../server/dao/sql/alarm/JpaAlarmDao.java | 1 - .../server/dao/sql/asset/JpaAssetDao.java | 3 --- .../dao/sql/attributes/JpaAttributesDao.java | 15 +++++++++++++++ .../server/dao/sql/device/DeviceRepository.java | 6 +++++- .../server/dao/sql/device/JpaDeviceDao.java | 13 +++---------- .../dao/sql/timeseries/JpaTimeseriesDao.java | 15 +++++++++++++++ dao/src/main/resources/postgres/schema.sql | 1 + pom.xml | 1 + 11 files changed, 51 insertions(+), 20 deletions(-) diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 208d9ab053..855e9c86b0 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -107,7 +107,7 @@ coap: # Cassandra driver configuration parameters cassandra: - enabled: "${CASSANDRA_ENABLED:false}" + enabled: "${CASSANDRA_ENABLED:true}" # Thingsboard cluster name cluster_name: "${CASSANDRA_CLUSTER_NAME:Thingsboard Cluster}" # Thingsboard keyspace name @@ -226,7 +226,7 @@ spring.mvc.cors: # SQL DAO Configuration sql: - enabled: "${SQL_ENABLED:true}" + enabled: "${SQL_ENABLED:false}" spring: data: @@ -243,4 +243,7 @@ spring: driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}" url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/thingsboard}" username: "${SPRING_DATASOURCE_USERNAME:postgres}" - password: "${SPRING_DATASOURCE_PASSWORD:postgres}" \ No newline at end of file + password: "${SPRING_DATASOURCE_PASSWORD:postgres}" + autoconfigure: + exclude: + - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration \ No newline at end of file diff --git a/application/src/test/resources/thingsboard-test.properties b/application/src/test/resources/thingsboard-test.properties index 203f23972a..983da30de4 100644 --- a/application/src/test/resources/thingsboard-test.properties +++ b/application/src/test/resources/thingsboard-test.properties @@ -1 +1,3 @@ -updates.enabled=false \ No newline at end of file +updates.enabled=false +cassandra.enabled=true +sql.enabled=false \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java index 756e096e8c..3e893a282e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java @@ -48,6 +48,8 @@ public abstract class JpaAbstractDao, D> implements Dao< return false; } + protected ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); + @Override @Transactional(propagation = REQUIRES_NEW) public D save(D domain) { @@ -80,7 +82,6 @@ public abstract class JpaAbstractDao, D> implements Dao< @Override public ListenableFuture findByIdAsync(UUID key) { log.debug("Get entity by key async {}", key); - ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); ListenableFuture listenableFuture = service.submit(() -> DaoUtil.getData(getCrudRepository().findOne(key))); return listenableFuture; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java index a452fede57..a88341b009 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java @@ -70,7 +70,6 @@ public class JpaAlarmDao extends JpaAbstractDao implements A @Override @Transactional(propagation = REQUIRES_NEW) public ListenableFuture findLatestByOriginatorAndType(TenantId tenantId, EntityId originator, String type) { - ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); return service.submit(() -> DaoUtil.getData( alarmRepository.findLatestByOriginatorAndType(tenantId.getId(), originator.getId(), originator.getEntityType().ordinal(), type))); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java index 47b2ab1c5e..f7af996f18 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java @@ -68,7 +68,6 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao im @Override public ListenableFuture> findAssetsByTenantIdAndIdsAsync(UUID tenantId, List assetIds) { - ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); return service.submit(() -> DaoUtil.convertDataList(assetRepository.findByTenantIdAndIdIn(tenantId, assetIds))); } @@ -86,7 +85,6 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao im @Override public ListenableFuture> findAssetsByTenantIdAndCustomerIdAndIdsAsync(UUID tenantId, UUID customerId, List assetIds) { - ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); return service.submit(() -> DaoUtil.convertDataList( assetRepository.findByTenantIdAndCustomerIdAndIdIn(tenantId, customerId, assetIds))); } @@ -115,7 +113,6 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao im @Override public ListenableFuture> findTenantAssetTypesAsync() { - ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); return service.submit(() -> assetRepository.findTenantAssetTypes()); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributesDao.java index d4f1caa369..eb4a639a99 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributesDao.java @@ -1,3 +1,18 @@ +/** + * 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.sql.attributes; import com.datastax.driver.core.ResultSet; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java index 5a43f8e9c9..dde7fafca1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java @@ -5,7 +5,7 @@ * 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 + * 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, @@ -19,6 +19,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.TenantDeviceType; import org.thingsboard.server.dao.model.sql.DeviceEntity; import java.util.List; @@ -71,6 +72,9 @@ public interface DeviceRepository extends CrudRepository { @Param("textSearch") String textSearch, @Param("idOffset") UUID idOffset); + @Query(nativeQuery = true, value = "SELECT DISTINCT TYPE, TENANT_ID FROM DEVICE") + List findTenantDeviceTypes(); + DeviceEntity findByTenantIdAndName(UUID tenantId, String name); List findDevicesByTenantIdAndCustomerIdAndIdIn(UUID tenantId, UUID customerId, List deviceIds); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java index 665be77eb8..cc16dbcda1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java @@ -5,7 +5,7 @@ * 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 + * 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, @@ -16,8 +16,6 @@ package org.thingsboard.server.dao.sql.device; import com.google.common.util.concurrent.ListenableFuture; -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; @@ -33,7 +31,6 @@ import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import java.util.List; import java.util.Optional; import java.util.UUID; -import java.util.concurrent.Executors; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @@ -45,7 +42,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; public class JpaDeviceDao extends JpaAbstractSearchTextDao implements DeviceDao { @Autowired - DeviceRepository deviceRepository; + private DeviceRepository deviceRepository; @Override protected Class getEntityClass() { @@ -70,8 +67,6 @@ public class JpaDeviceDao extends JpaAbstractSearchTextDao @Override public ListenableFuture> findDevicesByTenantIdAndIdsAsync(UUID tenantId, List deviceIds) { - System.out.println(deviceRepository.findDevicesByTenantIdAndIdIn(tenantId, deviceIds).size()); - ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); return service.submit(() -> DaoUtil.convertDataList(deviceRepository.findDevicesByTenantIdAndIdIn(tenantId, deviceIds))); } @@ -89,7 +84,6 @@ public class JpaDeviceDao extends JpaAbstractSearchTextDao @Override public ListenableFuture> findDevicesByTenantIdCustomerIdAndIdsAsync(UUID tenantId, UUID customerId, List deviceIds) { - ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); return service.submit(() -> DaoUtil.convertDataList( deviceRepository.findDevicesByTenantIdAndCustomerIdAndIdIn(tenantId, customerId, deviceIds))); } @@ -127,7 +121,6 @@ public class JpaDeviceDao extends JpaAbstractSearchTextDao @Override public ListenableFuture> findTenantDeviceTypesAsync() { - //TODO - return null; + return service.submit(() -> deviceRepository.findTenantDeviceTypes()); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java index e114d3dccd..8590876029 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java @@ -1,3 +1,18 @@ +/** + * 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.sql.timeseries; import com.datastax.driver.core.ResultSetFuture; diff --git a/dao/src/main/resources/postgres/schema.sql b/dao/src/main/resources/postgres/schema.sql index 96d0b8f863..3a2891a49e 100644 --- a/dao/src/main/resources/postgres/schema.sql +++ b/dao/src/main/resources/postgres/schema.sql @@ -13,6 +13,7 @@ -- See the License for the specific language governing permissions and -- limitations under the License. -- + SET statement_timeout = 0; SET lock_timeout = 0; SET idle_in_transaction_session_timeout = 0; diff --git a/pom.xml b/pom.xml index 5f87e1a1a1..d09e4ca517 100755 --- a/pom.xml +++ b/pom.xml @@ -455,6 +455,7 @@ com.github.springtestdbunit spring-test-dbunit ${spring-test-dbunit.version} + test io.jsonwebtoken From b33d0e78be570a7840c2d4c6f9673c085628297d Mon Sep 17 00:00:00 2001 From: volodymyr-babak Date: Fri, 2 Jun 2017 19:05:54 +0300 Subject: [PATCH 41/69] Added Jpa Relation and Device Dao implementations --- .../src/main/resources/thingsboard.yml | 10 +- .../common/data/relation/EntityRelation.java | 2 - .../dao/model/sql/RelationCompositeKey.java | 42 ++++ .../server/dao/model/sql/RelationEntity.java | 183 ++++++++++++++++++ .../model/sql/TenantDeviceTypeProjection.java | 23 +++ .../server/dao/relation/BaseRelationDao.java | 3 +- .../dao/sql/device/DeviceRepository.java | 12 +- .../server/dao/sql/device/JpaDeviceDao.java | 19 +- .../dao/sql/relation/JpaRelationDao.java | 107 ++++++++-- .../dao/sql/relation/RelationRepository.java | 107 ++++++++++ dao/src/main/resources/postgres/schema.sql | 12 ++ 11 files changed, 483 insertions(+), 37 deletions(-) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeProjection.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 855e9c86b0..7976035059 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -107,7 +107,7 @@ coap: # Cassandra driver configuration parameters cassandra: - enabled: "${CASSANDRA_ENABLED:true}" + enabled: "${CASSANDRA_ENABLED:false}" # Thingsboard cluster name cluster_name: "${CASSANDRA_CLUSTER_NAME:Thingsboard Cluster}" # Thingsboard keyspace name @@ -226,7 +226,7 @@ spring.mvc.cors: # SQL DAO Configuration sql: - enabled: "${SQL_ENABLED:false}" + enabled: "${SQL_ENABLED:true}" spring: data: @@ -244,6 +244,6 @@ spring: url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/thingsboard}" username: "${SPRING_DATASOURCE_USERNAME:postgres}" password: "${SPRING_DATASOURCE_PASSWORD:postgres}" - autoconfigure: - exclude: - - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration \ No newline at end of file +# autoconfigure: +# exclude: +# - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration \ No newline at end of file diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelation.java b/common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelation.java index 8dab589596..478d5c803d 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelation.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelation.java @@ -18,8 +18,6 @@ package org.thingsboard.server.common.data.relation; import com.fasterxml.jackson.databind.JsonNode; import org.thingsboard.server.common.data.id.EntityId; -import java.util.Objects; - public class EntityRelation { private static final long serialVersionUID = 2807343040519543363L; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java new file mode 100644 index 0000000000..4af848c2e6 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java @@ -0,0 +1,42 @@ +/** + * 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.model.sql; + +import lombok.AllArgsConstructor; +import org.thingsboard.server.common.data.relation.EntityRelation; + +import java.io.Serializable; +import java.util.UUID; + +@AllArgsConstructor +public class RelationCompositeKey implements Serializable { + + private UUID fromId; + private String fromType; + private UUID toId; + private String toType; + private String relationTypeGroup; + private String relationType; + + public RelationCompositeKey(EntityRelation relation) { + this.fromId = relation.getFrom().getId(); + this.fromType = relation.getFrom().getEntityType().name(); + this.toId = relation.getTo().getId(); + this.toType = relation.getTo().getEntityType().name(); + this.relationType = relation.getType(); + this.relationTypeGroup = relation.getTypeGroup().name(); + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java new file mode 100644 index 0000000000..1b15aa1589 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java @@ -0,0 +1,183 @@ +/** + * 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.model.sql; + +import com.fasterxml.jackson.databind.JsonNode; +import lombok.Data; +import org.hibernate.annotations.Type; +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 javax.persistence.*; +import java.util.UUID; + +import static org.thingsboard.server.dao.model.ModelConstants.*; + +@Data +@Entity +@Table(name = RELATION_COLUMN_FAMILY_NAME) +@IdClass(RelationCompositeKey.class) +public final class RelationEntity implements ToData { + + @Transient + private static final long serialVersionUID = -4089175869616037592L; + + @Id + @Column(name = RELATION_FROM_ID_PROPERTY) + private UUID fromId; + + @Id + @Column(name = RELATION_FROM_TYPE_PROPERTY) + private String fromType; + + @Id + @Column(name = RELATION_TO_ID_PROPERTY) + private UUID toId; + + @Id + @Column(name = RELATION_TO_TYPE_PROPERTY) + private String toType; + + @Id + @Column(name = RELATION_TYPE_GROUP_PROPERTY) + private String relationTypeGroup; + + @Id + @Column(name = RELATION_TYPE_PROPERTY) + private String relationType; + + @Type(type = "jsonb") + @Column(name = ADDITIONAL_INFO_PROPERTY, columnDefinition = "jsonb") + private JsonNode additionalInfo; + + public RelationEntity() { + super(); + } + + public RelationEntity(EntityRelation relation) { + if (relation.getTo() != null) { + this.toId = relation.getTo().getId(); + this.toType = relation.getTo().getEntityType().name(); + } + if (relation.getFrom() != null) { + this.fromId = relation.getFrom().getId(); + this.fromType = relation.getFrom().getEntityType().name(); + } + this.relationType = relation.getType(); + this.relationTypeGroup = relation.getTypeGroup().name(); + this.additionalInfo = relation.getAdditionalInfo(); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((additionalInfo == null) ? 0 : additionalInfo.hashCode()); + result = prime * result + ((toId == null) ? 0 : toId.hashCode()); + result = prime * result + ((toType == null) ? 0 : toType.hashCode()); + result = prime * result + ((fromId == null) ? 0 : fromId.hashCode()); + result = prime * result + ((fromType == null) ? 0 : fromType.hashCode()); + result = prime * result + ((relationType == null) ? 0 : relationType.hashCode()); + result = prime * result + ((relationTypeGroup == null) ? 0 : relationTypeGroup.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + RelationEntity other = (RelationEntity) obj; + if (additionalInfo == null) { + if (other.additionalInfo != null) + return false; + } else if (!additionalInfo.equals(other.additionalInfo)) + return false; + if (toId == null) { + if (other.toId != null) + return false; + } else if (!toId.equals(other.toId)) + return false; + if (fromId == null) { + if (other.fromId != null) + return false; + } else if (!fromId.equals(other.fromId)) + return false; + if (toType == null) { + if (other.toType != null) + return false; + } else if (!toType.equals(other.toType)) + return false; + if (fromType == null) { + if (other.fromType != null) + return false; + } else if (!fromType.equals(other.fromType)) + return false; + if (relationType == null) { + if (other.relationType != null) + return false; + } else if (!relationType.equals(other.relationType)) + return false; + if (relationTypeGroup == null) { + if (other.relationTypeGroup != null) + return false; + } else if (!relationTypeGroup.equals(other.relationTypeGroup)) + return false; + return true; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("AssetEntity [toId="); + builder.append(toId); + builder.append(", toType="); + builder.append(toType); + builder.append(", fromId="); + builder.append(fromId); + builder.append(", fromType="); + builder.append(fromType); + builder.append(", relationType="); + builder.append(relationType); + builder.append(", relationTypeGroup="); + builder.append(relationTypeGroup); + builder.append(", additionalInfo="); + builder.append(additionalInfo); + builder.append("]"); + return builder.toString(); + } + + @Override + public EntityRelation toData() { + EntityRelation relation = new EntityRelation(); + if (toId != null && toType != null) { + relation.setTo(EntityIdFactory.getByTypeAndUuid(toType, toId)); + } + if (fromId != null && fromType != null) { + relation.setFrom(EntityIdFactory.getByTypeAndUuid(fromType, fromId)); + } + relation.setType(relationType); + relation.setTypeGroup(RelationTypeGroup.valueOf(relationTypeGroup)); + relation.setAdditionalInfo(additionalInfo); + return relation; + } + +} \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeProjection.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeProjection.java new file mode 100644 index 0000000000..c38e68f39f --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeProjection.java @@ -0,0 +1,23 @@ +/** + * 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.model.sql; + +public interface TenantDeviceTypeProjection { + + String getTenantId(); + + String getType(); +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java index ff4b2f8441..8415bc9903 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java @@ -30,8 +30,8 @@ import org.thingsboard.server.common.data.id.EntityId; 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.dao.CassandraAbstractAsyncDao; 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.model.ModelConstants; import org.thingsboard.server.dao.model.type.RelationTypeGroupCodec; @@ -43,7 +43,6 @@ import java.util.Arrays; import java.util.List; import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; -import static org.thingsboard.server.dao.model.ModelConstants.RELATION_COLUMN_FAMILY_NAME; /** * Created by ashvayka on 25.04.17. diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java index dde7fafca1..343efc43dc 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java @@ -19,9 +19,11 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.TenantDeviceType; +import org.springframework.stereotype.Repository; import org.thingsboard.server.dao.model.sql.DeviceEntity; +import org.thingsboard.server.dao.model.sql.TenantDeviceTypeProjection; +import java.util.Collection; import java.util.List; import java.util.UUID; @@ -72,8 +74,12 @@ public interface DeviceRepository extends CrudRepository { @Param("textSearch") String textSearch, @Param("idOffset") UUID idOffset); - @Query(nativeQuery = true, value = "SELECT DISTINCT TYPE, TENANT_ID FROM DEVICE") - List findTenantDeviceTypes(); + // TODO: CAST was used because in other case when you try convert directly UUID field to UUID java object error throwed: + // org.hibernate.MappingException: No Dialect mapping for JDBC type: 1111 + // I suppose that Spring Projection doesn't support correct mapping for this type of column + // and only Entity at the moment supports UUID + @Query(value = "SELECT DISTINCT CAST(TENANT_ID as VARCHAR) as tenantId, TYPE as type FROM DEVICE", nativeQuery = true) + List findTenantDeviceTypes(); DeviceEntity findByTenantIdAndName(UUID tenantId, String name); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java index cc16dbcda1..5904183f0d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java @@ -22,15 +22,15 @@ import org.springframework.data.repository.CrudRepository; 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.id.TenantId; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.device.DeviceDao; import org.thingsboard.server.dao.model.sql.DeviceEntity; +import org.thingsboard.server.dao.model.sql.TenantDeviceTypeProjection; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; -import java.util.List; -import java.util.Optional; -import java.util.UUID; +import java.util.*; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @@ -121,6 +121,17 @@ public class JpaDeviceDao extends JpaAbstractSearchTextDao @Override public ListenableFuture> findTenantDeviceTypesAsync() { - return service.submit(() -> deviceRepository.findTenantDeviceTypes()); + return service.submit(() -> convertTenantDeviceTypeToDto(deviceRepository.findTenantDeviceTypes())); + } + + private List convertTenantDeviceTypeToDto(List resultSet) { + List list = Collections.emptyList(); + if (resultSet != null && !resultSet.isEmpty()) { + list = new ArrayList<>(); + for (TenantDeviceTypeProjection object : resultSet) { + list.add(new TenantDeviceType(object.getType(), new TenantId(UUID.fromString(object.getTenantId())))); + } + } + return list; } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java index 7841463398..b320f96fed 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java @@ -5,7 +5,7 @@ * 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 + * 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, @@ -16,17 +16,27 @@ package org.thingsboard.server.dao.sql.relation; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.id.EntityId; 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.model.sql.RelationCompositeKey; +import org.thingsboard.server.dao.model.sql.RelationEntity; import org.thingsboard.server.dao.relation.RelationDao; +import org.thingsboard.server.dao.sql.JpaAbstractDao; import java.util.List; +import java.util.UUID; +import java.util.concurrent.Executors; /** * Created by Valerii Sosliuk on 5/29/2017. @@ -36,64 +46,119 @@ import java.util.List; @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) public class JpaRelationDao implements RelationDao { + @Autowired + private RelationRepository relationRepository; + + private ListeningExecutorService executorService = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); @Override public ListenableFuture> findAllByFrom(EntityId from, RelationTypeGroup typeGroup) { - // TODO: Implement - return null; + return executorService.submit(() -> DaoUtil.convertDataList( + relationRepository.findAllByFromIdAndFromTypeAndRelationTypeGroup( + from.getId(), + from.getEntityType().name(), + typeGroup.name()))); } @Override public ListenableFuture> findAllByFromAndType(EntityId from, String relationType, RelationTypeGroup typeGroup) { - // TODO: Implement - return null; + return executorService.submit(() -> DaoUtil.convertDataList( + relationRepository.findAllByFromIdAndFromTypeAndRelationTypeAndRelationTypeGroup( + from.getId(), + from.getEntityType().name(), + relationType, + typeGroup.name()))); } @Override public ListenableFuture> findAllByTo(EntityId to, RelationTypeGroup typeGroup) { - // TODO: Implement - return null; + return executorService.submit(() -> DaoUtil.convertDataList( + relationRepository.findAllByToIdAndToTypeAndRelationTypeGroup( + to.getId(), + to.getEntityType().name(), + typeGroup.name()))); } @Override public ListenableFuture> findAllByToAndType(EntityId to, String relationType, RelationTypeGroup typeGroup) { - // TODO: Implement - return null; + return executorService.submit(() -> DaoUtil.convertDataList( + relationRepository.findAllByToIdAndToTypeAndRelationTypeAndRelationTypeGroup( + to.getId(), + to.getEntityType().name(), + relationType, + typeGroup.name()))); } @Override public ListenableFuture checkRelation(EntityId from, EntityId to, String relationType, RelationTypeGroup typeGroup) { - // TODO: Implement - return null; + RelationCompositeKey key = + new RelationCompositeKey(from.getId(), + from.getEntityType().name(), + to.getId(), + to.getEntityType().name(), + relationType, + typeGroup.name()); + return executorService.submit(() -> relationRepository.findOne(key) != null); } @Override public ListenableFuture saveRelation(EntityRelation relation) { - // TODO: Implement - return null; + return executorService.submit(() -> relationRepository.save(new RelationEntity(relation)) != null); } @Override public ListenableFuture deleteRelation(EntityRelation relation) { - // TODO: Implement - return null; + RelationCompositeKey key = new RelationCompositeKey(relation); + return executorService.submit( + () -> { + relationRepository.delete(key); + return !relationRepository.exists(key); + }); } @Override public ListenableFuture deleteRelation(EntityId from, EntityId to, String relationType, RelationTypeGroup typeGroup) { - // TODO: Implement - return null; + RelationCompositeKey key = + new RelationCompositeKey(from.getId(), + from.getEntityType().name(), + to.getId(), + to.getEntityType().name(), + relationType, + typeGroup.name()); + return executorService.submit( + () -> { + boolean result = relationRepository.exists(key); + relationRepository.delete(key); + return result; + }); } @Override public ListenableFuture deleteOutboundRelations(EntityId entity) { - // TODO: Implement - return null; + RelationEntity relationEntity = new RelationEntity(); + relationEntity.setFromId(entity.getId()); + relationEntity.setFromType(entity.getEntityType().name()); + + return executorService.submit( + () -> { + boolean result = relationRepository + .findAllByFromIdAndFromType(relationEntity.getFromId(), relationEntity.getFromType()) + .size() > 0; + relationRepository.delete(relationEntity); + return result; + }); } @Override - public ListenableFuture> findRelations(EntityId from, String relationType, RelationTypeGroup typeGroup, EntityType toType, TimePageLink pageLink) { - // TODO: Implement + public ListenableFuture> findRelations(EntityId from, String relationType, RelationTypeGroup typeGroup, EntityType childType, TimePageLink pageLink) { +// executorService.submit(() -> DaoUtil.convertDataList( +// relationRepository.findRelations( +// to.getId(), +// to.getEntityType().name(), +// relationType, +// typeGroup.name()))); return null; } + + } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java new file mode 100644 index 0000000000..fff147d50e --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java @@ -0,0 +1,107 @@ +/** + * 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.sql.relation; + +import com.datastax.driver.core.querybuilder.QueryBuilder; +import com.datastax.driver.core.querybuilder.Select; +import com.google.common.util.concurrent.ListenableFuture; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +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.common.data.id.EntityId; +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.CassandraAbstractSearchTimeDao; +import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.model.sql.RelationCompositeKey; +import org.thingsboard.server.dao.model.sql.RelationEntity; + +import java.util.Arrays; +import java.util.List; +import java.util.UUID; + +import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; + +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") +public interface RelationRepository extends CrudRepository { + + List findAllByFromIdAndFromTypeAndRelationTypeGroup(UUID fromId, + String fromType, + String relationTypeGroup); + + List findAllByFromIdAndFromTypeAndRelationTypeAndRelationTypeGroup(UUID fromId, + String fromType, + String relationType, + String relationTypeGroup); + + List findAllByToIdAndToTypeAndRelationTypeGroup(UUID toId, + String toType, + String relationTypeGroup); + + List findAllByToIdAndToTypeAndRelationTypeAndRelationTypeGroup(UUID toId, + String toType, + String relationType, + String relationTypeGroup); + + List findAllByFromIdAndFromType(UUID fromId, + String fromType); + + @Query(nativeQuery = true, value = "SELECT * FROM DEVICE WHERE TENANT_ID = :tenantId " + + "AND CUSTOMER_ID = :customerId " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:searchText, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findRelations(@Param("fromId") UUID fromId, + @Param("fromType") String fromType, + @Param("toType") String toType, + @Param("relationType") String relationType, + @Param("relationTypeGroup") String relationTypeGroup, + TimePageLink pageLink); + + +// Select.Where query = CassandraAbstractSearchTimeDao.buildQuery(ModelConstants.RELATION_BY_TYPE_AND_CHILD_TYPE_VIEW_NAME, +// Arrays.asList(eq(ModelConstants.RELATION_FROM_ID_PROPERTY, from.getId()), +// eq(ModelConstants.RELATION_FROM_TYPE_PROPERTY, from.getEntityType().name()), +// eq(ModelConstants.RELATION_TYPE_GROUP_PROPERTY, typeGroup.name()), +// eq(ModelConstants.RELATION_TYPE_PROPERTY, relationType), +// eq(ModelConstants.RELATION_TO_TYPE_PROPERTY, childType.name())), +// Arrays.asList(QueryBuilder.asc(ModelConstants.RELATION_TYPE_GROUP_PROPERTY), +// QueryBuilder.asc(ModelConstants.RELATION_TYPE_PROPERTY), +// QueryBuilder.asc(ModelConstants.RELATION_TO_TYPE_PROPERTY)), +// pageLink, ModelConstants.RELATION_TO_ID_PROPERTY); +} + +// private UUID fromId; +// private String fromType; +// private UUID toId; +// private String toType; +// private String relationTypeGroup; +// private String relationType; +// +// +// ListenableFuture checkRelation(EntityId from, EntityId to, String relationType, RelationTypeGroup typeGroup); +// +// ListenableFuture saveRelation(EntityRelation relation); +// +// ListenableFuture deleteRelation(EntityRelation relation); +// +// ListenableFuture deleteRelation(EntityId from, EntityId to, String relationType, RelationTypeGroup typeGroup); +// +// ListenableFuture deleteOutboundRelations(EntityId entity); +// +// ListenableFuture> findRelations(EntityId from, String relationType, RelationTypeGroup typeGroup, EntityType toType, TimePageLink pageLink); \ No newline at end of file diff --git a/dao/src/main/resources/postgres/schema.sql b/dao/src/main/resources/postgres/schema.sql index 3a2891a49e..afaf936da6 100644 --- a/dao/src/main/resources/postgres/schema.sql +++ b/dao/src/main/resources/postgres/schema.sql @@ -51,6 +51,18 @@ CREATE TABLE IF NOT EXISTS alarm ( ); ALTER TABLE alarm OWNER TO postgres; +CREATE TABLE IF NOT EXISTS relation ( + from_id uuid, + from_type character varying(255), + to_id uuid, + to_type character varying(255), + relation_type_group character varying(255), + relation_type character varying(255), + additional_info jsonb, + CONSTRAINT relation_unq_key UNIQUE (from_id, from_type, relation_type_group, relation_type, to_id, to_type) +); +ALTER TABLE relation OWNER TO postgres; + CREATE TABLE IF NOT EXISTS asset ( id uuid NOT NULL CONSTRAINT asset_pkey PRIMARY KEY, additional_info jsonb, From 2349af5d42bd83a9b747d5195c0c828027ecc7a7 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Mon, 5 Jun 2017 12:10:29 +0300 Subject: [PATCH 42/69] fixed license headers --- .../org/thingsboard/server/dao/sql/relation/JpaRelationDao.java | 2 +- .../thingsboard/server/dao/sql/relation/RelationRepository.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java index b320f96fed..5914257062 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java @@ -5,7 +5,7 @@ * 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 + * 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, diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java index fff147d50e..5c8921a02c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java @@ -5,7 +5,7 @@ * 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 + * 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, From 3534684588523b3d3a77d7bd697cc20520963d45 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Wed, 7 Jun 2017 20:11:41 +0300 Subject: [PATCH 43/69] Refactored first and next dao methods Fixed NULL_UUID Added support for running cassandra and postgres application versions --- application/pom.xml | 10 +++ .../server/ThingsboardServerApplication.java | 9 +-- .../src/main/resources/thingsboard.yml | 5 +- .../controller/AbstractControllerTest.java | 15 +---- ...java => CassandraControllerTestSuite.java} | 3 +- .../mqtt/AbstractFeatureIntegrationTest.java | 2 - .../thingsboard/server/dao/JpaDaoConfig.java | 3 +- .../server/dao/NoSqlDaoConfig.java | 33 ++++++++++ ...ction.java => TenantDeviceTypeEntity.java} | 11 +++- .../server/dao/sql/JpaAbstractDao.java | 3 +- .../server/dao/sql/alarm/AlarmRepository.java | 15 +++-- .../server/dao/sql/alarm/JpaAlarmDao.java | 14 ++-- .../server/dao/sql/asset/AssetRepository.java | 60 ++++++++--------- .../server/dao/sql/asset/JpaAssetDao.java | 49 +++++++------- .../ComponentDescriptorRepository.java | 41 +++++------- .../JpaBaseComponentDescriptorDao.java | 31 ++++----- .../dao/sql/customer/CustomerRepository.java | 18 +++-- .../dao/sql/customer/JpaCustomerDao.java | 13 ++-- .../dashboard/DashboardInfoRepository.java | 34 +++++----- .../sql/dashboard/JpaDashboardInfoDao.java | 29 ++++---- .../dao/sql/device/DeviceRepository.java | 12 +--- .../server/dao/sql/device/JpaDeviceDao.java | 12 ++-- .../server/dao/sql/event/EventRepository.java | 4 -- .../dao/sql/plugin/JpaBasePluginDao.java | 35 +++++----- .../sql/plugin/PluginMetaDataRepository.java | 38 +++++------ .../dao/sql/relation/JpaRelationDao.java | 15 ++--- .../dao/sql/relation/RelationRepository.java | 66 ++++--------------- .../server/dao/sql/rule/JpaBaseRuleDao.java | 36 +++++----- .../dao/sql/rule/RuleMetaDataRepository.java | 39 +++++------ .../sql/settings/AdminSettingsRepository.java | 1 - .../dao/sql/settings/JpaAdminSettingsDao.java | 2 - .../server/dao/sql/tenant/JpaTenantDao.java | 14 ++-- .../dao/sql/tenant/TenantRepository.java | 19 +++--- .../server/dao/sql/user/JpaUserDao.java | 27 ++++---- .../server/dao/sql/user/UserRepository.java | 32 ++++----- .../dao/sql/widget/JpaWidgetsBundleDao.java | 43 ++++++------ .../sql/widget/WidgetsBundleRepository.java | 54 +++++++-------- .../server/dao/AbstractJpaDaoTest.java | 3 +- .../dao/service/AbstractServiceTest.java | 2 - .../server/dao/sql/alarm/JpaAlarmDaoTest.java | 3 - 40 files changed, 394 insertions(+), 461 deletions(-) rename application/src/test/java/org/thingsboard/server/controller/{ControllerTestSuite.java => CassandraControllerTestSuite.java} (97%) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/NoSqlDaoConfig.java rename dao/src/main/java/org/thingsboard/server/dao/model/sql/{TenantDeviceTypeProjection.java => TenantDeviceTypeEntity.java} (77%) diff --git a/application/pom.xml b/application/pom.xml index 9364cfc16a..28716d0823 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -241,6 +241,16 @@ mockito-all test + + org.dbunit + dbunit + test + + + com.github.springtestdbunit + spring-test-dbunit + test + diff --git a/application/src/main/java/org/thingsboard/server/ThingsboardServerApplication.java b/application/src/main/java/org/thingsboard/server/ThingsboardServerApplication.java index b70d9522c8..2994810d7c 100644 --- a/application/src/main/java/org/thingsboard/server/ThingsboardServerApplication.java +++ b/application/src/main/java/org/thingsboard/server/ThingsboardServerApplication.java @@ -16,18 +16,13 @@ package org.thingsboard.server; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.SpringBootApplication; -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.boot.SpringBootConfiguration; import org.springframework.context.annotation.ComponentScan; import springfox.documentation.swagger2.annotations.EnableSwagger2; import java.util.Arrays; -@EnableAutoConfiguration -@SpringBootApplication +@SpringBootConfiguration @EnableSwagger2 @ComponentScan({"org.thingsboard.server"}) public class ThingsboardServerApplication { diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 7976035059..208d9ab053 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -243,7 +243,4 @@ spring: driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}" url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/thingsboard}" username: "${SPRING_DATASOURCE_USERNAME:postgres}" - password: "${SPRING_DATASOURCE_PASSWORD:postgres}" -# autoconfigure: -# exclude: -# - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration \ No newline at end of file + password: "${SPRING_DATASOURCE_PASSWORD:postgres}" \ No newline at end of file diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java index 435f9a64f3..de77fe9b19 100644 --- a/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java @@ -28,14 +28,9 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.runner.RunWith; -import org.mockito.Mockito; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationContextLoader; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpHeaders; @@ -66,11 +61,9 @@ import org.thingsboard.server.common.data.id.UUIDBased; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.config.ThingsboardSecurityConfiguration; -import org.thingsboard.server.exception.ThingsboardException; -import org.thingsboard.server.service.mail.MailService; import org.thingsboard.server.service.mail.TestMailService; -import org.thingsboard.server.service.security.auth.rest.LoginRequest; import org.thingsboard.server.service.security.auth.jwt.RefreshTokenRequest; +import org.thingsboard.server.service.security.auth.rest.LoginRequest; import java.io.IOException; import java.nio.charset.Charset; @@ -81,9 +74,7 @@ import java.util.List; import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup; @ActiveProfiles("test") @@ -92,7 +83,6 @@ import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppC @TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:thingsboard-test.properties"}) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) @Configuration -@EnableAutoConfiguration @ComponentScan({"org.thingsboard.server"}) @WebAppConfiguration @IntegrationTest("server.port:0") @@ -113,7 +103,6 @@ public abstract class AbstractControllerTest { MediaType.APPLICATION_JSON.getSubtype(), Charset.forName("utf8")); - protected MockMvc mockMvc; protected String token; diff --git a/application/src/test/java/org/thingsboard/server/controller/ControllerTestSuite.java b/application/src/test/java/org/thingsboard/server/controller/CassandraControllerTestSuite.java similarity index 97% rename from application/src/test/java/org/thingsboard/server/controller/ControllerTestSuite.java rename to application/src/test/java/org/thingsboard/server/controller/CassandraControllerTestSuite.java index 686e600ff6..825b2cb653 100644 --- a/application/src/test/java/org/thingsboard/server/controller/ControllerTestSuite.java +++ b/application/src/test/java/org/thingsboard/server/controller/CassandraControllerTestSuite.java @@ -26,7 +26,7 @@ import java.util.Arrays; @RunWith(ClasspathSuite.class) @ClassnameFilters({"org.thingsboard.server.controller.*Test"}) -public class ControllerTestSuite { +public class CassandraControllerTestSuite { @ClassRule public static CustomCassandraCQLUnit cassandraUnit = @@ -35,5 +35,4 @@ public class ControllerTestSuite { new ClassPathCQLDataSet("cassandra/system-data.cql", false, false), new ClassPathCQLDataSet("system-test.cql", false, false)), "cassandra-test.yaml", 30000l); - } diff --git a/application/src/test/java/org/thingsboard/server/mqtt/AbstractFeatureIntegrationTest.java b/application/src/test/java/org/thingsboard/server/mqtt/AbstractFeatureIntegrationTest.java index 0f449d3310..13943eab7c 100644 --- a/application/src/test/java/org/thingsboard/server/mqtt/AbstractFeatureIntegrationTest.java +++ b/application/src/test/java/org/thingsboard/server/mqtt/AbstractFeatureIntegrationTest.java @@ -17,7 +17,6 @@ package org.thingsboard.server.mqtt; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationContextLoader; import org.springframework.context.annotation.ComponentScan; @@ -46,7 +45,6 @@ import static org.junit.Assert.assertNotNull; @TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:thingsboard-test.properties"}) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) @Configuration -@EnableAutoConfiguration @ComponentScan({"org.thingsboard.server"}) @WebAppConfiguration @IntegrationTest("server.port:8080") diff --git a/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java b/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java index b93ac0fc73..89f02c7545 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java +++ b/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java @@ -18,6 +18,7 @@ package org.thingsboard.server.dao; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; @@ -28,11 +29,11 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; */ @Configuration @EnableAutoConfiguration -@ConditionalOnProperty(prefix="sql", value="enabled",havingValue = "true", matchIfMissing = false) @ComponentScan("org.thingsboard.server.dao.sql") @EnableJpaRepositories("org.thingsboard.server.dao.sql") @EntityScan("org.thingsboard.server.dao.model.sql") @EnableTransactionManagement +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") public class JpaDaoConfig { } diff --git a/dao/src/main/java/org/thingsboard/server/dao/NoSqlDaoConfig.java b/dao/src/main/java/org/thingsboard/server/dao/NoSqlDaoConfig.java new file mode 100644 index 0000000000..76cc66b5d6 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/NoSqlDaoConfig.java @@ -0,0 +1,33 @@ +/** + * 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.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +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; + +@Configuration +@EnableAutoConfiguration( + exclude = { + DataSourceAutoConfiguration.class, + DataSourceTransactionManagerAutoConfiguration.class, + HibernateJpaAutoConfiguration.class}) +@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true") +public class NoSqlDaoConfig { +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeProjection.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeEntity.java similarity index 77% rename from dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeProjection.java rename to dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeEntity.java index c38e68f39f..3b717505cc 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeProjection.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeEntity.java @@ -15,9 +15,14 @@ */ package org.thingsboard.server.dao.model.sql; -public interface TenantDeviceTypeProjection { +import lombok.AllArgsConstructor; +import lombok.Data; - String getTenantId(); +import java.util.UUID; - String getType(); +@AllArgsConstructor +@Data +public class TenantDeviceTypeEntity { + private UUID tenantId; + private String type; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java index 3e893a282e..aeaac2575d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java @@ -82,8 +82,7 @@ public abstract class JpaAbstractDao, D> implements Dao< @Override public ListenableFuture findByIdAsync(UUID key) { log.debug("Get entity by key async {}", key); - ListenableFuture listenableFuture = service.submit(() -> DaoUtil.getData(getCrudRepository().findOne(key))); - return listenableFuture; + return service.submit(() -> DaoUtil.getData(getCrudRepository().findOne(key))); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java index e46c144692..6e6ceebf7d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java @@ -17,8 +17,8 @@ package org.thingsboard.server.dao.sql.alarm; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.CrudRepository; -import org.thingsboard.server.common.data.alarm.Alarm; +import org.springframework.data.repository.PagingAndSortingRepository; +import org.springframework.data.repository.query.Param; import org.thingsboard.server.dao.model.sql.AlarmEntity; import java.util.UUID; @@ -27,9 +27,12 @@ import java.util.UUID; * Created by Valerii Sosliuk on 5/21/2017. */ @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) -public interface AlarmRepository extends CrudRepository { +public interface AlarmRepository extends PagingAndSortingRepository { - @Query(nativeQuery = true, value = "SELECT * FROM ALARM WHERE TENANT_ID = ?1 AND ORIGINATOR_ID = ?2 " + - "AND ?3 = ?3 AND TYPE = ?4 ORDER BY ID DESC LIMIT 1") - AlarmEntity findLatestByOriginatorAndType(UUID tenantId, UUID originatorId, int entityType, String alarmType); + @Query(nativeQuery = true, value = "SELECT * FROM ALARM WHERE TENANT_ID = :tenantId AND ORIGINATOR_ID = :originatorId " + + "AND ORIGINATOR_TYPE = :entityType AND TYPE = :alarmType ORDER BY TYPE ASC, ID DESC LIMIT 1") + AlarmEntity findLatestByOriginatorAndType(@Param("tenantId") UUID tenantId, + @Param("originatorId") UUID originatorId, + @Param("entityType") int entityType, + @Param("alarmType") String alarmType); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java index a88341b009..5258395036 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java @@ -15,7 +15,9 @@ */ package org.thingsboard.server.dao.sql.alarm; -import com.google.common.util.concurrent.*; +import com.google.common.util.concurrent.AsyncFunction; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -39,7 +41,6 @@ import org.thingsboard.server.dao.sql.JpaAbstractDao; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import java.util.concurrent.Executors; import static org.springframework.transaction.annotation.Propagation.REQUIRES_NEW; @@ -70,9 +71,12 @@ public class JpaAlarmDao extends JpaAbstractDao implements A @Override @Transactional(propagation = REQUIRES_NEW) public ListenableFuture findLatestByOriginatorAndType(TenantId tenantId, EntityId originator, String type) { - return service.submit(() -> DaoUtil.getData( - alarmRepository.findLatestByOriginatorAndType(tenantId.getId(), originator.getId(), - originator.getEntityType().ordinal(), type))); + return service.submit(() -> + DaoUtil.getData(alarmRepository.findLatestByOriginatorAndType( + tenantId.getId(), + originator.getId(), + originator.getEntityType().ordinal(), + type))); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java index b6c9891540..8feacf1635 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java @@ -18,12 +18,11 @@ package org.thingsboard.server.dao.sql.asset; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; -import org.thingsboard.server.common.data.asset.Asset; +import org.springframework.data.repository.query.Param; import org.thingsboard.server.common.data.asset.TenantAssetType; import org.thingsboard.server.dao.model.sql.AssetEntity; import java.util.List; -import java.util.Optional; import java.util.UUID; /** @@ -31,28 +30,24 @@ import java.util.UUID; */ @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) public interface AssetRepository extends CrudRepository { -// - @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = ?2 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "ORDER BY ID LIMIT ?1") - List findByTenantIdFirstPage(int limit, UUID tenantId, String textSearch); - @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = ?2 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "AND ID > ?4 ORDER BY ID LIMIT ?1") - List findByTenantIdNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); + @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = :tenantId " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findByTenantId(@Param("limit") int limit, + @Param("tenantId") UUID tenantId, + @Param("textSearch") String textSearch, + @Param("idOffset") UUID idOffset); - @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = ?2 " + - "AND CUSTOMER_ID = ?3 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?4, '%')) " + - "ORDER BY ID LIMIT ?1") - List findByTenantIdAndCustomerIdFirstPage(int limit, UUID tenantId, UUID customerId, String textSearch); - - @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = ?2 " + - "AND CUSTOMER_ID = ?3 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?4, '%')) " + - "AND ID > ?5 ORDER BY ID LIMIT ?1") - List findByTenantIdAndCustomerIdNextPage(int limit, UUID tenantId, UUID customerId, String textSearch, UUID idOffset); + @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = :tenantId " + + "AND CUSTOMER_ID = :customerId " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findByTenantIdAndCustomerId(@Param("limit") int limit, + @Param("tenantId") UUID tenantId, + @Param("customerId") UUID customerId, + @Param("textSearch") String textSearch, + @Param("idOffset") UUID idOffset); List findByTenantIdAndIdIn(UUID tenantId, List assetIds); @@ -60,17 +55,16 @@ public interface AssetRepository extends CrudRepository { AssetEntity findByTenantIdAndName(UUID tenantId, String name); - @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = ?2 " + - "AND CUSTOMER_ID = ?3 AND TYPE = ?4 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?5, '%')) " + - "ORDER BY ID LIMIT ?1") - List findByTenantIdAndCustomerIdAndTypeFirstPage(int limit, UUID tenantId, UUID customerId, String type, String textSearch); - - @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = ?2 " + - "AND CUSTOMER_ID = ?3 AND TYPE = ?4 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?5, '%')) " + - "AND ID > ?6 ORDER BY ID LIMIT ?1") - List findByTenantIdAndCustomerIdAndTypeNextPage(int limit, UUID tenantId, UUID customerId, String type, String textSearch, UUID idOffset); + @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = :tenantId " + + "AND CUSTOMER_ID = :customerId AND TYPE = :type " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findByTenantIdAndCustomerIdAndType(@Param("limit") int limit, + @Param("tenantId") UUID tenantId, + @Param("customerId") UUID customerId, + @Param("type") String type, + @Param("textSearch") String textSearch, + @Param("idOffset") UUID idOffset); @Query(value = "SELECT NEW org.thingsboard.server.common.data.asset.TenantAssetType(a.type, a.tenantId) FROM AssetEntity a GROUP BY a.tenantId, a.type") List findTenantAssetTypes(); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java index f7af996f18..17f2024c78 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java @@ -16,8 +16,6 @@ package org.thingsboard.server.dao.sql.asset; import com.google.common.util.concurrent.ListenableFuture; -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; @@ -33,7 +31,8 @@ import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import java.util.List; import java.util.Optional; import java.util.UUID; -import java.util.concurrent.Executors; + +import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; /** * Created by Valerii Sosliuk on 5/19/2017. @@ -57,13 +56,12 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao im @Override public List findAssetsByTenantId(UUID tenantId, TextPageLink pageLink) { - if (pageLink.getIdOffset() == null) { - return DaoUtil.convertDataList(assetRepository.findByTenantIdFirstPage(pageLink.getLimit(), tenantId, - pageLink.getTextSearch())); - } else { - return DaoUtil.convertDataList(assetRepository.findByTenantIdNextPage(pageLink.getLimit(), tenantId, - pageLink.getTextSearch(), pageLink.getIdOffset())); - } + return DaoUtil.convertDataList(assetRepository + .findByTenantId( + pageLink.getLimit(), + tenantId, + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); } @Override @@ -74,19 +72,19 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao im @Override public List findAssetsByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink) { - if (pageLink.getIdOffset() == null) { - return DaoUtil.convertDataList(assetRepository.findByTenantIdAndCustomerIdFirstPage(pageLink.getLimit(), tenantId, - customerId, pageLink.getTextSearch())); - } else { - return DaoUtil.convertDataList(assetRepository.findByTenantIdAndCustomerIdNextPage(pageLink.getLimit(), tenantId, - customerId, pageLink.getTextSearch(), pageLink.getIdOffset())); - } + return DaoUtil.convertDataList(assetRepository + .findByTenantIdAndCustomerId( + pageLink.getLimit(), + tenantId, + customerId, + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); } @Override public ListenableFuture> findAssetsByTenantIdAndCustomerIdAndIdsAsync(UUID tenantId, UUID customerId, List assetIds) { return service.submit(() -> - DaoUtil.convertDataList( assetRepository.findByTenantIdAndCustomerIdAndIdIn(tenantId, customerId, assetIds))); + DaoUtil.convertDataList(assetRepository.findByTenantIdAndCustomerIdAndIdIn(tenantId, customerId, assetIds))); } @Override @@ -102,13 +100,14 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao im @Override public List findAssetsByTenantIdAndCustomerIdAndType(UUID tenantId, UUID customerId, String type, TextPageLink pageLink) { - if (pageLink.getIdOffset() == null) { - return DaoUtil.convertDataList(assetRepository.findByTenantIdAndCustomerIdAndTypeFirstPage(pageLink.getLimit(), tenantId, - customerId, type, pageLink.getTextSearch())); - } else { - return DaoUtil.convertDataList(assetRepository.findByTenantIdAndCustomerIdAndTypeNextPage(pageLink.getLimit(), tenantId, - customerId, type, pageLink.getTextSearch(), pageLink.getIdOffset())); - } + return DaoUtil.convertDataList(assetRepository + .findByTenantIdAndCustomerIdAndType( + pageLink.getLimit(), + tenantId, + customerId, + type, + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java index ee72b2dcca..266ae494d9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java @@ -18,13 +18,9 @@ package org.thingsboard.server.dao.sql.component; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Component; -import org.thingsboard.server.common.data.plugin.ComponentScope; -import org.thingsboard.server.common.data.plugin.ComponentType; -import org.thingsboard.server.dao.model.ToData; +import org.springframework.data.repository.query.Param; import org.thingsboard.server.dao.model.sql.ComponentDescriptorEntity; -import java.util.Collection; import java.util.List; import java.util.UUID; @@ -36,25 +32,22 @@ public interface ComponentDescriptorRepository extends CrudRepository findByTypeFirstPage(int limit, String type, String textSearch); - - @Query(nativeQuery = true, value = "SELECT * FROM COMPONENT_DESCRIPTOR WHERE TYPE = ?2 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "AND ID > ?4 ORDER BY ID LIMIT ?1") - List findByTypeNextPage(int limit, String type, String textSearch, UUID idOffset); - - @Query(nativeQuery = true, value = "SELECT * FROM COMPONENT_DESCRIPTOR WHERE TYPE = ?2 " + - "AND SCOPE = ?3 AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?4, '%')) " + - "ORDER BY ID LIMIT ?1") - List findByScopeAndTypeFirstPage(int limit, String type, String scope, String textSearch); - - @Query(nativeQuery = true, value = "SELECT * FROM COMPONENT_DESCRIPTOR WHERE TYPE = ?2 " + - "AND SCOPE = ?3 AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?4, '%')) " + - "AND ID > ?5 ORDER BY ID LIMIT ?1") - List findByScopeAndTypeNextPage(int limit, String type, String scope, String textSearch, UUID idOffset); + @Query(nativeQuery = true, value = "SELECT * FROM COMPONENT_DESCRIPTOR WHERE TYPE = :type " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findByType(@Param("limit") int limit, + @Param("type") String type, + @Param("textSearch") String textSearch, + @Param("idOffset") UUID idOffset); + + @Query(nativeQuery = true, value = "SELECT * FROM COMPONENT_DESCRIPTOR WHERE TYPE = :type " + + "AND SCOPE = :scope AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findByScopeAndType(@Param("limit") int limit, + @Param("type") String type, + @Param("scope") String scope, + @Param("textSearch") String textSearch, + @Param("idOffset") UUID idOffset); void deleteByClazz(String clazz); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java index c94e042488..405af2ad64 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java @@ -34,13 +34,15 @@ import java.util.List; import java.util.Optional; import java.util.UUID; +import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; + /** * Created by Valerii Sosliuk on 5/6/2017. */ @Component @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) public class JpaBaseComponentDescriptorDao extends JpaAbstractSearchTextDao - implements ComponentDescriptorDao { + implements ComponentDescriptorDao { @Autowired private ComponentDescriptorRepository componentDescriptorRepository; @@ -79,24 +81,23 @@ public class JpaBaseComponentDescriptorDao extends JpaAbstractSearchTextDao findByTypeAndPageLink(ComponentType type, TextPageLink pageLink) { - if (pageLink.getIdOffset() == null) { - return DaoUtil.convertDataList(componentDescriptorRepository.findByTypeFirstPage(pageLink.getLimit(), - type.toString(), pageLink.getTextSearch())); - } else { - return DaoUtil.convertDataList(componentDescriptorRepository.findByTypeNextPage(pageLink.getLimit(), - type.toString(), pageLink.getTextSearch(), pageLink.getIdOffset())); - } + return DaoUtil.convertDataList(componentDescriptorRepository + .findByType( + pageLink.getLimit(), + type.toString(), + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); } @Override public List findByScopeAndTypeAndPageLink(ComponentScope scope, ComponentType type, TextPageLink pageLink) { - if (pageLink.getIdOffset() == null) { - return DaoUtil.convertDataList(componentDescriptorRepository.findByScopeAndTypeFirstPage(pageLink.getLimit(), - type.toString(), scope.toString(), pageLink.getTextSearch())); - } else { - return DaoUtil.convertDataList(componentDescriptorRepository.findByScopeAndTypeNextPage(pageLink.getLimit(), - type.toString(), scope.toString(), pageLink.getTextSearch(), pageLink.getIdOffset())); - } + return DaoUtil.convertDataList(componentDescriptorRepository + .findByScopeAndType( + pageLink.getLimit(), + type.toString(), + scope.toString(), + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java index 83e2dba9be..3ce55c008f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java @@ -18,7 +18,7 @@ package org.thingsboard.server.dao.sql.customer; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; -import org.thingsboard.server.common.data.Customer; +import org.springframework.data.repository.query.Param; import org.thingsboard.server.dao.model.sql.CustomerEntity; import java.util.List; @@ -30,15 +30,13 @@ import java.util.UUID; @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) public interface CustomerRepository extends CrudRepository { - @Query(nativeQuery = true, value = "SELECT * FROM CUSTOMER WHERE TENANT_ID = ?2 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "ORDER BY ID LIMIT ?1") - List findByTenantIdFirstPage(int limit, UUID tenantId, String textSearch); - - @Query(nativeQuery = true, value = "SELECT * FROM CUSTOMER WHERE TENANT_ID = ?2 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "AND ID > ?4 ORDER BY ID LIMIT ?1") - List findByTenantIdNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); + @Query(nativeQuery = true, value = "SELECT * FROM CUSTOMER WHERE TENANT_ID = :tenantId " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findByTenantId(@Param("limit") int limit, + @Param("tenantId") UUID tenantId, + @Param("textSearch") String textSearch, + @Param("idOffset") UUID idOffset); CustomerEntity findByTenantIdAndTitle(UUID tenantId, String title); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java index 41fd310176..a50526611c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java @@ -23,7 +23,6 @@ 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.customer.CustomerDao; -import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.sql.CustomerEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; @@ -31,12 +30,14 @@ import java.util.List; import java.util.Optional; import java.util.UUID; +import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; + /** * Created by Valerii Sosliuk on 5/6/2017. */ @Component @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) -public class JpaCustomerDao extends JpaAbstractSearchTextDao implements CustomerDao{ +public class JpaCustomerDao extends JpaAbstractSearchTextDao implements CustomerDao { @Autowired private CustomerRepository customerRepository; @@ -53,12 +54,8 @@ public class JpaCustomerDao extends JpaAbstractSearchTextDao findCustomersByTenantId(UUID tenantId, TextPageLink pageLink) { - if (pageLink.getIdOffset() == null) { - return DaoUtil.convertDataList(customerRepository.findByTenantIdFirstPage(pageLink.getLimit(), tenantId, pageLink.getTextSearch())); - } else { - return DaoUtil.convertDataList(customerRepository.findByTenantIdNextPage(pageLink.getLimit(), tenantId, - pageLink.getTextSearch(), pageLink.getIdOffset())); - } + return DaoUtil.convertDataList(customerRepository.findByTenantId(pageLink.getLimit(), tenantId, + pageLink.getTextSearch(), pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java index 868ec5e3a0..729e6980a9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java @@ -18,6 +18,7 @@ package org.thingsboard.server.dao.sql.dashboard; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.sql.DashboardInfoEntity; import java.util.List; @@ -29,23 +30,20 @@ import java.util.UUID; @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) public interface DashboardInfoRepository extends CrudRepository { - @Query(nativeQuery = true, value = "SELECT * FROM DASHBOARD WHERE TENANT_ID = ?2 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "ORDER BY ID LIMIT ?1") - List findByTenantIdFirstPage(int limit, UUID tenantId, String textSearch); + @Query(nativeQuery = true, value = "SELECT * FROM DASHBOARD WHERE TENANT_ID = :tenantId " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findByTenantId(@Param("limit") int limit, + @Param("tenantId") UUID tenantId, + @Param("textSearch") String textSearch, + @Param("idOffset") UUID idOffset); - @Query(nativeQuery = true, value = "SELECT * FROM DASHBOARD WHERE TENANT_ID = ?2 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "AND ID > ?4 ORDER BY ID LIMIT ?1") - List findByTenantIdNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); - - @Query(nativeQuery = true, value = "SELECT * FROM DASHBOARD WHERE TENANT_ID = ?2 " + - "AND CUSTOMER_ID = ?3 AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?4, '%')) " + - "ORDER BY ID LIMIT ?1") - List findByTenantIdAndCustomerIdFirstPage(int limit, UUID tenantId, UUID customerId, String textSearch); - - @Query(nativeQuery = true, value = "SELECT * FROM DASHBOARD WHERE TENANT_ID = ?2 " + - "AND CUSTOMER_ID = ?3 AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?4, '%')) " + - "AND ID > ?5 ORDER BY ID LIMIT ?1") - List findByTenantIdAndCustomerIdNextPage(int limit, UUID tenantId, UUID customerId, String textSearch, UUID idOffset); + @Query(nativeQuery = true, value = "SELECT * FROM DASHBOARD WHERE TENANT_ID = :tenantId " + + "AND CUSTOMER_ID = :customerId AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit?1") + List findByTenantIdAndCustomerId(@Param("limit") int limit, + @Param("tenantId") UUID tenantId, + @Param("customerId") UUID customerId, + @Param("textSearch") String textSearch, + @Param("idOffset") UUID idOffset); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java index 81f73092d5..77401c64c8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java @@ -29,7 +29,7 @@ import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import java.util.List; import java.util.UUID; -import static org.thingsboard.server.dao.model.ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME; +import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; /** * Created by Valerii Sosliuk on 5/6/2017. @@ -53,23 +53,22 @@ public class JpaDashboardInfoDao extends JpaAbstractSearchTextDao findDashboardsByTenantId(UUID tenantId, TextPageLink pageLink) { - if (pageLink.getIdOffset() == null) { - return DaoUtil.convertDataList(dashboardInfoRepository.findByTenantIdFirstPage( - pageLink.getLimit(), tenantId, pageLink.getTextSearch())); - } else { - return DaoUtil.convertDataList(dashboardInfoRepository.findByTenantIdNextPage( - pageLink.getLimit(), tenantId, pageLink.getTextSearch(), pageLink.getIdOffset())); - } + return DaoUtil.convertDataList(dashboardInfoRepository + .findByTenantId( + pageLink.getLimit(), + tenantId, + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); } @Override public List findDashboardsByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink) { - if (pageLink.getIdOffset() == null) { - return DaoUtil.convertDataList(dashboardInfoRepository.findByTenantIdAndCustomerIdFirstPage( - pageLink.getLimit(), tenantId, customerId, pageLink.getTextSearch())); - } else { - return DaoUtil.convertDataList(dashboardInfoRepository.findByTenantIdAndCustomerIdNextPage( - pageLink.getLimit(), tenantId, customerId, pageLink.getTextSearch(), pageLink.getIdOffset())); - } + return DaoUtil.convertDataList(dashboardInfoRepository + .findByTenantIdAndCustomerId( + pageLink.getLimit(), + tenantId, + customerId, + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java index 343efc43dc..0386aa86fc 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java @@ -19,11 +19,9 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; import org.thingsboard.server.dao.model.sql.DeviceEntity; -import org.thingsboard.server.dao.model.sql.TenantDeviceTypeProjection; +import org.thingsboard.server.dao.model.sql.TenantDeviceTypeEntity; -import java.util.Collection; import java.util.List; import java.util.UUID; @@ -74,12 +72,8 @@ public interface DeviceRepository extends CrudRepository { @Param("textSearch") String textSearch, @Param("idOffset") UUID idOffset); - // TODO: CAST was used because in other case when you try convert directly UUID field to UUID java object error throwed: - // org.hibernate.MappingException: No Dialect mapping for JDBC type: 1111 - // I suppose that Spring Projection doesn't support correct mapping for this type of column - // and only Entity at the moment supports UUID - @Query(value = "SELECT DISTINCT CAST(TENANT_ID as VARCHAR) as tenantId, TYPE as type FROM DEVICE", nativeQuery = true) - List findTenantDeviceTypes(); + @Query(value = "SELECT DISTINCT NEW org.thingsboard.server.dao.model.sql.TenantDeviceTypeEntity(d.tenantId, d.type) FROM DeviceEntity d") + List findTenantDeviceTypes(); DeviceEntity findByTenantIdAndName(UUID tenantId, String name); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java index 5904183f0d..455075c945 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java @@ -27,7 +27,7 @@ import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.device.DeviceDao; import org.thingsboard.server.dao.model.sql.DeviceEntity; -import org.thingsboard.server.dao.model.sql.TenantDeviceTypeProjection; +import org.thingsboard.server.dao.model.sql.TenantDeviceTypeEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import java.util.*; @@ -121,15 +121,15 @@ public class JpaDeviceDao extends JpaAbstractSearchTextDao @Override public ListenableFuture> findTenantDeviceTypesAsync() { - return service.submit(() -> convertTenantDeviceTypeToDto(deviceRepository.findTenantDeviceTypes())); + return service.submit(() -> convertTenantDeviceTypeEntityToDto(deviceRepository.findTenantDeviceTypes())); } - private List convertTenantDeviceTypeToDto(List resultSet) { + private List convertTenantDeviceTypeEntityToDto(List entities) { List list = Collections.emptyList(); - if (resultSet != null && !resultSet.isEmpty()) { + if (entities != null && !entities.isEmpty()) { list = new ArrayList<>(); - for (TenantDeviceTypeProjection object : resultSet) { - list.add(new TenantDeviceType(object.getType(), new TenantId(UUID.fromString(object.getTenantId())))); + for (TenantDeviceTypeEntity entity : entities) { + list.add(new TenantDeviceType(entity.getType(), new TenantId(entity.getTenantId()))); } } return list; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java index b0d9a712e7..82ccc62bc7 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java @@ -17,14 +17,10 @@ package org.thingsboard.server.dao.sql.event; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -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.common.data.Event; import org.thingsboard.server.dao.model.sql.EventEntity; -import java.util.List; import java.util.UUID; /** diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java index b4ad114a41..0463200241 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java @@ -25,16 +25,16 @@ 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.model.ModelConstants; import org.thingsboard.server.dao.model.sql.PluginMetaDataEntity; import org.thingsboard.server.dao.plugin.PluginDao; -import org.thingsboard.server.dao.sql.JpaAbstractDao; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import java.util.Arrays; import java.util.List; import java.util.UUID; +import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; + /** * Created by Valerii Sosliuk on 5/1/2017. */ @@ -93,15 +93,13 @@ public class JpaBasePluginDao extends JpaAbstractSearchTextDao findByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink) { - log.debug("Try to find здгпшты by tenantId [{}] and pageLink [{}]", tenantId, pageLink); - List entities; - if (pageLink.getIdOffset() == null) { - entities = pluginMetaDataRepository - .findByTenantIdAndPageLinkFirstPage(pageLink.getLimit(), tenantId.getId(), pageLink.getTextSearch()); - } else { - entities = pluginMetaDataRepository - .findByTenantIdAndPageLinkNextPage(pageLink.getLimit(), tenantId.getId(), pageLink.getTextSearch(), pageLink.getIdOffset()); - } + log.debug("Try to find plugins by tenantId [{}] and pageLink [{}]", tenantId, pageLink); + List entities = pluginMetaDataRepository + .findByTenantIdAndPageLink( + pageLink.getLimit(), + tenantId.getId(), + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset()); if (log.isTraceEnabled()) { log.trace("Search result: [{}]", Arrays.toString(entities.toArray())); } else { @@ -113,14 +111,13 @@ public class JpaBasePluginDao extends JpaAbstractSearchTextDao findAllTenantPluginsByTenantId(UUID tenantId, TextPageLink pageLink) { log.debug("Try to find all tenant plugins by tenantId [{}] and pageLink [{}]", tenantId, pageLink); - List entities; - if (pageLink.getIdOffset() == null) { - entities = pluginMetaDataRepository - .findAllTenantPluginsByTenantIdFirstPage(pageLink.getLimit(), tenantId, pageLink.getTextSearch()); - } else { - entities = pluginMetaDataRepository - .findAllTenantPluginsByTenantIdNextPage(pageLink.getLimit(), tenantId, pageLink.getTextSearch(), pageLink.getIdOffset()); - } + List entities = pluginMetaDataRepository + .findAllTenantPluginsByTenantId( + pageLink.getLimit(), + tenantId, + NULL_UUID, + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset()); if (log.isTraceEnabled()) { log.trace("Search result: [{}]", Arrays.toString(entities.toArray())); } else { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/PluginMetaDataRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/PluginMetaDataRepository.java index 315042b6c9..b21bfae1d1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/PluginMetaDataRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/PluginMetaDataRepository.java @@ -18,9 +18,8 @@ package org.thingsboard.server.dao.sql.plugin; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; -import org.thingsboard.server.common.data.plugin.PluginMetaData; +import org.springframework.data.repository.query.Param; import org.thingsboard.server.dao.model.sql.PluginMetaDataEntity; -import org.thingsboard.server.dao.model.sql.RuleMetaDataEntity; import java.util.List; import java.util.UUID; @@ -33,23 +32,20 @@ public interface PluginMetaDataRepository extends CrudRepository findByTenantIdAndPageLinkFirstPage(int limit, UUID tenantId, String textSearch); - - @Query(nativeQuery = true, value = "SELECT * FROM PLUGIN WHERE TENANT_ID = ?2 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "AND ID > ?4 ORDER BY ID LIMIT ?1") - List findByTenantIdAndPageLinkNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); - - @Query(nativeQuery = true, value = "SELECT * FROM PLUGIN WHERE (TENANT_ID = ?2 OR TENANT_ID IS NULL) " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "ORDER BY ID LIMIT ?1") - List findAllTenantPluginsByTenantIdFirstPage(int limit, UUID tenantId, String textSearch); - - @Query(nativeQuery = true, value = "SELECT * FROM PLUGIN WHERE (TENANT_ID = ?2 OR TENANT_ID IS NULL) " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "AND ID > ?4 ORDER BY ID LIMIT ?1") - List findAllTenantPluginsByTenantIdNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); + @Query(nativeQuery = true, value = "SELECT * FROM PLUGIN WHERE TENANT_ID = :tenantId " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findByTenantIdAndPageLink(@Param("limit") int limit, + @Param("tenantId") UUID tenantId, + @Param("textSearch") String textSearch, + @Param("idOffset") UUID idOffset); + + @Query(nativeQuery = true, value = "SELECT * FROM PLUGIN WHERE TENANT_ID IN (:tenantId, :nullTenantId) " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findAllTenantPluginsByTenantId(@Param("limit") int limit, + @Param("tenantId") UUID tenantId, + @Param("nullTenantId") UUID nullTenantId, + @Param("textSearch") String textSearch, + @Param("idOffset") UUID idOffset); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java index 5914257062..169612cfa1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java @@ -21,7 +21,6 @@ import com.google.common.util.concurrent.MoreExecutors; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.id.EntityId; @@ -32,10 +31,8 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.RelationCompositeKey; import org.thingsboard.server.dao.model.sql.RelationEntity; import org.thingsboard.server.dao.relation.RelationDao; -import org.thingsboard.server.dao.sql.JpaAbstractDao; import java.util.List; -import java.util.UUID; import java.util.concurrent.Executors; /** @@ -111,8 +108,9 @@ public class JpaRelationDao implements RelationDao { RelationCompositeKey key = new RelationCompositeKey(relation); return executorService.submit( () -> { + boolean relationExistsBeforeDelete = relationRepository.exists(key); relationRepository.delete(key); - return !relationRepository.exists(key); + return relationExistsBeforeDelete; }); } @@ -127,9 +125,9 @@ public class JpaRelationDao implements RelationDao { typeGroup.name()); return executorService.submit( () -> { - boolean result = relationRepository.exists(key); + boolean relationExistsBeforeDelete = relationRepository.exists(key); relationRepository.delete(key); - return result; + return relationExistsBeforeDelete; }); } @@ -141,16 +139,17 @@ public class JpaRelationDao implements RelationDao { return executorService.submit( () -> { - boolean result = relationRepository + boolean relationExistsBeforeDelete = relationRepository .findAllByFromIdAndFromType(relationEntity.getFromId(), relationEntity.getFromType()) .size() > 0; relationRepository.delete(relationEntity); - return result; + return relationExistsBeforeDelete; }); } @Override public ListenableFuture> findRelations(EntityId from, String relationType, RelationTypeGroup typeGroup, EntityType childType, TimePageLink pageLink) { +// TODO: // executorService.submit(() -> DaoUtil.convertDataList( // relationRepository.findRelations( // to.getId(), diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java index 5c8921a02c..68243d5aa5 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java @@ -15,29 +15,14 @@ */ package org.thingsboard.server.dao.sql.relation; -import com.datastax.driver.core.querybuilder.QueryBuilder; -import com.datastax.driver.core.querybuilder.Select; -import com.google.common.util.concurrent.ListenableFuture; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -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.common.data.id.EntityId; -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.CassandraAbstractSearchTimeDao; -import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.sql.RelationCompositeKey; import org.thingsboard.server.dao.model.sql.RelationEntity; -import java.util.Arrays; import java.util.List; import java.util.UUID; -import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; - @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") public interface RelationRepository extends CrudRepository { @@ -62,46 +47,19 @@ public interface RelationRepository extends CrudRepository findAllByFromIdAndFromType(UUID fromId, String fromType); - @Query(nativeQuery = true, value = "SELECT * FROM DEVICE WHERE TENANT_ID = :tenantId " + - "AND CUSTOMER_ID = :customerId " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:searchText, '%')) " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findRelations(@Param("fromId") UUID fromId, - @Param("fromType") String fromType, - @Param("toType") String toType, - @Param("relationType") String relationType, - @Param("relationTypeGroup") String relationTypeGroup, - TimePageLink pageLink); +// @Query(nativeQuery = true, value = "SELECT * FROM RELATION WHERE FROM_ID = :fromId " + +// "AND FROM_TYPE = :fromType " + +// "AND TO_TYPE = :toType " + +// "AND RELATION_TYPE = :relationType " + +// "AND RELATION_TYPE_GROUP = :relationTypeGroup " + +// "AND ID > :idOffset ORDER BY RELATION_TYPE_GROUP ASC, RELATION_TYPE ASC, TO_TYPE ASC") +// List findRelations(@Param("fromId") UUID fromId, +// @Param("fromType") String fromType, +// @Param("toType") String toType, +// @Param("relationType") String relationType, +// @Param("relationTypeGroup") String relationTypeGroup, +// TimePageLink pageLink); -// Select.Where query = CassandraAbstractSearchTimeDao.buildQuery(ModelConstants.RELATION_BY_TYPE_AND_CHILD_TYPE_VIEW_NAME, -// Arrays.asList(eq(ModelConstants.RELATION_FROM_ID_PROPERTY, from.getId()), -// eq(ModelConstants.RELATION_FROM_TYPE_PROPERTY, from.getEntityType().name()), -// eq(ModelConstants.RELATION_TYPE_GROUP_PROPERTY, typeGroup.name()), -// eq(ModelConstants.RELATION_TYPE_PROPERTY, relationType), -// eq(ModelConstants.RELATION_TO_TYPE_PROPERTY, childType.name())), -// Arrays.asList(QueryBuilder.asc(ModelConstants.RELATION_TYPE_GROUP_PROPERTY), -// QueryBuilder.asc(ModelConstants.RELATION_TYPE_PROPERTY), -// QueryBuilder.asc(ModelConstants.RELATION_TO_TYPE_PROPERTY)), // pageLink, ModelConstants.RELATION_TO_ID_PROPERTY); } - -// private UUID fromId; -// private String fromType; -// private UUID toId; -// private String toType; -// private String relationTypeGroup; -// private String relationType; -// -// -// ListenableFuture checkRelation(EntityId from, EntityId to, String relationType, RelationTypeGroup typeGroup); -// -// ListenableFuture saveRelation(EntityRelation relation); -// -// ListenableFuture deleteRelation(EntityRelation relation); -// -// ListenableFuture deleteRelation(EntityId from, EntityId to, String relationType, RelationTypeGroup typeGroup); -// -// ListenableFuture deleteOutboundRelations(EntityId entity); -// -// ListenableFuture> findRelations(EntityId from, String relationType, RelationTypeGroup typeGroup, EntityType toType, TimePageLink pageLink); \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java index b5e6bf556d..b1f53a93b7 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java @@ -25,16 +25,16 @@ 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.model.ModelConstants; import org.thingsboard.server.dao.model.sql.RuleMetaDataEntity; import org.thingsboard.server.dao.rule.RuleDao; -import org.thingsboard.server.dao.sql.JpaAbstractDao; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import java.util.Arrays; import java.util.List; import java.util.UUID; +import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; + /** * Created by Valerii Sosliuk on 4/30/2017. */ @@ -70,14 +70,13 @@ public class JpaBaseRuleDao extends JpaAbstractSearchTextDao findByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink) { log.debug("Try to find rules by tenantId [{}] and pageLink [{}]", tenantId, pageLink); - List entities; - if (pageLink.getIdOffset() == null) { - entities = ruleMetaDataRepository - .findByTenantIdAndPageLinkFirstPage(pageLink.getLimit(), tenantId.getId(), pageLink.getTextSearch()); - } else { - entities = ruleMetaDataRepository - .findByTenantIdAndPageLinkNextPage(pageLink.getLimit(), tenantId.getId(), pageLink.getTextSearch(), pageLink.getIdOffset()); - } + List entities = + ruleMetaDataRepository + .findByTenantIdAndPageLink( + pageLink.getLimit(), + tenantId.getId(), + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset()); if (log.isTraceEnabled()) { log.trace("Search result: [{}]", Arrays.toString(entities.toArray())); } else { @@ -89,14 +88,15 @@ public class JpaBaseRuleDao extends JpaAbstractSearchTextDao findAllTenantRulesByTenantId(UUID tenantId, TextPageLink pageLink) { log.debug("Try to find all tenant rules by tenantId [{}] and pageLink [{}]", tenantId, pageLink); - List entities; - if (pageLink.getIdOffset() == null) { - entities = ruleMetaDataRepository - .findAllTenantRulesByTenantIdFirstPage(pageLink.getLimit(), tenantId, pageLink.getTextSearch()); - } else { - entities = ruleMetaDataRepository - .findAllTenantRulesByTenantIdNextPage(pageLink.getLimit(), tenantId, pageLink.getTextSearch(), pageLink.getIdOffset()); - } + List entities = + ruleMetaDataRepository + .findAllTenantRulesByTenantId( + pageLink.getLimit(), + tenantId, + NULL_UUID, + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset()); + if (log.isTraceEnabled()) { log.trace("Search result: [{}]", Arrays.toString(entities.toArray())); } else { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleMetaDataRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleMetaDataRepository.java index 1a3b1439ce..0bf6742672 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleMetaDataRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleMetaDataRepository.java @@ -18,11 +18,9 @@ package org.thingsboard.server.dao.sql.rule; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; -import org.thingsboard.server.common.data.id.TenantId; -import org.thingsboard.server.dao.model.ToData; +import org.springframework.data.repository.query.Param; import org.thingsboard.server.dao.model.sql.RuleMetaDataEntity; -import java.util.Collection; import java.util.List; import java.util.UUID; @@ -34,23 +32,20 @@ public interface RuleMetaDataRepository extends CrudRepository findByPluginToken(String pluginToken); - @Query(nativeQuery = true, value = "SELECT * FROM RULE WHERE TENANT_ID = ?2 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "ORDER BY ID LIMIT ?1") - List findByTenantIdAndPageLinkFirstPage(int limit, UUID tenantId, String textSearch); - - @Query(nativeQuery = true, value = "SELECT * FROM RULE WHERE TENANT_ID = ?2 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "AND ID > ?4 ORDER BY ID LIMIT ?1") - List findByTenantIdAndPageLinkNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); - - @Query(nativeQuery = true, value = "SELECT * FROM RULE WHERE (TENANT_ID = ?2 OR TENANT_ID IS NULL) " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "ORDER BY ID LIMIT ?1") - List findAllTenantRulesByTenantIdFirstPage(int limit, UUID tenantId, String textSearch); - - @Query(nativeQuery = true, value = "SELECT * FROM RULE WHERE (TENANT_ID = ?2 OR TENANT_ID IS NULL) " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "AND ID > ?4 ORDER BY ID LIMIT ?1") - List findAllTenantRulesByTenantIdNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); + @Query(nativeQuery = true, value = "SELECT * FROM RULE WHERE TENANT_ID = :tenantId " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findByTenantIdAndPageLink(@Param("limit") int limit, + @Param("tenantId") UUID tenantId, + @Param("textSearch") String textSearch, + @Param("idOffset") UUID idOffset); + + @Query(nativeQuery = true, value = "SELECT * FROM RULE WHERE TENANT_ID IN (:tenantId, :nullTenantId) " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findAllTenantRulesByTenantId(@Param("limit") int limit, + @Param("tenantId") UUID tenantId, + @Param("nullTenantId") UUID nullTenantId, + @Param("textSearch") String textSearch, + @Param("idOffset") UUID idOffset); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/AdminSettingsRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/AdminSettingsRepository.java index 5862c359b6..2aa26a2daa 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/AdminSettingsRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/AdminSettingsRepository.java @@ -16,7 +16,6 @@ package org.thingsboard.server.dao.sql.settings; import org.springframework.data.repository.CrudRepository; -import org.thingsboard.server.dao.model.ToData; import org.thingsboard.server.dao.model.sql.AdminSettingsEntity; import java.util.UUID; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java index 10dab03e57..e31c5d0569 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java @@ -28,8 +28,6 @@ import org.thingsboard.server.dao.sql.JpaAbstractDao; import java.util.UUID; -import static org.thingsboard.server.dao.model.ModelConstants.ADMIN_SETTINGS_COLUMN_FAMILY_NAME; - @Component @Slf4j @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java index f2feef25f5..e434431ec3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java @@ -23,14 +23,13 @@ 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.model.sql.TenantEntity; -import org.thingsboard.server.dao.sql.JpaAbstractDao; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import org.thingsboard.server.dao.tenant.TenantDao; import java.util.List; import java.util.UUID; -import static org.thingsboard.server.dao.model.ModelConstants.TENANT_COLUMN_FAMILY_NAME; +import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; /** * Created by Valerii Sosliuk on 4/30/2017. @@ -54,10 +53,11 @@ public class JpaTenantDao extends JpaAbstractSearchTextDao @Override public List findTenantsByRegion(String region, TextPageLink pageLink) { - if (pageLink.getIdOffset() == null) { - return DaoUtil.convertDataList(tenantRepository.findByRegionFirstPage(pageLink.getLimit(), region, pageLink.getTextSearch())); - } else { - return DaoUtil.convertDataList(tenantRepository.findByRegionNextPage(pageLink.getLimit(), region, pageLink.getTextSearch(), pageLink.getIdOffset())); - } + return DaoUtil.convertDataList(tenantRepository + .findByRegionNextPage( + pageLink.getLimit(), + region, + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java index 6c94072305..8c6a9546c3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java @@ -18,6 +18,7 @@ package org.thingsboard.server.dao.sql.tenant; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.sql.TenantEntity; import java.util.List; @@ -29,15 +30,11 @@ import java.util.UUID; @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) public interface TenantRepository extends CrudRepository { - - @Query(nativeQuery = true, value = "SELECT * FROM TENANT WHERE REGION = ?2 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "ORDER BY ID LIMIT ?1") - List findByRegionFirstPage(int limit, String region, String textSearch); - - - @Query(nativeQuery = true, value = "SELECT * FROM TENANT WHERE REGION = ?2 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "AND ID > ?4 ORDER BY ID LIMIT ?1") - List findByRegionNextPage(int limit, String region, String textSearch, UUID idOffset); + @Query(nativeQuery = true, value = "SELECT * FROM TENANT WHERE REGION = :region " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findByRegionNextPage(@Param("limit") int limit, + @Param("region") String region, + @Param("textSearch") String textSearch, + @Param("idOffset") UUID idOffset); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java index 1a3c6eaf2d..ec1e6740e3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java @@ -22,7 +22,6 @@ import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.dao.DaoUtil; -import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.sql.UserEntity; import org.thingsboard.server.dao.sql.JpaAbstractDao; import org.thingsboard.server.dao.user.UserDao; @@ -30,6 +29,8 @@ import org.thingsboard.server.dao.user.UserDao; import java.util.List; import java.util.UUID; +import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; + /** * @author Valerii Sosliuk */ @@ -57,20 +58,22 @@ public class JpaUserDao extends JpaAbstractDao implements User @Override public List findTenantAdmins(UUID tenantId, TextPageLink pageLink) { - if (pageLink.getIdOffset() == null) { - return DaoUtil.convertDataList(userRepository.findTenantAdminsFirstPage(pageLink.getLimit(), tenantId)); - } else { - return DaoUtil.convertDataList(userRepository.findTenantAdminsNextPage(pageLink.getLimit(), tenantId, pageLink.getIdOffset())); - } + return DaoUtil.convertDataList( + userRepository + .findTenantAdmins( + pageLink.getLimit(), + tenantId, + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); } @Override public List findCustomerUsers(UUID tenantId, UUID customerId, TextPageLink pageLink) { - if (pageLink.getIdOffset() == null) { - return DaoUtil.convertDataList(userRepository.findCustomerUsersFirstPage(pageLink.getLimit(), tenantId, customerId)); - } else { - return DaoUtil.convertDataList(userRepository.findCustomerUsersNextPage(pageLink.getLimit(), tenantId, - customerId, pageLink.getIdOffset())); - } + return DaoUtil.convertDataList( + userRepository + .findCustomerUsers( + pageLink.getLimit(), + tenantId, + customerId, + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java index b7d3aa7016..f9d280249c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java @@ -18,6 +18,7 @@ package org.thingsboard.server.dao.sql.user; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.sql.UserEntity; import java.util.List; @@ -31,24 +32,19 @@ public interface UserRepository extends CrudRepository { UserEntity findByEmail(String email); - @Query(nativeQuery = true, value = "SELECT * FROM TB_USER WHERE TENANT_ID = ?2 " + + @Query(nativeQuery = true, value = "SELECT * FROM TB_USER WHERE TENANT_ID = :tenantId " + "AND CUSTOMER_ID IS NULL AND AUTHORITY = 'TENANT_ADMIN' " + - "ORDER BY ID LIMIT ?1") - List findTenantAdminsFirstPage(int limit, UUID tenantId); - - @Query(nativeQuery = true, value = "SELECT * FROM TB_USER WHERE TENANT_ID = ?2 " + - "AND CUSTOMER_ID IS NULL AND AUTHORITY = 'TENANT_ADMIN' " + - "AND ID > ?3 ORDER BY ID LIMIT ?1") - List findTenantAdminsNextPage(int limit, UUID tenantId, UUID idOffset); - - @Query(nativeQuery = true, value = "SELECT * FROM TB_USER WHERE TENANT_ID = ?2 " + - "AND CUSTOMER_ID = ?3 AND AUTHORITY = 'CUSTOMER_USER' " + - "ORDER BY ID LIMIT ?1") - List findCustomerUsersFirstPage(int limit, UUID tenantId, UUID customerId); - - @Query(nativeQuery = true, value = "SELECT * FROM TB_USER WHERE TENANT_ID = ?2 " + - "AND CUSTOMER_ID = ?3 AND AUTHORITY = 'CUSTOMER_USER' " + - "AND ID > ?4 ORDER BY ID LIMIT ?1") - List findCustomerUsersNextPage(int limit, UUID tenantId, UUID customerId, UUID idOffset); + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findTenantAdmins(@Param("limit") int limit, + @Param("tenantId") UUID tenantId, + @Param("idOffset") UUID idOffset); + + @Query(nativeQuery = true, value = "SELECT * FROM TB_USER WHERE TENANT_ID = :tenantId " + + "AND CUSTOMER_ID = :customerId AND AUTHORITY = 'CUSTOMER_USER' " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findCustomerUsers(@Param("limit") int limit, + @Param("tenantId") UUID tenantId, + @Param("customerId") UUID customerId, + @Param("idOffset") UUID idOffset); } \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java index fab9955d97..670bd7fc8f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java @@ -58,34 +58,35 @@ public class JpaWidgetsBundleDao extends JpaAbstractSearchTextDao findSystemWidgetsBundles(TextPageLink pageLink) { - if (pageLink.getIdOffset() == null) { - return DaoUtil.convertDataList(widgetsBundleRepository.findSystemWidgetsBundlesFirstPage(pageLink.getLimit(), - pageLink.getTextSearch(), NULL_UUID)); - } else { - return DaoUtil.convertDataList(widgetsBundleRepository.findSystemWidgetsBundlesNextPage(pageLink.getLimit(), - pageLink.getTextSearch(), pageLink.getIdOffset(), NULL_UUID)); - } + return DaoUtil.convertDataList( + widgetsBundleRepository + .findSystemWidgetsBundles( + pageLink.getLimit(), + NULL_UUID, + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); } @Override public List findTenantWidgetsBundlesByTenantId(UUID tenantId, TextPageLink pageLink) { - if (pageLink.getIdOffset() == null) { - return DaoUtil.convertDataList(widgetsBundleRepository.findTenantWidgetsBundlesByTenantIdFirstPage(pageLink.getLimit(), - tenantId, pageLink.getTextSearch())); - } else { - return DaoUtil.convertDataList(widgetsBundleRepository.findTenantWidgetsBundlesByTenantIdNextPage(pageLink.getLimit(), - tenantId, pageLink.getTextSearch(), pageLink.getIdOffset())); - } + return DaoUtil.convertDataList( + widgetsBundleRepository + .findTenantWidgetsBundlesByTenantId( + pageLink.getLimit(), + tenantId, + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); } @Override public List findAllTenantWidgetsBundlesByTenantId(UUID tenantId, TextPageLink pageLink) { - if (pageLink.getIdOffset() == null) { - return DaoUtil.convertDataList(widgetsBundleRepository.findAllTenantWidgetsBundlesByTenantIdFirstPage(pageLink.getLimit(), - tenantId, pageLink.getTextSearch())); - } else { - return DaoUtil.convertDataList(widgetsBundleRepository.findAllTenantWidgetsBundlesByTenantIdNextPage(pageLink.getLimit(), - tenantId, pageLink.getTextSearch(), pageLink.getIdOffset())); - } + return DaoUtil.convertDataList( + widgetsBundleRepository + .findAllTenantWidgetsBundlesByTenantId( + pageLink.getLimit(), + tenantId, + NULL_UUID, + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java index 9341a841ee..1998a55cda 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java @@ -18,6 +18,7 @@ package org.thingsboard.server.dao.sql.widget; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.sql.WidgetsBundleEntity; import java.util.List; @@ -31,33 +32,28 @@ public interface WidgetsBundleRepository extends CrudRepository findSystemWidgetsBundlesFirstPage(Integer limit, String searchText, UUID tenantId); - - @Query(nativeQuery = true, value = "SELECT * FROM WIDGETS_BUNDLE WHERE TENANT_ID = ?4 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?2, '%')) " + - "AND ID > ?3 ORDER BY ID LIMIT ?1") - List findSystemWidgetsBundlesNextPage(Integer limit, String searchText, UUID idOffset, UUID tenantId); - - @Query(nativeQuery = true, value = "SELECT * FROM WIDGETS_BUNDLE WHERE TENANT_ID = ?2 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "ORDER BY ID LIMIT ?1") - List findTenantWidgetsBundlesByTenantIdFirstPage(int limit, UUID tenantId, String textSearch); - - @Query(nativeQuery = true, value = "SELECT * FROM WIDGETS_BUNDLE WHERE TENANT_ID = ?2 " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "AND ID > ?4 ORDER BY ID LIMIT ?1") - List findTenantWidgetsBundlesByTenantIdNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); - - @Query(nativeQuery = true, value = "SELECT * FROM WIDGETS_BUNDLE WHERE (TENANT_ID IS NULL OR TENANT_ID = ?2) " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "ORDER BY ID LIMIT ?1") - List findAllTenantWidgetsBundlesByTenantIdFirstPage(int limit, UUID tenantId, String textSearch); - - @Query(nativeQuery = true, value = "SELECT * FROM WIDGETS_BUNDLE WHERE (TENANT_ID IS NULL OR TENANT_ID = ?2) " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(?3, '%')) " + - "AND ID > ?4 ORDER BY ID LIMIT ?1") - List findAllTenantWidgetsBundlesByTenantIdNextPage(int limit, UUID tenantId, String textSearch, UUID idOffset); + @Query(nativeQuery = true, value = "SELECT * FROM WIDGETS_BUNDLE WHERE TENANT_ID = :systemTenantId " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:searchText, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findSystemWidgetsBundles(@Param("limit") int limit, + @Param("systemTenantId") UUID systemTenantId, + @Param("searchText") String searchText, + @Param("idOffset") UUID idOffset); + + @Query(nativeQuery = true, value = "SELECT * FROM WIDGETS_BUNDLE WHERE TENANT_ID = :tenantId " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findTenantWidgetsBundlesByTenantId(@Param("limit") int limit, + @Param("tenantId") UUID tenantId, + @Param("textSearch") String textSearch, + @Param("idOffset") UUID idOffset); + + @Query(nativeQuery = true, value = "SELECT * FROM WIDGETS_BUNDLE WHERE TENANT_ID IN (:tenantId, :nullTenantId) " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND ID > :idOffset ORDER BY ID LIMIT :limit") + List findAllTenantWidgetsBundlesByTenantId(@Param("limit") int limit, + @Param("tenantId") UUID tenantId, + @Param("nullTenantId") UUID nullTenantId, + @Param("textSearch") String textSearch, + @Param("idOffset") UUID idOffset); } diff --git a/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java index f6b6b7353b..c8e715fdaa 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java @@ -32,7 +32,8 @@ import org.springframework.test.context.support.DirtiesContextTestExecutionListe @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = {JpaDaoConfig.class, JpaDbunitTestConfig.class}) @TestPropertySource("classpath:jpa-test.properties") -@TestExecutionListeners({ DependencyInjectionTestExecutionListener.class, +@TestExecutionListeners({ + DependencyInjectionTestExecutionListener.class, DirtiesContextTestExecutionListener.class, DbUnitTestExecutionListener.class }) @DbUnitConfiguration(databaseConnection = "dbUnitDatabaseConnection") diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java index 95340e6b76..a73ee52424 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java @@ -22,7 +22,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; @@ -68,7 +67,6 @@ import java.util.concurrent.ThreadLocalRandom; @TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:application-test.properties"}) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) @Configuration -@EnableAutoConfiguration @ComponentScan("org.thingsboard.server") public abstract class AbstractServiceTest { diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java index b26db0bb97..ad0c9cf602 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java @@ -15,8 +15,6 @@ */ package org.thingsboard.server.dao.sql.alarm; -import com.datastax.driver.core.utils.UUIDs; -import com.github.springtestdbunit.annotation.DatabaseSetup; import com.google.common.util.concurrent.ListenableFuture; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -25,7 +23,6 @@ import org.thingsboard.server.common.data.alarm.Alarm; import org.thingsboard.server.common.data.alarm.AlarmId; import org.thingsboard.server.common.data.alarm.AlarmStatus; import org.thingsboard.server.common.data.id.DeviceId; -import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.dao.AbstractJpaDaoTest; import org.thingsboard.server.dao.alarm.AlarmDao; From 29ae5b504c1751e1a1315da4d774396d1ed136c5 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Wed, 7 Jun 2017 20:14:16 +0300 Subject: [PATCH 44/69] Fixed repository parent --- .../org/thingsboard/server/dao/sql/alarm/AlarmRepository.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java index 6e6ceebf7d..948ee9cede 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java @@ -17,7 +17,7 @@ package org.thingsboard.server.dao.sql.alarm; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.PagingAndSortingRepository; +import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; import org.thingsboard.server.dao.model.sql.AlarmEntity; @@ -27,7 +27,7 @@ import java.util.UUID; * Created by Valerii Sosliuk on 5/21/2017. */ @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) -public interface AlarmRepository extends PagingAndSortingRepository { +public interface AlarmRepository extends CrudRepository { @Query(nativeQuery = true, value = "SELECT * FROM ALARM WHERE TENANT_ID = :tenantId AND ORIGINATOR_ID = :originatorId " + "AND ORIGINATOR_TYPE = :entityType AND TYPE = :alarmType ORDER BY TYPE ASC, ID DESC LIMIT 1") From cb41480be717ab7e64636d9f7879b6027bef35e4 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Thu, 8 Jun 2017 10:55:31 +0300 Subject: [PATCH 45/69] Added findRelations impl. Minor fixes --- dao/pom.xml | 1 + .../server/dao/CassandraAbstractModelDao.java | 8 +-- .../dao/CassandraAbstractSearchTextDao.java | 9 ++- .../dao/sql/JpaAbstractSearchTimeDao.java | 22 +++---- .../server/dao/sql/event/JpaBaseEventDao.java | 6 +- .../dao/sql/relation/JpaRelationDao.java | 61 ++++++++++++++++--- .../dao/sql/relation/RelationRepository.java | 20 +----- 7 files changed, 79 insertions(+), 48 deletions(-) diff --git a/dao/pom.xml b/dao/pom.xml index 9ab0b62611..4cddf8ba91 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -172,6 +172,7 @@ com.h2database h2 + test diff --git a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractModelDao.java b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractModelDao.java index 0fba69c0c8..5d372b1ecd 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractModelDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractModelDao.java @@ -47,8 +47,8 @@ public abstract class CassandraAbstractModelDao, D> exte protected abstract String getColumnFamilyName(); - protected boolean isSearchTextDao() { - return false; + protected E updateSearchTextIfPresent(E entity) { + return entity; } protected Mapper getMapper() { @@ -153,9 +153,7 @@ public abstract class CassandraAbstractModelDao, D> exte log.error("Can't create entity for domain object {}", domain, e); throw new IllegalArgumentException("Can't create entity for domain object {" + domain + "}", e); } - if (isSearchTextDao()) { - ((SearchTextEntity) entity).setSearchText(((SearchTextEntity) entity).getSearchTextSource().toLowerCase()); - } + entity = updateSearchTextIfPresent(entity); log.debug("Saving entity {}", entity); entity = saveWithResult(entity).getEntity(); return DaoUtil.getData(entity); diff --git a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTextDao.java b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTextDao.java index 735dd3050c..89c3583040 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTextDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTextDao.java @@ -34,8 +34,13 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.select; public abstract class CassandraAbstractSearchTextDao, D> extends CassandraAbstractModelDao { @Override - protected boolean isSearchTextDao() { - return true; + protected E updateSearchTextIfPresent(E entity) { + if (entity.getSearchTextSource() != null) { + entity.setSearchText(entity.getSearchTextSource().toLowerCase()); + } else { + log.trace("Entity [{}] has null SearchTextSource", entity); + } + return entity; } protected List findPageWithTextSearch(String searchView, List clauses, TextPageLink pageLink) { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTimeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTimeDao.java index 594de17c68..b86fab0996 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTimeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTimeDao.java @@ -34,43 +34,41 @@ import java.util.UUID; */ public abstract class JpaAbstractSearchTimeDao, D> extends JpaAbstractDao { - protected Specification getTimeSearchPageSpec(TimePageLink pageLink) { - return new Specification() { + public static Specification getTimeSearchPageSpec(TimePageLink pageLink, String idColumn) { + return new Specification() { @Override - public Predicate toPredicate(Root root, CriteriaQuery criteriaQuery, CriteriaBuilder criteriaBuilder) { - Predicate lowerBound = null; - Predicate upperBound = null; + public Predicate toPredicate(Root root, CriteriaQuery criteriaQuery, CriteriaBuilder criteriaBuilder) { List predicates = new ArrayList<>(); if (pageLink.isAscOrder()) { if (pageLink.getIdOffset() != null) { - lowerBound = criteriaBuilder.greaterThan(root.get(ID_PROPERTY), pageLink.getIdOffset()); + Predicate lowerBound = criteriaBuilder.greaterThan(root.get(idColumn), pageLink.getIdOffset()); predicates.add(lowerBound); } else if (pageLink.getStartTime() != null) { UUID startOf = UUIDs.startOf(pageLink.getStartTime()); - lowerBound = criteriaBuilder.greaterThanOrEqualTo(root.get(ID_PROPERTY), startOf); + Predicate lowerBound = criteriaBuilder.greaterThanOrEqualTo(root.get(idColumn), startOf); predicates.add(lowerBound); } if (pageLink.getEndTime() != null) { UUID endOf = UUIDs.endOf(pageLink.getEndTime()); - upperBound = criteriaBuilder.lessThanOrEqualTo(root.get(ID_PROPERTY), endOf); + Predicate upperBound = criteriaBuilder.lessThanOrEqualTo(root.get(idColumn), endOf); predicates.add(upperBound); } } else { if (pageLink.getIdOffset() != null) { - lowerBound = criteriaBuilder.lessThan(root.get(ID_PROPERTY), pageLink.getIdOffset()); + Predicate lowerBound = criteriaBuilder.lessThan(root.get(idColumn), pageLink.getIdOffset()); predicates.add(lowerBound); } else if (pageLink.getEndTime() != null) { UUID endOf = UUIDs.endOf(pageLink.getEndTime()); - lowerBound = criteriaBuilder.lessThanOrEqualTo(root.get(ID_PROPERTY), endOf); + Predicate lowerBound = criteriaBuilder.lessThanOrEqualTo(root.get(idColumn), endOf); predicates.add(lowerBound); } if (pageLink.getStartTime() != null) { UUID startOf = UUIDs.startOf(pageLink.getStartTime()); - upperBound = criteriaBuilder.greaterThanOrEqualTo(root.get(ID_PROPERTY), startOf); + Predicate upperBound = criteriaBuilder.greaterThanOrEqualTo(root.get(idColumn), startOf); predicates.add(upperBound); } } - return criteriaBuilder.and(predicates.toArray(new Predicate[0])); + return criteriaBuilder.and(predicates.toArray(new Predicate[0])); } }; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java index 9cde87e8f8..649a201c15 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java @@ -100,7 +100,7 @@ public class JpaBaseEventDao extends JpaAbstractSearchTimeDao findEvents(UUID tenantId, EntityId entityId, String eventType, TimePageLink pageLink) { - Specification timeSearchSpec = getTimeSearchPageSpec(pageLink); + Specification timeSearchSpec = JpaAbstractSearchTimeDao.getTimeSearchPageSpec(pageLink, ID_PROPERTY); Specification fieldsSpec = getEntityFieldsSpec(tenantId, entityId, eventType); Sort.Direction sortDirection = pageLink.isAscOrder() ? Sort.Direction.ASC : Sort.Direction.DESC; Pageable pageable = new PageRequest(0, pageLink.getLimit(), sortDirection, ID_PROPERTY); @@ -136,15 +136,15 @@ public class JpaBaseEventDao extends JpaAbstractSearchTimeDao> findRelations(EntityId from, String relationType, RelationTypeGroup typeGroup, EntityType childType, TimePageLink pageLink) { -// TODO: -// executorService.submit(() -> DaoUtil.convertDataList( -// relationRepository.findRelations( -// to.getId(), -// to.getEntityType().name(), -// relationType, -// typeGroup.name()))); - return null; + Specification timeSearchSpec = JpaAbstractSearchTimeDao.getTimeSearchPageSpec(pageLink, RELATION_TO_ID_PROPERTY); + Specification fieldsSpec = getEntityFieldsSpec(from, relationType, typeGroup, childType); + Pageable pageable = new PageRequest(0, pageLink.getLimit(), + new Sort( + new Order(ASC, RELATION_TYPE_GROUP_PROPERTY), + new Order(ASC, RELATION_TYPE_PROPERTY), + new Order(ASC, RELATION_TO_TYPE_PROPERTY)) + ); + return executorService.submit(() -> + DaoUtil.convertDataList(relationRepository.findAll(where(timeSearchSpec).and(fieldsSpec), pageable).getContent())); } - + private Specification getEntityFieldsSpec(EntityId from, String relationType, RelationTypeGroup typeGroup, EntityType childType) { + return new Specification() { + @Override + public Predicate toPredicate(Root root, CriteriaQuery criteriaQuery, CriteriaBuilder criteriaBuilder) { + List predicates = new ArrayList<>(); + if (from != null) { + Predicate fromIdPredicate = criteriaBuilder.equal(root.get(RELATION_FROM_ID_PROPERTY), from.getId()); + predicates.add(fromIdPredicate); + Predicate fromEntityTypePredicate = criteriaBuilder.equal(root.get(RELATION_FROM_TYPE_PROPERTY), from.getEntityType().name()); + predicates.add(fromEntityTypePredicate); + } + if (relationType != null) { + Predicate relationTypePredicate = criteriaBuilder.equal(root.get(RELATION_TYPE_PROPERTY), relationType); + predicates.add(relationTypePredicate); + } + if (typeGroup != null) { + Predicate typeGroupPredicate = criteriaBuilder.equal(root.get(RELATION_TYPE_GROUP_PROPERTY), typeGroup); + predicates.add(typeGroupPredicate); + } + if (childType != null) { + Predicate childTypePredicate = criteriaBuilder.equal(root.get(RELATION_TO_TYPE_PROPERTY), childType.name()); + predicates.add(childTypePredicate); + } + return criteriaBuilder.and(predicates.toArray(new Predicate[0])); + } + }; + } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java index 68243d5aa5..d995b854d1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java @@ -16,6 +16,7 @@ package org.thingsboard.server.dao.sql.relation; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.repository.CrudRepository; import org.thingsboard.server.dao.model.sql.RelationCompositeKey; import org.thingsboard.server.dao.model.sql.RelationEntity; @@ -24,7 +25,8 @@ import java.util.List; import java.util.UUID; @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") -public interface RelationRepository extends CrudRepository { +public interface RelationRepository + extends CrudRepository, JpaSpecificationExecutor { List findAllByFromIdAndFromTypeAndRelationTypeGroup(UUID fromId, String fromType, @@ -46,20 +48,4 @@ public interface RelationRepository extends CrudRepository findAllByFromIdAndFromType(UUID fromId, String fromType); - -// @Query(nativeQuery = true, value = "SELECT * FROM RELATION WHERE FROM_ID = :fromId " + -// "AND FROM_TYPE = :fromType " + -// "AND TO_TYPE = :toType " + -// "AND RELATION_TYPE = :relationType " + -// "AND RELATION_TYPE_GROUP = :relationTypeGroup " + -// "AND ID > :idOffset ORDER BY RELATION_TYPE_GROUP ASC, RELATION_TYPE ASC, TO_TYPE ASC") -// List findRelations(@Param("fromId") UUID fromId, -// @Param("fromType") String fromType, -// @Param("toType") String toType, -// @Param("relationType") String relationType, -// @Param("relationTypeGroup") String relationTypeGroup, -// TimePageLink pageLink); - - -// pageLink, ModelConstants.RELATION_TO_ID_PROPERTY); } From 79623fbd3dd1cd741a88b26a657e45759737b024 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Fri, 9 Jun 2017 19:07:30 +0300 Subject: [PATCH 46/69] Refactored attributes dao --- .../plugin/PluginProcessingContext.java | 12 +++++------ .../server/dao/CassandraAbstractAsyncDao.java | 16 +++++++++++++++ .../server/dao/CassandraAbstractDao.java | 1 - .../server/dao/attributes/AttributesDao.java | 6 ++---- .../dao/attributes/AttributesService.java | 8 ++------ .../dao/attributes/BaseAttributesService.java | 6 +++--- .../CassandraBaseAttributesDao.java | 20 +++++++++++++------ .../server/dao/relation/BaseRelationDao.java | 10 ---------- .../dao/sql/attributes/JpaAttributesDao.java | 6 ++---- .../dao/sql/timeseries/JpaTimeseriesDao.java | 4 ++-- 10 files changed, 47 insertions(+), 42 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java index 7d986a12a3..701f585e77 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java @@ -93,8 +93,8 @@ public final class PluginProcessingContext implements PluginContext { @Override public void saveAttributes(final TenantId tenantId, final EntityId entityId, final String scope, final List attributes, final PluginCallback callback) { validate(entityId, new ValidationCallback(callback, ctx -> { - ListenableFuture> rsListFuture = pluginCtx.attributesService.save(entityId, scope, attributes); - Futures.addCallback(rsListFuture, getListCallback(callback, v -> { + ListenableFuture> attrKvListFuture = pluginCtx.attributesService.save(entityId, scope, attributes); + Futures.addCallback(attrKvListFuture, getListCallback(callback, v -> { if (entityId.getEntityType() == EntityType.DEVICE) { onDeviceAttributesChanged(tenantId, new DeviceId(entityId.getId()), scope, attributes); } @@ -106,7 +106,7 @@ public final class PluginProcessingContext implements PluginContext { @Override public void removeAttributes(final TenantId tenantId, final EntityId entityId, final String scope, final List keys, final PluginCallback callback) { validate(entityId, new ValidationCallback(callback, ctx -> { - ListenableFuture> future = pluginCtx.attributesService.removeAll(entityId, scope, keys); + ListenableFuture> future = pluginCtx.attributesService.removeAll(entityId, scope, keys); Futures.addCallback(future, getCallback(callback, v -> null), executor); if (entityId.getEntityType() == EntityType.DEVICE) { onDeviceAttributesDeleted(tenantId, new DeviceId(entityId.getId()), keys.stream().map(key -> new AttributeKey(scope, key)).collect(Collectors.toSet())); @@ -235,10 +235,10 @@ public final class PluginProcessingContext implements PluginContext { pluginCtx.toDeviceActor(DeviceAttributesEventNotificationMsg.onUpdate(tenantId, deviceId, scope, values)); } - private FutureCallback> getListCallback(final PluginCallback callback, Function, T> transformer) { - return new FutureCallback>() { + private FutureCallback> getListCallback(final PluginCallback callback, Function, R> transformer) { + return new FutureCallback>() { @Override - public void onSuccess(@Nullable List result) { + public void onSuccess(@Nullable List result) { pluginCtx.self().tell(PluginCallbackMessage.onSuccess(callback, transformer.apply(result)), ActorRef.noSender()); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractAsyncDao.java b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractAsyncDao.java index f241f2ca8b..d61218f012 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractAsyncDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractAsyncDao.java @@ -15,6 +15,13 @@ */ package org.thingsboard.server.dao; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.ResultSetFuture; +import com.google.common.base.Function; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; + +import javax.annotation.Nullable; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import java.util.concurrent.ExecutorService; @@ -39,4 +46,13 @@ public abstract class CassandraAbstractAsyncDao extends CassandraAbstractDao { } } + protected ListenableFuture getFuture(ResultSetFuture future, java.util.function.Function transformer) { + return Futures.transform(future, new Function() { + @Nullable + @Override + public T apply(@Nullable ResultSet input) { + return transformer.apply(input); + } + }, readResultsProcessingExecutor); + } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractDao.java index bd7346acf3..8bb44bf4af 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractDao.java @@ -66,7 +66,6 @@ public abstract class CassandraAbstractDao { return execute(statement, defaultWriteLevel); } - protected ResultSetFuture executeAsyncRead(Statement statement) { return executeAsync(statement, defaultReadLevel); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java index ae58d4d9c6..4f0af49f41 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java @@ -15,8 +15,6 @@ */ package org.thingsboard.server.dao.attributes; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.ResultSetFuture; import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.kv.AttributeKvEntry; @@ -36,7 +34,7 @@ public interface AttributesDao { ListenableFuture> findAll(EntityId entityId, String attributeType); - ResultSetFuture save(EntityId entityId, String attributeType, AttributeKvEntry attribute); + ListenableFuture save(EntityId entityId, String attributeType, AttributeKvEntry attribute); - ListenableFuture> removeAll(EntityId entityId, String scope, List keys); + ListenableFuture> removeAll(EntityId entityId, String scope, List keys); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java index 6bf9fb2bd5..6090fa9349 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesService.java @@ -15,12 +15,8 @@ */ package org.thingsboard.server.dao.attributes; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.ResultSetFuture; import com.google.common.util.concurrent.ListenableFuture; -import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.EntityId; -import org.thingsboard.server.common.data.id.UUIDBased; import org.thingsboard.server.common.data.kv.AttributeKvEntry; import java.util.Collection; @@ -38,7 +34,7 @@ public interface AttributesService { ListenableFuture> findAll(EntityId entityId, String scope); - ListenableFuture> save(EntityId entityId, String scope, List attributes); + ListenableFuture> save(EntityId entityId, String scope, List attributes); - ListenableFuture> removeAll(EntityId entityId, String scope, List attributeKeys); + ListenableFuture> removeAll(EntityId entityId, String scope, List attributeKeys); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java index da4611973d..bef2faa37f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java @@ -61,10 +61,10 @@ public class BaseAttributesService implements AttributesService { } @Override - public ListenableFuture> save(EntityId entityId, String scope, List attributes) { + public ListenableFuture> save(EntityId entityId, String scope, List attributes) { validate(entityId, scope); attributes.forEach(attribute -> validate(attribute)); - List futures = Lists.newArrayListWithExpectedSize(attributes.size()); + List> futures = Lists.newArrayListWithExpectedSize(attributes.size()); for (AttributeKvEntry attribute : attributes) { futures.add(attributesDao.save(entityId, scope, attribute)); } @@ -72,7 +72,7 @@ public class BaseAttributesService implements AttributesService { } @Override - public ListenableFuture> removeAll(EntityId entityId, String scope, List keys) { + public ListenableFuture> removeAll(EntityId entityId, String scope, List keys) { validate(entityId, scope); return attributesDao.removeAll(entityId, scope, keys); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java index db5babecf6..95f92702e0 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java @@ -101,7 +101,7 @@ public class CassandraBaseAttributesDao extends CassandraAbstractAsyncDao implem } @Override - public ResultSetFuture save(EntityId entityId, String attributeType, AttributeKvEntry attribute) { + public ListenableFuture save(EntityId entityId, String attributeType, AttributeKvEntry attribute) { BoundStatement stmt = getSaveStmt().bind(); stmt.setString(0, entityId.getEntityType().name()); stmt.setUUID(1, entityId.getId()); @@ -124,23 +124,31 @@ public class CassandraBaseAttributesDao extends CassandraAbstractAsyncDao implem } else { stmt.setToNull(8); } - return executeAsyncWrite(stmt); + log.trace("Generated save stmt [{}] for entityId {} and attributeType {} and attribute", stmt, entityId, attributeType, attribute); + return getFuture(executeAsyncWrite(stmt), rs -> getAttributeKvEntryFromRs(rs)); + } + + private Void getAttributeKvEntryFromRs(ResultSet rs) { + return null; } @Override - public ListenableFuture> removeAll(EntityId entityId, String attributeType, List keys) { - List futures = keys.stream().map(key -> delete(entityId, attributeType, key)).collect(Collectors.toList()); + public ListenableFuture> removeAll(EntityId entityId, String attributeType, List keys) { + List> futures = keys + .stream() + .map(key -> delete(entityId, attributeType, key)) + .collect(Collectors.toList()); return Futures.allAsList(futures); } - private ResultSetFuture delete(EntityId entityId, String attributeType, String key) { + private ListenableFuture delete(EntityId entityId, String attributeType, String key) { Statement delete = QueryBuilder.delete().all().from(ModelConstants.ATTRIBUTES_KV_CF) .where(eq(ENTITY_TYPE_COLUMN, entityId.getEntityType())) .and(eq(ENTITY_ID_COLUMN, entityId.getId())) .and(eq(ATTRIBUTE_TYPE_COLUMN, attributeType)) .and(eq(ATTRIBUTE_KEY_COLUMN, key)); log.debug("Remove request: {}", delete.toString()); - return getSession().executeAsync(delete); + return getFuture(getSession().executeAsync(delete), rs -> getAttributeKvEntryFromRs(rs)); } private PreparedStatement getSaveStmt() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java index 8415bc9903..0fdd6ca650 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java @@ -298,16 +298,6 @@ public class BaseRelationDao extends CassandraAbstractAsyncDao implements Relati return getFuture(rsFuture, rs -> rs != null ? rs.wasApplied() : false); } - private ListenableFuture getFuture(ResultSetFuture future, java.util.function.Function transformer) { - return Futures.transform(future, new Function() { - @Nullable - @Override - public T apply(@Nullable ResultSet input) { - return transformer.apply(input); - } - }, readResultsProcessingExecutor); - } - private List getEntityRelations(ResultSet rs) { List rows = rs.all(); List entries = new ArrayList<>(rows.size()); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributesDao.java index eb4a639a99..d3a111fa9e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributesDao.java @@ -15,8 +15,6 @@ */ package org.thingsboard.server.dao.sql.attributes; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.ResultSetFuture; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -50,12 +48,12 @@ public class JpaAttributesDao implements AttributesDao { } @Override - public ResultSetFuture save(EntityId entityId, String attributeType, AttributeKvEntry attribute) { + public ListenableFuture save(EntityId entityId, String attributeType, AttributeKvEntry attribute) { return null; } @Override - public ListenableFuture> removeAll(EntityId entityId, String scope, List keys) { + public ListenableFuture> removeAll(EntityId entityId, String scope, List keys) { return null; } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java index 8590876029..ae7573e046 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java @@ -54,12 +54,12 @@ public class JpaTimeseriesDao implements TimeseriesDao { } @Override - public ResultSetFuture save(EntityId entityId, long partition, TsKvEntry tsKvEntry) { + public ResultSetFuture save(EntityId entityId, long partition, TsKvEntry tsKvEntry, long ttl) { return null; } @Override - public ResultSetFuture savePartition(EntityId entityId, long partition, String key) { + public ResultSetFuture savePartition(EntityId entityId, long partition, String key, long ttl) { return null; } From 2d146c2416cc6ad27112c0edf2b7df3584b1fb60 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Fri, 9 Jun 2017 19:52:26 +0300 Subject: [PATCH 47/69] Added KV entity for postgres --- .../dao/model/sql/AttributeKvEntity.java | 56 +++++++++++++++++++ .../model/sql/AttributesKvCompositeKey.java | 14 +++++ .../dao/model/sql/RelationCompositeKey.java | 2 + .../sql/attributes/AttributeKvRepository.java | 10 ++++ ...ttributesDao.java => JpaAttributeDao.java} | 6 +- dao/src/main/resources/postgres/schema.sql | 14 +++++ 6 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributesKvCompositeKey.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java rename dao/src/main/java/org/thingsboard/server/dao/sql/attributes/{JpaAttributesDao.java => JpaAttributeDao.java} (91%) diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java new file mode 100644 index 0000000000..6637ecbf3a --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java @@ -0,0 +1,56 @@ +package org.thingsboard.server.dao.model.sql; + +import lombok.Data; +import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.dao.model.ToData; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import java.util.UUID; + +import static org.thingsboard.server.dao.model.ModelConstants.*; + +@Data +@Entity +@Table(name = "attributes_kv") +public class AttributeKvEntity implements ToData { + + @Id + @Column(name = ENTITY_TYPE_COLUMN) + private String entityType; + + @Id + @Column(name = ENTITY_ID_COLUMN) + private UUID entityId; + + @Id + @Column(name = ATTRIBUTE_TYPE_COLUMN) + private String attributeType; + + @Id + @Column(name = ATTRIBUTE_KEY_COLUMN) + private String attributeKey; + + @Column(name = BOOLEAN_VALUE_COLUMN) + private Boolean booleanValue; + + @Column(name = STRING_VALUE_COLUMN) + private String strValue; + + @Column(name = LONG_VALUE_COLUMN) + private Long longValue; + + @Column(name = DOUBLE_VALUE_COLUMN) + private Double doubleValue; + + @Column(name = LAST_UPDATE_TS_COLUMN) + private Long lastUpdateTs; + + @Override + public AttributeKvEntry toData() { + // TODO - add implementation + return null; + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributesKvCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributesKvCompositeKey.java new file mode 100644 index 0000000000..a2d5513b9d --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributesKvCompositeKey.java @@ -0,0 +1,14 @@ +package org.thingsboard.server.dao.model.sql; + +import lombok.Data; + +import java.io.Serializable; +import java.util.UUID; + +@Data +public class AttributesKvCompositeKey implements Serializable { + private String entityType; + private UUID entityId; + private String attributeType; + private String attributeKey; +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java index 4af848c2e6..3e13ff5e6f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java @@ -16,12 +16,14 @@ package org.thingsboard.server.dao.model.sql; import lombok.AllArgsConstructor; +import lombok.Data; import org.thingsboard.server.common.data.relation.EntityRelation; import java.io.Serializable; import java.util.UUID; @AllArgsConstructor +@Data public class RelationCompositeKey implements Serializable { private UUID fromId; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java new file mode 100644 index 0000000000..27e366e096 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java @@ -0,0 +1,10 @@ +package org.thingsboard.server.dao.sql.attributes; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.repository.CrudRepository; +import org.thingsboard.server.dao.model.sql.AttributeKvEntity; +import org.thingsboard.server.dao.model.sql.AttributesKvCompositeKey; + +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") +public interface AttributeKvRepository extends CrudRepository { +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java similarity index 91% rename from dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributesDao.java rename to dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java index d3a111fa9e..eb02acafcd 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java @@ -17,6 +17,7 @@ package org.thingsboard.server.dao.sql.attributes; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.EntityId; @@ -30,7 +31,10 @@ import java.util.Optional; @Component @Slf4j @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") -public class JpaAttributesDao implements AttributesDao { +public class JpaAttributeDao implements AttributesDao { + + @Autowired + private AttributeKvRepository attributeKvRepository; @Override public ListenableFuture> find(EntityId entityId, String attributeType, String attributeKey) { diff --git a/dao/src/main/resources/postgres/schema.sql b/dao/src/main/resources/postgres/schema.sql index afaf936da6..684ec00956 100644 --- a/dao/src/main/resources/postgres/schema.sql +++ b/dao/src/main/resources/postgres/schema.sql @@ -74,6 +74,20 @@ CREATE TABLE IF NOT EXISTS asset ( ); ALTER TABLE asset OWNER TO postgres; +CREATE TABLE IF NOT EXISTS attributes_kv ( + entity_type character varying(255), + entity_id uuid, + attribute_type character varying(255), + attribute_key character varying(255), + bool_v boolean, + str_v character varying(255), + long_v bigint, + dbl_v double precision, + last_update_ts bigint, + CONSTRAINT attributes_kv_unq_key UNIQUE (entity_type, entity_id, attribute_type, attribute_key) +); +ALTER TABLE relation OWNER TO postgres; + CREATE TABLE IF NOT EXISTS component_descriptor ( id uuid NOT NULL CONSTRAINT component_descriptor_pkey PRIMARY KEY, actions character varying(255), From 0fa24abc24a58fbfe7fa0284cf2fe3b3e80f56f6 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Fri, 9 Jun 2017 19:57:12 +0300 Subject: [PATCH 48/69] Minor renaming and refactoring --- .../server/actors/plugin/PluginProcessingContext.java | 8 ++++---- .../server/dao/attributes/CassandraBaseAttributesDao.java | 8 ++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java index 701f585e77..bcef69b4bd 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java @@ -93,8 +93,8 @@ public final class PluginProcessingContext implements PluginContext { @Override public void saveAttributes(final TenantId tenantId, final EntityId entityId, final String scope, final List attributes, final PluginCallback callback) { validate(entityId, new ValidationCallback(callback, ctx -> { - ListenableFuture> attrKvListFuture = pluginCtx.attributesService.save(entityId, scope, attributes); - Futures.addCallback(attrKvListFuture, getListCallback(callback, v -> { + ListenableFuture> futures = pluginCtx.attributesService.save(entityId, scope, attributes); + Futures.addCallback(futures, getListCallback(callback, v -> { if (entityId.getEntityType() == EntityType.DEVICE) { onDeviceAttributesChanged(tenantId, new DeviceId(entityId.getId()), scope, attributes); } @@ -106,8 +106,8 @@ public final class PluginProcessingContext implements PluginContext { @Override public void removeAttributes(final TenantId tenantId, final EntityId entityId, final String scope, final List keys, final PluginCallback callback) { validate(entityId, new ValidationCallback(callback, ctx -> { - ListenableFuture> future = pluginCtx.attributesService.removeAll(entityId, scope, keys); - Futures.addCallback(future, getCallback(callback, v -> null), executor); + ListenableFuture> futures = pluginCtx.attributesService.removeAll(entityId, scope, keys); + Futures.addCallback(futures, getCallback(callback, v -> null), executor); if (entityId.getEntityType() == EntityType.DEVICE) { onDeviceAttributesDeleted(tenantId, new DeviceId(entityId.getId()), keys.stream().map(key -> new AttributeKey(scope, key)).collect(Collectors.toSet())); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java index 95f92702e0..a98f054391 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java @@ -125,11 +125,7 @@ public class CassandraBaseAttributesDao extends CassandraAbstractAsyncDao implem stmt.setToNull(8); } log.trace("Generated save stmt [{}] for entityId {} and attributeType {} and attribute", stmt, entityId, attributeType, attribute); - return getFuture(executeAsyncWrite(stmt), rs -> getAttributeKvEntryFromRs(rs)); - } - - private Void getAttributeKvEntryFromRs(ResultSet rs) { - return null; + return getFuture(executeAsyncWrite(stmt), rs -> null); } @Override @@ -148,7 +144,7 @@ public class CassandraBaseAttributesDao extends CassandraAbstractAsyncDao implem .and(eq(ATTRIBUTE_TYPE_COLUMN, attributeType)) .and(eq(ATTRIBUTE_KEY_COLUMN, key)); log.debug("Remove request: {}", delete.toString()); - return getFuture(getSession().executeAsync(delete), rs -> getAttributeKvEntryFromRs(rs)); + return getFuture(getSession().executeAsync(delete), rs -> null); } private PreparedStatement getSaveStmt() { From df4f5f9ad96ab4e9630b4549ed673a8694278adb Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Mon, 12 Jun 2017 10:06:09 +0300 Subject: [PATCH 49/69] fixed license headers --- .../server/dao/model/sql/AttributeKvEntity.java | 15 +++++++++++++++ .../dao/model/sql/AttributesKvCompositeKey.java | 15 +++++++++++++++ .../dao/sql/attributes/AttributeKvRepository.java | 15 +++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java index 6637ecbf3a..90bf2ab64a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java @@ -1,3 +1,18 @@ +/** + * 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.model.sql; import lombok.Data; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributesKvCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributesKvCompositeKey.java index a2d5513b9d..219acb5c39 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributesKvCompositeKey.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributesKvCompositeKey.java @@ -1,3 +1,18 @@ +/** + * 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.model.sql; import lombok.Data; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java index 27e366e096..ecb5fbe8b1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java @@ -1,3 +1,18 @@ +/** + * 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.sql.attributes; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; From 4351c30adfa2784329171c61af4b0c787b77fe3a Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Tue, 13 Jun 2017 16:29:40 +0300 Subject: [PATCH 50/69] Added attribute jpa dao --- .../server/dao/attributes/AttributesDao.java | 2 +- ...eKey.java => AttributeKvCompositeKey.java} | 6 +- .../dao/model/sql/AttributeKvEntity.java | 26 ++++--- .../server/dao/sql/JpaAbstractDao.java | 6 +- ...paAbstractDaoListeningExecutorService.java | 25 +++++++ .../sql/attributes/AttributeKvRepository.java | 12 +++- .../dao/sql/attributes/JpaAttributeDao.java | 72 ++++++++++++++++--- .../dao/sql/relation/JpaRelationDao.java | 28 ++++---- .../server/dao/util/JsonBinaryType.java | 2 +- dao/src/main/resources/postgres/schema.sql | 4 +- .../server/dao/AbstractJpaDaoTest.java | 2 +- .../thingsboard/server/dao/DaoTestSuite.java | 5 +- .../attributes/BaseAttributesServiceTest.java | 13 ++-- 13 files changed, 147 insertions(+), 56 deletions(-) rename dao/src/main/java/org/thingsboard/server/dao/model/sql/{AttributesKvCompositeKey.java => AttributeKvCompositeKey.java} (83%) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDaoListeningExecutorService.java diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java index 4f0af49f41..704210e4cc 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/AttributesDao.java @@ -36,5 +36,5 @@ public interface AttributesDao { ListenableFuture save(EntityId entityId, String attributeType, AttributeKvEntry attribute); - ListenableFuture> removeAll(EntityId entityId, String scope, List keys); + ListenableFuture> removeAll(EntityId entityId, String attributeType, List keys); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributesKvCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java similarity index 83% rename from dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributesKvCompositeKey.java rename to dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java index 219acb5c39..7424e1fb89 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributesKvCompositeKey.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java @@ -15,13 +15,17 @@ */ package org.thingsboard.server.dao.model.sql; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.UUID; @Data -public class AttributesKvCompositeKey implements Serializable { +@AllArgsConstructor +@NoArgsConstructor +public class AttributeKvCompositeKey implements Serializable { private String entityType; private UUID entityId; private String attributeType; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java index 90bf2ab64a..2ea58afcf2 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java @@ -16,21 +16,20 @@ package org.thingsboard.server.dao.model.sql; import lombok.Data; -import org.thingsboard.server.common.data.kv.AttributeKvEntry; +import org.thingsboard.server.common.data.kv.*; import org.thingsboard.server.dao.model.ToData; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; +import java.io.Serializable; import java.util.UUID; import static org.thingsboard.server.dao.model.ModelConstants.*; @Data @Entity -@Table(name = "attributes_kv") -public class AttributeKvEntity implements ToData { +@Table(name = "attribute_kv") +@IdClass(AttributeKvCompositeKey.class) +public class AttributeKvEntity implements ToData, Serializable { @Id @Column(name = ENTITY_TYPE_COLUMN) @@ -65,7 +64,16 @@ public class AttributeKvEntity implements ToData { @Override public AttributeKvEntry toData() { - // TODO - add implementation - return null; + KvEntry kvEntry = null; + if (strValue != null) { + kvEntry = new StringDataEntry(attributeKey, strValue); + } else if (booleanValue != null) { + kvEntry = new BooleanDataEntry(attributeKey, booleanValue); + } else if (doubleValue != null) { + kvEntry = new DoubleDataEntry(attributeKey, doubleValue); + } else if (longValue != null) { + kvEntry = new LongDataEntry(attributeKey, longValue); + } + return new BaseAttributeKvEntry(kvEntry, lastUpdateTs); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java index aeaac2575d..a911711c98 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java @@ -38,7 +38,9 @@ import static org.springframework.transaction.annotation.Propagation.REQUIRES_NE * @author Valerii Sosliuk */ @Slf4j -public abstract class JpaAbstractDao, D> implements Dao { +public abstract class JpaAbstractDao, D> + extends JpaAbstractDaoListeningExecutorService + implements Dao { protected abstract Class getEntityClass(); @@ -48,8 +50,6 @@ public abstract class JpaAbstractDao, D> implements Dao< return false; } - protected ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); - @Override @Transactional(propagation = REQUIRES_NEW) public D save(D domain) { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDaoListeningExecutorService.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDaoListeningExecutorService.java new file mode 100644 index 0000000000..47df102216 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDaoListeningExecutorService.java @@ -0,0 +1,25 @@ +/** + * 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.sql; + +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; + +import java.util.concurrent.Executors; + +public abstract class JpaAbstractDaoListeningExecutorService { + protected ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java index ecb5fbe8b1..a231f8733e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java @@ -17,9 +17,17 @@ package org.thingsboard.server.dao.sql.attributes; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; +import org.thingsboard.server.dao.model.sql.AttributeKvCompositeKey; import org.thingsboard.server.dao.model.sql.AttributeKvEntity; -import org.thingsboard.server.dao.model.sql.AttributesKvCompositeKey; + +import java.util.List; +import java.util.UUID; @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") -public interface AttributeKvRepository extends CrudRepository { +public interface AttributeKvRepository extends CrudRepository { + + List findAllByEntityTypeAndEntityIdAndAttributeType(String entityType, + UUID entityId, + String attributeType); } + diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java index eb02acafcd..32603359d6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.sql.attributes; +import com.google.common.collect.Lists; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -22,42 +23,97 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.attributes.AttributesDao; +import org.thingsboard.server.dao.model.sql.AttributeKvCompositeKey; +import org.thingsboard.server.dao.model.sql.AttributeKvEntity; +import org.thingsboard.server.dao.sql.JpaAbstractDaoListeningExecutorService; import java.util.Collection; import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; @Component @Slf4j @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") -public class JpaAttributeDao implements AttributesDao { +public class JpaAttributeDao extends JpaAbstractDaoListeningExecutorService implements AttributesDao { @Autowired private AttributeKvRepository attributeKvRepository; @Override public ListenableFuture> find(EntityId entityId, String attributeType, String attributeKey) { - return null; + AttributeKvCompositeKey compositeKey = + new AttributeKvCompositeKey( + entityId.getEntityType().name(), + entityId.getId(), + attributeType, + attributeKey); + return service.submit(() -> + Optional.of(DaoUtil.getData(attributeKvRepository.findOne(compositeKey)))); } @Override - public ListenableFuture> find(EntityId entityId, String attributeType, Collection attributeKey) { - return null; + public ListenableFuture> find(EntityId entityId, String attributeType, Collection attributeKeys) { + List compositeKeys = + attributeKeys + .stream() + .map(attributeKey -> + new AttributeKvCompositeKey( + entityId.getEntityType().name(), + entityId.getId(), + attributeType, + attributeKey)) + .collect(Collectors.toList()); + return service.submit(() -> + DaoUtil.convertDataList(Lists.newArrayList(attributeKvRepository.findAll(compositeKeys)))); } @Override public ListenableFuture> findAll(EntityId entityId, String attributeType) { - return null; + return service.submit(() -> + DaoUtil.convertDataList(Lists.newArrayList( + attributeKvRepository.findAllByEntityTypeAndEntityIdAndAttributeType( + entityId.getEntityType().name(), + entityId.getId(), + attributeType)))); } @Override public ListenableFuture save(EntityId entityId, String attributeType, AttributeKvEntry attribute) { - return null; + AttributeKvEntity entity = new AttributeKvEntity(); + entity.setEntityType(entityId.getEntityType().name()); + entity.setEntityId(entityId.getId()); + entity.setAttributeType(attributeType); + entity.setAttributeKey(attribute.getKey()); + entity.setLastUpdateTs(attribute.getLastUpdateTs()); + entity.setStrValue(attribute.getStrValue().orElse(null)); + entity.setDoubleValue(attribute.getDoubleValue().orElse(null)); + entity.setLongValue(attribute.getLongValue().orElse(null)); + entity.setBooleanValue(attribute.getBooleanValue().orElse(null)); + return service.submit(() -> { + attributeKvRepository.save(entity); + return null; + }); } @Override - public ListenableFuture> removeAll(EntityId entityId, String scope, List keys) { - return null; + public ListenableFuture> removeAll(EntityId entityId, String attributeType, List keys) { + List entitiesToDelete = keys + .stream() + .map(key -> { + AttributeKvEntity entityToDelete = new AttributeKvEntity(); + entityToDelete.setEntityType(entityId.getEntityType().name()); + entityToDelete.setEntityId(entityId.getId()); + entityToDelete.setAttributeType(attributeType); + entityToDelete.setAttributeKey(key); + return entityToDelete; + }).collect(Collectors.toList()); + + return service.submit(() -> { + attributeKvRepository.delete(entitiesToDelete); + return null; + }); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java index 3dadbf00cc..db33808eb8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java @@ -16,8 +16,6 @@ package org.thingsboard.server.dao.sql.relation; import com.google.common.util.concurrent.ListenableFuture; -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -36,6 +34,7 @@ import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.RelationCompositeKey; import org.thingsboard.server.dao.model.sql.RelationEntity; import org.thingsboard.server.dao.relation.RelationDao; +import org.thingsboard.server.dao.sql.JpaAbstractDaoListeningExecutorService; import org.thingsboard.server.dao.sql.JpaAbstractSearchTimeDao; import javax.persistence.criteria.CriteriaBuilder; @@ -44,7 +43,6 @@ import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.Executors; import static org.springframework.data.domain.Sort.Direction.ASC; import static org.springframework.data.jpa.domain.Specifications.where; @@ -56,16 +54,14 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Slf4j @Component @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) -public class JpaRelationDao implements RelationDao { +public class JpaRelationDao extends JpaAbstractDaoListeningExecutorService implements RelationDao { @Autowired private RelationRepository relationRepository; - private ListeningExecutorService executorService = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(10)); - @Override public ListenableFuture> findAllByFrom(EntityId from, RelationTypeGroup typeGroup) { - return executorService.submit(() -> DaoUtil.convertDataList( + return service.submit(() -> DaoUtil.convertDataList( relationRepository.findAllByFromIdAndFromTypeAndRelationTypeGroup( from.getId(), from.getEntityType().name(), @@ -74,7 +70,7 @@ public class JpaRelationDao implements RelationDao { @Override public ListenableFuture> findAllByFromAndType(EntityId from, String relationType, RelationTypeGroup typeGroup) { - return executorService.submit(() -> DaoUtil.convertDataList( + return service.submit(() -> DaoUtil.convertDataList( relationRepository.findAllByFromIdAndFromTypeAndRelationTypeAndRelationTypeGroup( from.getId(), from.getEntityType().name(), @@ -84,7 +80,7 @@ public class JpaRelationDao implements RelationDao { @Override public ListenableFuture> findAllByTo(EntityId to, RelationTypeGroup typeGroup) { - return executorService.submit(() -> DaoUtil.convertDataList( + return service.submit(() -> DaoUtil.convertDataList( relationRepository.findAllByToIdAndToTypeAndRelationTypeGroup( to.getId(), to.getEntityType().name(), @@ -93,7 +89,7 @@ public class JpaRelationDao implements RelationDao { @Override public ListenableFuture> findAllByToAndType(EntityId to, String relationType, RelationTypeGroup typeGroup) { - return executorService.submit(() -> DaoUtil.convertDataList( + return service.submit(() -> DaoUtil.convertDataList( relationRepository.findAllByToIdAndToTypeAndRelationTypeAndRelationTypeGroup( to.getId(), to.getEntityType().name(), @@ -110,18 +106,18 @@ public class JpaRelationDao implements RelationDao { to.getEntityType().name(), relationType, typeGroup.name()); - return executorService.submit(() -> relationRepository.findOne(key) != null); + return service.submit(() -> relationRepository.findOne(key) != null); } @Override public ListenableFuture saveRelation(EntityRelation relation) { - return executorService.submit(() -> relationRepository.save(new RelationEntity(relation)) != null); + return service.submit(() -> relationRepository.save(new RelationEntity(relation)) != null); } @Override public ListenableFuture deleteRelation(EntityRelation relation) { RelationCompositeKey key = new RelationCompositeKey(relation); - return executorService.submit( + return service.submit( () -> { boolean relationExistsBeforeDelete = relationRepository.exists(key); relationRepository.delete(key); @@ -138,7 +134,7 @@ public class JpaRelationDao implements RelationDao { to.getEntityType().name(), relationType, typeGroup.name()); - return executorService.submit( + return service.submit( () -> { boolean relationExistsBeforeDelete = relationRepository.exists(key); relationRepository.delete(key); @@ -152,7 +148,7 @@ public class JpaRelationDao implements RelationDao { relationEntity.setFromId(entity.getId()); relationEntity.setFromType(entity.getEntityType().name()); - return executorService.submit( + return service.submit( () -> { boolean relationExistsBeforeDelete = relationRepository .findAllByFromIdAndFromType(relationEntity.getFromId(), relationEntity.getFromType()) @@ -172,7 +168,7 @@ public class JpaRelationDao implements RelationDao { new Order(ASC, RELATION_TYPE_PROPERTY), new Order(ASC, RELATION_TO_TYPE_PROPERTY)) ); - return executorService.submit(() -> + return service.submit(() -> DaoUtil.convertDataList(relationRepository.findAll(where(timeSearchSpec).and(fieldsSpec), pageable).getContent())); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/JsonBinaryType.java b/dao/src/main/java/org/thingsboard/server/dao/util/JsonBinaryType.java index 96a49c9a39..81d776b3de 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/util/JsonBinaryType.java +++ b/dao/src/main/java/org/thingsboard/server/dao/util/JsonBinaryType.java @@ -23,7 +23,7 @@ import java.util.Properties; /** * Created by Valerii Sosliuk on 5/12/2017. */ -public class JsonBinaryType extends AbstractSingleColumnStandardBasicType +public class JsonBinaryType extends AbstractSingleColumnStandardBasicType implements DynamicParameterizedType { public JsonBinaryType() { diff --git a/dao/src/main/resources/postgres/schema.sql b/dao/src/main/resources/postgres/schema.sql index 684ec00956..e78199fdf0 100644 --- a/dao/src/main/resources/postgres/schema.sql +++ b/dao/src/main/resources/postgres/schema.sql @@ -74,7 +74,7 @@ CREATE TABLE IF NOT EXISTS asset ( ); ALTER TABLE asset OWNER TO postgres; -CREATE TABLE IF NOT EXISTS attributes_kv ( +CREATE TABLE IF NOT EXISTS attribute_kv ( entity_type character varying(255), entity_id uuid, attribute_type character varying(255), @@ -84,7 +84,7 @@ CREATE TABLE IF NOT EXISTS attributes_kv ( long_v bigint, dbl_v double precision, last_update_ts bigint, - CONSTRAINT attributes_kv_unq_key UNIQUE (entity_type, entity_id, attribute_type, attribute_key) + CONSTRAINT attribute_kv_unq_key UNIQUE (entity_type, entity_id, attribute_type, attribute_key) ); ALTER TABLE relation OWNER TO postgres; diff --git a/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java index c8e715fdaa..daf59f319f 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java @@ -37,6 +37,6 @@ import org.springframework.test.context.support.DirtiesContextTestExecutionListe DirtiesContextTestExecutionListener.class, DbUnitTestExecutionListener.class }) @DbUnitConfiguration(databaseConnection = "dbUnitDatabaseConnection") -public class AbstractJpaDaoTest extends AbstractTransactionalJUnit4SpringContextTests { +public abstract class AbstractJpaDaoTest extends AbstractTransactionalJUnit4SpringContextTests { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java b/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java index 26d92237c1..845c4c67c8 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java +++ b/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java @@ -38,8 +38,7 @@ public class DaoTestSuite { public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit( Arrays.asList(new ClassPathCQLDataSet("cassandra/schema.cql", false, false), - new ClassPathCQLDataSet("cassandra/system-data.cql", false, false), - new ClassPathCQLDataSet("system-test.cql", false, false)), + new ClassPathCQLDataSet("cassandra/system-data.cql", false, false), + new ClassPathCQLDataSet("system-test.cql", false, false)), "cassandra-test.yaml", 30000l); - } diff --git a/dao/src/test/java/org/thingsboard/server/dao/attributes/BaseAttributesServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/attributes/BaseAttributesServiceTest.java index 559a3130e8..61b5329ffc 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/attributes/BaseAttributesServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/attributes/BaseAttributesServiceTest.java @@ -16,6 +16,10 @@ package org.thingsboard.server.dao.attributes; import com.datastax.driver.core.utils.UUIDs; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.kv.AttributeKvEntry; @@ -23,20 +27,11 @@ import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry; import org.thingsboard.server.common.data.kv.KvEntry; import org.thingsboard.server.common.data.kv.StringDataEntry; import org.thingsboard.server.dao.service.AbstractServiceTest; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import java.util.Collections; import java.util.List; import java.util.Optional; -import static org.thingsboard.server.common.data.DataConstants.CLIENT_SCOPE; -import static org.thingsboard.server.common.data.DataConstants.DEVICE; - /** * @author Andrew Shvayka */ From 08f7e48f94da6e45505b85a8d838b3579ff5fb32 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Tue, 13 Jun 2017 17:06:12 +0300 Subject: [PATCH 51/69] Fixed JPA alarm impl --- .../server/dao/alarm/CassandraAlarmDao.java | 4 ++-- .../server/dao/sql/alarm/JpaAlarmDao.java | 23 +++++++++++++++---- 2 files changed, 20 insertions(+), 7 deletions(-) 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 f5b667205a..f437751655 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 @@ -106,8 +106,8 @@ public class CassandraAlarmDao extends CassandraAbstractModelDao> alarmFutures = new ArrayList<>(input.size()); for (EntityRelation relation : input) { alarmFutures.add(Futures.transform( - findAlarmByIdAsync(relation.getTo().getId()), (Function) - alarm1 -> new AlarmInfo(alarm1))); + findAlarmByIdAsync(relation.getTo().getId()), + (Function) AlarmInfo::new)); } return Futures.successfulAsList(alarmFutures); }); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java index 5258395036..d79d8ac849 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.sql.alarm; +import com.google.common.base.Function; import com.google.common.util.concurrent.AsyncFunction; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -26,7 +27,9 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.alarm.Alarm; +import org.thingsboard.server.common.data.alarm.AlarmInfo; import org.thingsboard.server.common.data.alarm.AlarmQuery; +import org.thingsboard.server.common.data.alarm.AlarmSearchStatus; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.relation.EntityRelation; @@ -85,15 +88,25 @@ public class JpaAlarmDao extends JpaAbstractDao implements A } @Override - public ListenableFuture> findAlarms(AlarmQuery query) { + public ListenableFuture> findAlarms(AlarmQuery query) { log.trace("Try to find alarms by entity [{}], status [{}] and pageLink [{}]", query.getAffectedEntityId(), query.getStatus(), query.getPageLink()); EntityId affectedEntity = query.getAffectedEntityId(); - String relationType = query.getStatus() == null ? BaseAlarmService.ALARM_RELATION : BaseAlarmService.ALARM_RELATION_PREFIX + query.getStatus().name(); + String searchStatusName; + if (query.getSearchStatus() == null && query.getStatus() == null) { + searchStatusName = AlarmSearchStatus.ANY.name(); + } else if (query.getSearchStatus() != null) { + searchStatusName = query.getSearchStatus().name(); + } else { + searchStatusName = query.getStatus().name(); + } + String relationType = BaseAlarmService.ALARM_RELATION_PREFIX + searchStatusName; ListenableFuture> relations = relationDao.findRelations(affectedEntity, relationType, RelationTypeGroup.ALARM, EntityType.ALARM, query.getPageLink()); - return Futures.transform(relations, (AsyncFunction, List>) input -> { - List> alarmFutures = new ArrayList<>(input.size()); + return Futures.transform(relations, (AsyncFunction, List>) input -> { + List> alarmFutures = new ArrayList<>(input.size()); for (EntityRelation relation : input) { - alarmFutures.add(findAlarmByIdAsync(relation.getTo().getId())); + alarmFutures.add(Futures.transform( + findAlarmByIdAsync(relation.getTo().getId()), + (Function) AlarmInfo::new)); } return Futures.successfulAsList(alarmFutures); }); From 4486d07f6d4f155261ba29531d98035db2f28eb3 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Wed, 14 Jun 2017 11:58:45 +0300 Subject: [PATCH 52/69] Get rid of cassandra specific classes in timeseries dao and timeseries service interfaces --- .../plugin/PluginProcessingContext.java | 25 +++------ .../src/main/resources/thingsboard.yml | 2 +- .../server/dao/relation/BaseRelationDao.java | 2 +- .../dao/sql/timeseries/JpaTimeseriesDao.java | 21 ++------ .../dao/timeseries/BaseTimeseriesService.java | 38 +++---------- .../CassandraBaseTimeseriesDao.java | 53 +++++++++---------- .../server/dao/timeseries/TimeseriesDao.java | 17 ++---- .../dao/timeseries/TimeseriesService.java | 19 ++----- .../dao/timeseries/TimeseriesServiceTest.java | 12 ++--- .../test/resources/cassandra-test.properties | 2 +- 10 files changed, 59 insertions(+), 132 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java index bcef69b4bd..0e2ffcb792 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java @@ -16,9 +16,6 @@ package org.thingsboard.server.actors.plugin; import akka.actor.ActorRef; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.ResultSetFuture; -import com.datastax.driver.core.Row; import com.google.common.base.Function; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -159,7 +156,7 @@ public final class PluginProcessingContext implements PluginContext { @Override public void saveTsData(final EntityId entityId, final TsKvEntry entry, final PluginCallback callback) { validate(entityId, new ValidationCallback(callback, ctx -> { - ListenableFuture> rsListFuture = pluginCtx.tsService.save(entityId, entry); + ListenableFuture> rsListFuture = pluginCtx.tsService.save(entityId, entry); Futures.addCallback(rsListFuture, getListCallback(callback, v -> null), executor); })); } @@ -172,7 +169,7 @@ public final class PluginProcessingContext implements PluginContext { @Override public void saveTsData(final EntityId entityId, final List entries, long ttl, final PluginCallback callback) { validate(entityId, new ValidationCallback(callback, ctx -> { - ListenableFuture> rsListFuture = pluginCtx.tsService.save(entityId, entries, ttl); + ListenableFuture> rsListFuture = pluginCtx.tsService.save(entityId, entries, ttl); Futures.addCallback(rsListFuture, getListCallback(callback, v -> null), executor); })); } @@ -189,26 +186,16 @@ public final class PluginProcessingContext implements PluginContext { @Override public void loadLatestTimeseries(final EntityId entityId, final PluginCallback> callback) { validate(entityId, new ValidationCallback(callback, ctx -> { - ResultSetFuture future = pluginCtx.tsService.findAllLatest(entityId); - Futures.addCallback(future, getCallback(callback, pluginCtx.tsService::convertResultSetToTsKvEntryList), executor); + ListenableFuture> future = pluginCtx.tsService.findAllLatest(entityId); + Futures.addCallback(future, getCallback(callback, v -> v), executor); })); } @Override public void loadLatestTimeseries(final EntityId entityId, final Collection keys, final PluginCallback> callback) { validate(entityId, new ValidationCallback(callback, ctx -> { - ListenableFuture> rsListFuture = pluginCtx.tsService.findLatest(entityId, keys); - Futures.addCallback(rsListFuture, getListCallback(callback, rsList -> - { - List result = new ArrayList<>(); - for (ResultSet rs : rsList) { - Row row = rs.one(); - if (row != null) { - result.add(pluginCtx.tsService.convertResultToTsKvEntry(row)); - } - } - return result; - }), executor); + ListenableFuture> rsListFuture = pluginCtx.tsService.findLatest(entityId, keys); + Futures.addCallback(rsListFuture, getCallback(callback, v -> v), executor); })); } diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 208d9ab053..b443dcdb5c 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -153,7 +153,7 @@ cassandra: # Specify partitioning size for timestamp key-value storage. Example MINUTES, HOURS, DAYS, MONTHS ts_key_value_partitioning: "${TS_KV_PARTITIONING:MONTHS}" # Specify max data points per request - min_aggregation_step_ms: "${TS_KV_MIN_AGGREGATION_STEP_MS:100}" + min_aggregation_step_ms: "${TS_KV_MIN_AGGREGATION_STEP_MS:1000}" # Actor system parameters actors: diff --git a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java index 2f6fe737e7..af76971dd3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java @@ -188,7 +188,7 @@ public class BaseRelationDao extends CassandraAbstractAsyncDao implements Relati QueryBuilder.asc(ModelConstants.RELATION_TO_TYPE_PROPERTY) ), pageLink, ModelConstants.RELATION_TO_ID_PROPERTY); - return getFuture(executeAsyncRead(query), rs -> getEntityRelations(rs)); + return getFuture(executeAsyncRead(query), this::getEntityRelations); } private PreparedStatement getSaveStmt() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java index ae7573e046..9e53cc6b99 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java @@ -15,8 +15,6 @@ */ package org.thingsboard.server.dao.sql.timeseries; -import com.datastax.driver.core.ResultSetFuture; -import com.datastax.driver.core.Row; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -44,37 +42,28 @@ public class JpaTimeseriesDao implements TimeseriesDao { } @Override - public ResultSetFuture findLatest(EntityId entityId, String key) { + public ListenableFuture findLatest(EntityId entityId, String key) { return null; } @Override - public ResultSetFuture findAllLatest(EntityId entityId) { + public ListenableFuture> findAllLatest(EntityId entityId) { return null; } @Override - public ResultSetFuture save(EntityId entityId, long partition, TsKvEntry tsKvEntry, long ttl) { + public ListenableFuture save(EntityId entityId, long partition, TsKvEntry tsKvEntry, long ttl) { return null; } @Override - public ResultSetFuture savePartition(EntityId entityId, long partition, String key, long ttl) { + public ListenableFuture savePartition(EntityId entityId, long partition, String key, long ttl) { return null; } @Override - public ResultSetFuture saveLatest(EntityId entityId, TsKvEntry tsKvEntry) { + public ListenableFuture saveLatest(EntityId entityId, TsKvEntry tsKvEntry) { return null; } - @Override - public TsKvEntry convertResultToTsKvEntry(Row row) { - return null; - } - - @Override - public List convertResultToTsKvEntryList(List rows) { - return null; - } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java index 8a1f629bc9..c4a71b3352 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java @@ -15,9 +15,6 @@ */ package org.thingsboard.server.dao.timeseries; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.ResultSetFuture; -import com.datastax.driver.core.Row; import com.google.common.collect.Lists; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -32,7 +29,6 @@ import org.thingsboard.server.dao.service.Validator; import java.util.Collection; import java.util.List; -import java.util.UUID; import static org.apache.commons.lang3.StringUtils.isBlank; @@ -56,42 +52,35 @@ public class BaseTimeseriesService implements TimeseriesService { } @Override - public ListenableFuture> findLatest(EntityId entityId, Collection keys) { + public ListenableFuture> findLatest(EntityId entityId, Collection keys) { validate(entityId); - List futures = Lists.newArrayListWithExpectedSize(keys.size()); + List> futures = Lists.newArrayListWithExpectedSize(keys.size()); keys.forEach(key -> Validator.validateString(key, "Incorrect key " + key)); keys.forEach(key -> futures.add(timeseriesDao.findLatest(entityId, key))); return Futures.allAsList(futures); } @Override - public ResultSetFuture findAllLatest(EntityId entityId) { + public ListenableFuture> findAllLatest(EntityId entityId) { validate(entityId); return timeseriesDao.findAllLatest(entityId); } @Override - public ListenableFuture> save(EntityId entityId, TsKvEntry tsKvEntry) { + public ListenableFuture> save(EntityId entityId, TsKvEntry tsKvEntry) { validate(entityId); if (tsKvEntry == null) { throw new IncorrectParameterException("Key value entry can't be null"); } long partitionTs = timeseriesDao.toPartitionTs(tsKvEntry.getTs()); - - List futures = Lists.newArrayListWithExpectedSize(INSERTS_PER_ENTRY); + List> futures = Lists.newArrayListWithExpectedSize(INSERTS_PER_ENTRY); saveAndRegisterFutures(futures, entityId, tsKvEntry, partitionTs, 0L); return Futures.allAsList(futures); } @Override - public ListenableFuture> save(EntityId entityId, List tsKvEntries) { - return save(entityId, tsKvEntries, 0L); - } - - @Override - public ListenableFuture> save(EntityId entityId, List tsKvEntries, long ttl) { - validate(entityId); - List futures = Lists.newArrayListWithExpectedSize(tsKvEntries.size() * INSERTS_PER_ENTRY); + public ListenableFuture> save(EntityId entityId, List tsKvEntries, long ttl) { + List> futures = Lists.newArrayListWithExpectedSize(tsKvEntries.size() * INSERTS_PER_ENTRY); for (TsKvEntry tsKvEntry : tsKvEntries) { if (tsKvEntry == null) { throw new IncorrectParameterException("Key value entry can't be null"); @@ -102,18 +91,7 @@ public class BaseTimeseriesService implements TimeseriesService { return Futures.allAsList(futures); } - - @Override - public TsKvEntry convertResultToTsKvEntry(Row row) { - return timeseriesDao.convertResultToTsKvEntry(row); - } - - @Override - public List convertResultSetToTsKvEntryList(ResultSet rs) { - return timeseriesDao.convertResultToTsKvEntryList(rs.all()); - } - - private void saveAndRegisterFutures(List futures, EntityId entityId, TsKvEntry tsKvEntry, long partitionTs, long ttl) { + private void saveAndRegisterFutures(List> futures, EntityId entityId, TsKvEntry tsKvEntry, long partitionTs, long ttl) { futures.add(timeseriesDao.savePartition(entityId, partitionTs, tsKvEntry.getKey(), ttl)); futures.add(timeseriesDao.saveLatest(entityId, tsKvEntry)); futures.add(timeseriesDao.save(entityId, partitionTs, tsKvEntry, ttl)); diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java index 4c81eed8f6..21e01e6ad1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java @@ -51,12 +51,11 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; */ @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true") public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implements TimeseriesDao { - //@Value("${cassandra.query.min_aggregation_step_ms}") - //TODO: - private int minAggregationStepMs = 1000; + @Value("${cassandra.query.min_aggregation_step_ms}") + private int minAggregationStepMs; @Value("${cassandra.query.ts_key_value_partitioning}") private String partitioning; @@ -103,9 +102,12 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem @Nullable @Override public List apply(@Nullable List> results) { - List result = new ArrayList(); - results.forEach(r -> result.addAll(r)); - return result; + if (results == null || results.isEmpty()) { + return null; + } + return results.stream() + .flatMap(List::stream) + .collect(Collectors.toList()); } }, readResultsProcessingExecutor); } @@ -238,26 +240,26 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem } @Override - public ResultSetFuture findLatest(EntityId entityId, String key) { + public ListenableFuture findLatest(EntityId entityId, String key) { BoundStatement stmt = getFindLatestStmt().bind(); stmt.setString(0, entityId.getEntityType().name()); stmt.setUUID(1, entityId.getId()); stmt.setString(2, key); log.debug("Generated query [{}] for entityType {} and entityId {}", stmt, entityId.getEntityType(), entityId.getId()); - return executeAsyncRead(stmt); + return getFuture(executeAsyncRead(stmt), rs -> convertResultToTsKvEntry(rs.one())); } @Override - public ResultSetFuture findAllLatest(EntityId entityId) { + public ListenableFuture> findAllLatest(EntityId entityId) { BoundStatement stmt = getFindAllLatestStmt().bind(); stmt.setString(0, entityId.getEntityType().name()); stmt.setUUID(1, entityId.getId()); log.debug("Generated query [{}] for entityType {} and entityId {}", stmt, entityId.getEntityType(), entityId.getId()); - return executeAsyncRead(stmt); + return getFuture(executeAsyncRead(stmt), rs -> convertResultToTsKvEntryList(rs.all())); } @Override - public ResultSetFuture save(EntityId entityId, long partition, TsKvEntry tsKvEntry, long ttl) { + public ListenableFuture save(EntityId entityId, long partition, TsKvEntry tsKvEntry, long ttl) { DataType type = tsKvEntry.getDataType(); BoundStatement stmt = (ttl == 0 ? getSaveStmt(type) : getSaveTtlStmt(type)).bind(); stmt.setString(0, entityId.getEntityType().name()) @@ -269,11 +271,11 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem if (ttl > 0) { stmt.setInt(6, (int) ttl); } - return executeAsyncWrite(stmt); + return getFuture(executeAsyncWrite(stmt), rs -> null); } @Override - public ResultSetFuture savePartition(EntityId entityId, long partition, String key, long ttl) { + public ListenableFuture savePartition(EntityId entityId, long partition, String key, long ttl) { log.debug("Saving partition {} for the entity [{}-{}] and key {}", partition, entityId.getEntityType(), entityId.getId(), key); BoundStatement stmt = (ttl == 0 ? getPartitionInsertStmt() : getPartitionInsertTtlStmt()).bind(); stmt = stmt.setString(0, entityId.getEntityType().name()) @@ -283,11 +285,11 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem if (ttl > 0) { stmt.setInt(4, (int) ttl); } - return executeAsyncWrite(stmt); + return getFuture(executeAsyncWrite(stmt), rs -> null); } @Override - public ResultSetFuture saveLatest(EntityId entityId, TsKvEntry tsKvEntry) { + public ListenableFuture saveLatest(EntityId entityId, TsKvEntry tsKvEntry) { DataType type = tsKvEntry.getDataType(); BoundStatement stmt = getLatestStmt(type).bind() .setString(0, entityId.getEntityType().name()) @@ -295,25 +297,18 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem .setString(2, tsKvEntry.getKey()) .setLong(3, tsKvEntry.getTs()); addValue(tsKvEntry, stmt, 4); - return executeAsyncWrite(stmt); + return getFuture(executeAsyncWrite(stmt), rs -> null); } - @Override - public List convertResultToTsKvEntryList(List rows) { + private List convertResultToTsKvEntryList(List rows) { List entries = new ArrayList<>(rows.size()); if (!rows.isEmpty()) { - rows.forEach(row -> { - TsKvEntry kvEntry = convertResultToTsKvEntry(row); - if (kvEntry != null) { - entries.add(kvEntry); - } - }); + rows.forEach(row -> entries.add(convertResultToTsKvEntry(row))); } return entries; } - @Override - public TsKvEntry convertResultToTsKvEntry(Row row) { + private TsKvEntry convertResultToTsKvEntry(Row row) { String key = row.getString(ModelConstants.KEY_COLUMN); long ts = row.getLong(ModelConstants.TS_COLUMN); return new BasicTsKvEntry(ts, toKvEntry(row, key)); @@ -490,7 +485,7 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem return findAllLatestStmt; } - public static String getColumnName(DataType type) { + private static String getColumnName(DataType type) { switch (type) { case BOOLEAN: return ModelConstants.BOOLEAN_VALUE_COLUMN; @@ -505,7 +500,7 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem } } - public static void addValue(KvEntry kvEntry, BoundStatement stmt, int column) { + private static void addValue(KvEntry kvEntry, BoundStatement stmt, int column) { switch (kvEntry.getDataType()) { case BOOLEAN: stmt.setBool(column, kvEntry.getBooleanValue().get().booleanValue()); diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java index 08a61f61a2..8f1b0031de 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java @@ -15,8 +15,6 @@ */ package org.thingsboard.server.dao.timeseries; -import com.datastax.driver.core.ResultSetFuture; -import com.datastax.driver.core.Row; import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.kv.TsKvEntry; @@ -33,18 +31,13 @@ public interface TimeseriesDao { ListenableFuture> findAllAsync(EntityId entityId, List queries); - ResultSetFuture findLatest(EntityId entityId, String key); + ListenableFuture findLatest(EntityId entityId, String key); - ResultSetFuture findAllLatest(EntityId entityId); + ListenableFuture> findAllLatest(EntityId entityId); - ResultSetFuture save(EntityId entityId, long partition, TsKvEntry tsKvEntry, long ttl); + ListenableFuture save(EntityId entityId, long partition, TsKvEntry tsKvEntry, long ttl); - ResultSetFuture savePartition(EntityId entityId, long partition, String key, long ttl); - - ResultSetFuture saveLatest(EntityId entityId, TsKvEntry tsKvEntry); - - TsKvEntry convertResultToTsKvEntry(Row row); - - List convertResultToTsKvEntryList(List rows); + ListenableFuture savePartition(EntityId entityId, long partition, String key, long ttl); + ListenableFuture saveLatest(EntityId entityId, TsKvEntry tsKvEntry); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java index 10fed26097..e6feebbb52 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesService.java @@ -15,12 +15,8 @@ */ package org.thingsboard.server.dao.timeseries; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.ResultSetFuture; -import com.datastax.driver.core.Row; import com.google.common.util.concurrent.ListenableFuture; import org.thingsboard.server.common.data.id.EntityId; -import org.thingsboard.server.common.data.id.UUIDBased; import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.common.data.kv.TsKvQuery; @@ -34,18 +30,11 @@ public interface TimeseriesService { ListenableFuture> findAll(EntityId entityId, List queries); - ListenableFuture> findLatest(EntityId entityId, Collection keys); + ListenableFuture> findLatest(EntityId entityId, Collection keys); - ResultSetFuture findAllLatest(EntityId entityId); + ListenableFuture> findAllLatest(EntityId entityId); - ListenableFuture> save(EntityId entityId, TsKvEntry tsKvEntry); - - ListenableFuture> save(EntityId entityId, List tsKvEntry); - - ListenableFuture> save(EntityId entityId, List tsKvEntry, long ttl); - - TsKvEntry convertResultToTsKvEntry(Row row); - - List convertResultSetToTsKvEntryList(ResultSet rs); + ListenableFuture> save(EntityId entityId, TsKvEntry tsKvEntry); + ListenableFuture> save(EntityId entityId, List tsKvEntry, long ttl); } diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/TimeseriesServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/TimeseriesServiceTest.java index 779aa55bd5..793b5037b6 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/TimeseriesServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/TimeseriesServiceTest.java @@ -15,13 +15,10 @@ */ package org.thingsboard.server.dao.timeseries; -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.ResultSetFuture; import com.datastax.driver.core.utils.UUIDs; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; import org.junit.Test; -import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.kv.*; import org.thingsboard.server.dao.service.AbstractServiceTest; @@ -62,8 +59,7 @@ public class TimeseriesServiceTest extends AbstractServiceTest { saveEntries(deviceId, TS - 1); saveEntries(deviceId, TS); - ResultSetFuture rsFuture = tsService.findAllLatest(deviceId); - List tsList = tsService.convertResultSetToTsKvEntryList(rsFuture.get()); + List tsList = tsService.findAllLatest(deviceId).get(); assertNotNull(tsList); assertEquals(4, tsList.size()); @@ -91,9 +87,9 @@ public class TimeseriesServiceTest extends AbstractServiceTest { saveEntries(deviceId, TS - 1); saveEntries(deviceId, TS); - List rs = tsService.findLatest(deviceId, Collections.singleton(STRING_KEY)).get(); - Assert.assertEquals(1, rs.size()); - Assert.assertEquals(toTsEntry(TS, stringKvEntry), tsService.convertResultToTsKvEntry(rs.get(0).one())); + List entries = tsService.findLatest(deviceId, Collections.singleton(STRING_KEY)).get(); + Assert.assertEquals(1, entries.size()); + Assert.assertEquals(toTsEntry(TS, stringKvEntry), entries.get(0)); } @Test diff --git a/dao/src/test/resources/cassandra-test.properties b/dao/src/test/resources/cassandra-test.properties index a4eb3d0547..e2bf050530 100644 --- a/dao/src/test/resources/cassandra-test.properties +++ b/dao/src/test/resources/cassandra-test.properties @@ -48,4 +48,4 @@ cassandra.query.ts_key_value_partitioning=HOURS cassandra.query.max_limit_per_request=1000 -cassandra.query.min_aggregation_step_ms=100 \ No newline at end of file +cassandra.query.min_aggregation_step_ms=1000 \ No newline at end of file From d6d2de6d9d4557ff29b18edb0d5f7b8fdb746ecc Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Wed, 14 Jun 2017 19:27:35 +0300 Subject: [PATCH 53/69] Added ts kv latest and ts kv jps dao support --- .../server/common/data/kv/TsKvQuery.java | 2 - .../dao/model/sql/AttributeKvEntity.java | 4 + .../dao/model/sql/RelationCompositeKey.java | 8 ++ .../server/dao/model/sql/RelationEntity.java | 89 +------------------ .../dao/model/sql/TsKvCompositeKey.java | 40 +++++++++ .../server/dao/model/sql/TsKvEntity.java | 69 ++++++++++++++ .../dao/model/sql/TsKvLatestCompositeKey.java | 39 ++++++++ .../dao/model/sql/TsKvLatestEntity.java | 68 ++++++++++++++ .../dao/sql/timeseries/JpaTimeseriesDao.java | 68 +++++++++++--- .../sql/timeseries/TsKvLatestRepository.java | 30 +++++++ .../dao/sql/timeseries/TsKvRepository.java | 25 ++++++ .../dao/timeseries/BaseTimeseriesService.java | 12 ++- .../CassandraBaseTimeseriesDao.java | 17 ++-- .../server/dao/timeseries/TimeseriesDao.java | 6 +- dao/src/main/resources/postgres/schema.sql | 50 ++++++++--- 15 files changed, 398 insertions(+), 129 deletions(-) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvCompositeKey.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestCompositeKey.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestEntity.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvLatestRepository.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvRepository.java diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/kv/TsKvQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/kv/TsKvQuery.java index 8d60f525f4..8ede698241 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/kv/TsKvQuery.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/kv/TsKvQuery.java @@ -15,8 +15,6 @@ */ package org.thingsboard.server.common.data.kv; -import java.util.Optional; - public interface TsKvQuery { String getKey(); diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java index 2ea58afcf2..dd3f28362f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java @@ -16,6 +16,8 @@ package org.thingsboard.server.dao.model.sql; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.thingsboard.server.common.data.kv.*; import org.thingsboard.server.dao.model.ToData; @@ -29,6 +31,8 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Entity @Table(name = "attribute_kv") @IdClass(AttributeKvCompositeKey.class) +@EqualsAndHashCode +@ToString public class AttributeKvEntity implements ToData, Serializable { @Id diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java index 3e13ff5e6f..f08f873b61 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java @@ -17,15 +17,23 @@ package org.thingsboard.server.dao.model.sql; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.thingsboard.server.common.data.relation.EntityRelation; +import javax.persistence.Transient; import java.io.Serializable; import java.util.UUID; @AllArgsConstructor @Data +@EqualsAndHashCode +@ToString public class RelationCompositeKey implements Serializable { + @Transient + private static final long serialVersionUID = -4089175869616037592L; + private UUID fromId; private String fromType; private UUID toId; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java index 1b15aa1589..f8aa72cb8a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java @@ -17,6 +17,8 @@ package org.thingsboard.server.dao.model.sql; import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.hibernate.annotations.Type; import org.thingsboard.server.common.data.id.EntityIdFactory; import org.thingsboard.server.common.data.relation.EntityRelation; @@ -32,11 +34,10 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Entity @Table(name = RELATION_COLUMN_FAMILY_NAME) @IdClass(RelationCompositeKey.class) +@EqualsAndHashCode +@ToString public final class RelationEntity implements ToData { - @Transient - private static final long serialVersionUID = -4089175869616037592L; - @Id @Column(name = RELATION_FROM_ID_PROPERTY) private UUID fromId; @@ -83,88 +84,6 @@ public final class RelationEntity implements ToData { this.additionalInfo = relation.getAdditionalInfo(); } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((additionalInfo == null) ? 0 : additionalInfo.hashCode()); - result = prime * result + ((toId == null) ? 0 : toId.hashCode()); - result = prime * result + ((toType == null) ? 0 : toType.hashCode()); - result = prime * result + ((fromId == null) ? 0 : fromId.hashCode()); - result = prime * result + ((fromType == null) ? 0 : fromType.hashCode()); - result = prime * result + ((relationType == null) ? 0 : relationType.hashCode()); - result = prime * result + ((relationTypeGroup == null) ? 0 : relationTypeGroup.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - RelationEntity other = (RelationEntity) obj; - if (additionalInfo == null) { - if (other.additionalInfo != null) - return false; - } else if (!additionalInfo.equals(other.additionalInfo)) - return false; - if (toId == null) { - if (other.toId != null) - return false; - } else if (!toId.equals(other.toId)) - return false; - if (fromId == null) { - if (other.fromId != null) - return false; - } else if (!fromId.equals(other.fromId)) - return false; - if (toType == null) { - if (other.toType != null) - return false; - } else if (!toType.equals(other.toType)) - return false; - if (fromType == null) { - if (other.fromType != null) - return false; - } else if (!fromType.equals(other.fromType)) - return false; - if (relationType == null) { - if (other.relationType != null) - return false; - } else if (!relationType.equals(other.relationType)) - return false; - if (relationTypeGroup == null) { - if (other.relationTypeGroup != null) - return false; - } else if (!relationTypeGroup.equals(other.relationTypeGroup)) - return false; - return true; - } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("AssetEntity [toId="); - builder.append(toId); - builder.append(", toType="); - builder.append(toType); - builder.append(", fromId="); - builder.append(fromId); - builder.append(", fromType="); - builder.append(fromType); - builder.append(", relationType="); - builder.append(relationType); - builder.append(", relationTypeGroup="); - builder.append(relationTypeGroup); - builder.append(", additionalInfo="); - builder.append(additionalInfo); - builder.append("]"); - return builder.toString(); - } - @Override public EntityRelation toData() { EntityRelation relation = new EntityRelation(); diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvCompositeKey.java new file mode 100644 index 0000000000..037c2dff6f --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvCompositeKey.java @@ -0,0 +1,40 @@ +/** + * 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.model.sql; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.persistence.Transient; +import java.io.Serializable; +import java.util.UUID; + +@Data +@AllArgsConstructor +@EqualsAndHashCode +@ToString +public class TsKvCompositeKey implements Serializable{ + + @Transient + private static final long serialVersionUID = -4089175869616037523L; + + private String entityType; + private UUID entityId; + private String key; + private long ts; +} \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvEntity.java new file mode 100644 index 0000000000..7d6901ddfa --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvEntity.java @@ -0,0 +1,69 @@ +/** + * 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.model.sql; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.thingsboard.server.common.data.kv.TsKvEntry; +import org.thingsboard.server.dao.model.ToData; + +import javax.persistence.*; +import java.util.UUID; + +import static org.thingsboard.server.dao.model.ModelConstants.*; + +@Data +@Entity +@Table(name = "ts_kv") +@IdClass(TsKvCompositeKey.class) +@EqualsAndHashCode +@ToString +public final class TsKvEntity implements ToData { + + @Id + @Column(name = ENTITY_TYPE_COLUMN) + private String entityType; + + @Id + @Column(name = ENTITY_ID_COLUMN) + private UUID entityId; + + @Id + @Column(name = KEY_COLUMN) + private String key; + + @Id + @Column(name = TS_COLUMN) + private long ts; + + @Column(name = BOOLEAN_VALUE_COLUMN) + private Boolean booleanValue; + + @Column(name = STRING_VALUE_COLUMN) + private String strValue; + + @Column(name = LONG_VALUE_COLUMN) + private Long longValue; + + @Column(name = DOUBLE_VALUE_COLUMN) + private Double doubleValue; + + @Override + public TsKvEntry toData() { + return null; + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestCompositeKey.java new file mode 100644 index 0000000000..a68ddf7067 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestCompositeKey.java @@ -0,0 +1,39 @@ +/** + * 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.model.sql; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import javax.persistence.Transient; +import java.io.Serializable; +import java.util.UUID; + +@Data +@AllArgsConstructor +@EqualsAndHashCode +@ToString +public class TsKvLatestCompositeKey implements Serializable{ + + @Transient + private static final long serialVersionUID = -4089175869616037523L; + + private String entityType; + private UUID entityId; + private String key; +} \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestEntity.java new file mode 100644 index 0000000000..803b89a64e --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestEntity.java @@ -0,0 +1,68 @@ +/** + * 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.model.sql; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.thingsboard.server.common.data.kv.TsKvEntry; +import org.thingsboard.server.dao.model.ToData; + +import javax.persistence.*; +import java.util.UUID; + +import static org.thingsboard.server.dao.model.ModelConstants.*; + +@Data +@Entity +@Table(name = "ts_kv_latest") +@IdClass(TsKvLatestCompositeKey.class) +@EqualsAndHashCode +@ToString +public final class TsKvLatestEntity implements ToData { + + @Id + @Column(name = ENTITY_TYPE_COLUMN) + private String entityType; + + @Id + @Column(name = ENTITY_ID_COLUMN) + private UUID entityId; + + @Id + @Column(name = KEY_COLUMN) + private String key; + + @Column(name = TS_COLUMN) + private long ts; + + @Column(name = BOOLEAN_VALUE_COLUMN) + private Boolean booleanValue; + + @Column(name = STRING_VALUE_COLUMN) + private String strValue; + + @Column(name = LONG_VALUE_COLUMN) + private Long longValue; + + @Column(name = DOUBLE_VALUE_COLUMN) + private Double doubleValue; + + @Override + public TsKvEntry toData() { + return null; + } +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java index 9e53cc6b99..f3371f23e4 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java @@ -15,13 +15,20 @@ */ package org.thingsboard.server.dao.sql.timeseries; +import com.google.common.collect.Lists; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.EntityId; 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.model.sql.TsKvEntity; +import org.thingsboard.server.dao.model.sql.TsKvLatestCompositeKey; +import org.thingsboard.server.dao.model.sql.TsKvLatestEntity; +import org.thingsboard.server.dao.sql.JpaAbstractDaoListeningExecutorService; import org.thingsboard.server.dao.timeseries.TimeseriesDao; import java.util.List; @@ -29,41 +36,80 @@ import java.util.List; @Component @Slf4j @ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") -public class JpaTimeseriesDao implements TimeseriesDao { +public class JpaTimeseriesDao extends JpaAbstractDaoListeningExecutorService implements TimeseriesDao { - @Override - public long toPartitionTs(long ts) { - return 0; - } + @Autowired + private TsKvRepository tsKvRepository; + + @Autowired + private TsKvLatestRepository tsKvLatestRepository; @Override public ListenableFuture> findAllAsync(EntityId entityId, List queries) { + return null; + } + + private ListenableFuture> findAllAsync(EntityId entityId, TsKvQuery query) { return null; } @Override public ListenableFuture findLatest(EntityId entityId, String key) { - return null; + TsKvLatestCompositeKey compositeKey = + new TsKvLatestCompositeKey( + entityId.getEntityType().name(), + entityId.getId(), + key); + return service.submit(() -> + DaoUtil.getData(tsKvLatestRepository.findOne(compositeKey))); } @Override public ListenableFuture> findAllLatest(EntityId entityId) { - return null; + return service.submit(() -> + DaoUtil.convertDataList(Lists.newArrayList( + tsKvLatestRepository.findAllByEntityTypeAndEntityId( + entityId.getEntityType().name(), + entityId.getId())))); } @Override - public ListenableFuture save(EntityId entityId, long partition, TsKvEntry tsKvEntry, long ttl) { - return null; + public ListenableFuture save(EntityId entityId, TsKvEntry tsKvEntry, long ttl) { + TsKvEntity entity = new TsKvEntity(); + entity.setEntityType(entityId.getEntityType().name()); + entity.setEntityId(entityId.getId()); + entity.setTs(tsKvEntry.getTs()); + entity.setKey(tsKvEntry.getKey()); + entity.setStrValue(tsKvEntry.getStrValue().orElse(null)); + entity.setDoubleValue(tsKvEntry.getDoubleValue().orElse(null)); + entity.setLongValue(tsKvEntry.getLongValue().orElse(null)); + entity.setBooleanValue(tsKvEntry.getBooleanValue().orElse(null)); + return service.submit(() -> { + tsKvRepository.save(entity); + return null; + }); } @Override - public ListenableFuture savePartition(EntityId entityId, long partition, String key, long ttl) { + public ListenableFuture savePartition(EntityId entityId, long tsKvEntryTs, String key, long ttl) { return null; } @Override public ListenableFuture saveLatest(EntityId entityId, TsKvEntry tsKvEntry) { - return null; + TsKvLatestEntity latestEntity = new TsKvLatestEntity(); + latestEntity.setEntityType(entityId.getEntityType().name()); + latestEntity.setEntityId(entityId.getId()); + latestEntity.setTs(tsKvEntry.getTs()); + latestEntity.setKey(tsKvEntry.getKey()); + latestEntity.setStrValue(tsKvEntry.getStrValue().orElse(null)); + latestEntity.setDoubleValue(tsKvEntry.getDoubleValue().orElse(null)); + latestEntity.setLongValue(tsKvEntry.getLongValue().orElse(null)); + latestEntity.setBooleanValue(tsKvEntry.getBooleanValue().orElse(null)); + return service.submit(() -> { + tsKvLatestRepository.save(latestEntity); + return null; + }); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvLatestRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvLatestRepository.java new file mode 100644 index 0000000000..863064908f --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvLatestRepository.java @@ -0,0 +1,30 @@ +/** + * 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.sql.timeseries; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.repository.CrudRepository; +import org.thingsboard.server.dao.model.sql.TsKvLatestCompositeKey; +import org.thingsboard.server.dao.model.sql.TsKvLatestEntity; + +import java.util.List; +import java.util.UUID; + +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") +public interface TsKvLatestRepository extends CrudRepository { + + List findAllByEntityTypeAndEntityId(String entityType, UUID entityId); +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvRepository.java new file mode 100644 index 0000000000..6b087847f9 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvRepository.java @@ -0,0 +1,25 @@ +/** + * 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.sql.timeseries; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.data.repository.CrudRepository; +import org.thingsboard.server.dao.model.sql.TsKvCompositeKey; +import org.thingsboard.server.dao.model.sql.TsKvEntity; + +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") +public interface TsKvRepository extends CrudRepository { +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java index c4a71b3352..49f8a832df 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java @@ -72,9 +72,8 @@ public class BaseTimeseriesService implements TimeseriesService { if (tsKvEntry == null) { throw new IncorrectParameterException("Key value entry can't be null"); } - long partitionTs = timeseriesDao.toPartitionTs(tsKvEntry.getTs()); List> futures = Lists.newArrayListWithExpectedSize(INSERTS_PER_ENTRY); - saveAndRegisterFutures(futures, entityId, tsKvEntry, partitionTs, 0L); + saveAndRegisterFutures(futures, entityId, tsKvEntry, 0L); return Futures.allAsList(futures); } @@ -85,16 +84,15 @@ public class BaseTimeseriesService implements TimeseriesService { if (tsKvEntry == null) { throw new IncorrectParameterException("Key value entry can't be null"); } - long partitionTs = timeseriesDao.toPartitionTs(tsKvEntry.getTs()); - saveAndRegisterFutures(futures, entityId, tsKvEntry, partitionTs, ttl); + saveAndRegisterFutures(futures, entityId, tsKvEntry, ttl); } return Futures.allAsList(futures); } - private void saveAndRegisterFutures(List> futures, EntityId entityId, TsKvEntry tsKvEntry, long partitionTs, long ttl) { - futures.add(timeseriesDao.savePartition(entityId, partitionTs, tsKvEntry.getKey(), ttl)); + private void saveAndRegisterFutures(List> futures, EntityId entityId, TsKvEntry tsKvEntry, long ttl) { + futures.add(timeseriesDao.savePartition(entityId, tsKvEntry.getTs(), tsKvEntry.getKey(), ttl)); futures.add(timeseriesDao.saveLatest(entityId, tsKvEntry)); - futures.add(timeseriesDao.save(entityId, partitionTs, tsKvEntry, ttl)); + futures.add(timeseriesDao.save(entityId, tsKvEntry, ttl)); } private static void validate(EntityId entityId) { diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java index 21e01e6ad1..bb9a1b571d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java @@ -89,12 +89,6 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem super.stopExecutor(); } - @Override - public long toPartitionTs(long ts) { - LocalDateTime time = LocalDateTime.ofInstant(Instant.ofEpochMilli(ts), ZoneOffset.UTC); - return tsFormat.truncatedTo(time).toInstant(ZoneOffset.UTC).toEpochMilli(); - } - @Override public ListenableFuture> findAllAsync(EntityId entityId, List queries) { List>> futures = queries.stream().map(query -> findAllAsync(entityId, query)).collect(Collectors.toList()); @@ -163,6 +157,11 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem return resultFuture; } + private long toPartitionTs(long ts) { + LocalDateTime time = LocalDateTime.ofInstant(Instant.ofEpochMilli(ts), ZoneOffset.UTC); + return tsFormat.truncatedTo(time).toInstant(ZoneOffset.UTC).toEpochMilli(); + } + private void findAllAsyncSequentiallyWithLimit(final TsKvQueryCursor cursor, final SimpleListenableFuture> resultFuture) { if (cursor.isFull() || !cursor.hasNextPartition()) { resultFuture.set(cursor.getData()); @@ -259,7 +258,8 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem } @Override - public ListenableFuture save(EntityId entityId, long partition, TsKvEntry tsKvEntry, long ttl) { + public ListenableFuture save(EntityId entityId, TsKvEntry tsKvEntry, long ttl) { + long partition = toPartitionTs(tsKvEntry.getTs()); DataType type = tsKvEntry.getDataType(); BoundStatement stmt = (ttl == 0 ? getSaveStmt(type) : getSaveTtlStmt(type)).bind(); stmt.setString(0, entityId.getEntityType().name()) @@ -275,7 +275,8 @@ public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implem } @Override - public ListenableFuture savePartition(EntityId entityId, long partition, String key, long ttl) { + public ListenableFuture savePartition(EntityId entityId, long tsKvEntryTs, String key, long ttl) { + long partition = toPartitionTs(tsKvEntryTs); log.debug("Saving partition {} for the entity [{}-{}] and key {}", partition, entityId.getEntityType(), entityId.getId(), key); BoundStatement stmt = (ttl == 0 ? getPartitionInsertStmt() : getPartitionInsertTtlStmt()).bind(); stmt = stmt.setString(0, entityId.getEntityType().name()) diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java index 8f1b0031de..5d593b7fa8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/TimeseriesDao.java @@ -27,17 +27,15 @@ import java.util.List; */ public interface TimeseriesDao { - long toPartitionTs(long ts); - ListenableFuture> findAllAsync(EntityId entityId, List queries); ListenableFuture findLatest(EntityId entityId, String key); ListenableFuture> findAllLatest(EntityId entityId); - ListenableFuture save(EntityId entityId, long partition, TsKvEntry tsKvEntry, long ttl); + ListenableFuture save(EntityId entityId, TsKvEntry tsKvEntry, long ttl); - ListenableFuture savePartition(EntityId entityId, long partition, String key, long ttl); + ListenableFuture savePartition(EntityId entityId, long tsKvEntryTs, String key, long ttl); ListenableFuture saveLatest(EntityId entityId, TsKvEntry tsKvEntry); } diff --git a/dao/src/main/resources/postgres/schema.sql b/dao/src/main/resources/postgres/schema.sql index e78199fdf0..6791e0e7dd 100644 --- a/dao/src/main/resources/postgres/schema.sql +++ b/dao/src/main/resources/postgres/schema.sql @@ -51,18 +51,6 @@ CREATE TABLE IF NOT EXISTS alarm ( ); ALTER TABLE alarm OWNER TO postgres; -CREATE TABLE IF NOT EXISTS relation ( - from_id uuid, - from_type character varying(255), - to_id uuid, - to_type character varying(255), - relation_type_group character varying(255), - relation_type character varying(255), - additional_info jsonb, - CONSTRAINT relation_unq_key UNIQUE (from_id, from_type, relation_type_group, relation_type, to_id, to_type) -); -ALTER TABLE relation OWNER TO postgres; - CREATE TABLE IF NOT EXISTS asset ( id uuid NOT NULL CONSTRAINT asset_pkey PRIMARY KEY, additional_info jsonb, @@ -172,6 +160,18 @@ CREATE TABLE IF NOT EXISTS plugin ( ); ALTER TABLE plugin OWNER TO postgres; +CREATE TABLE IF NOT EXISTS relation ( + from_id uuid, + from_type character varying(255), + to_id uuid, + to_type character varying(255), + relation_type_group character varying(255), + relation_type character varying(255), + additional_info jsonb, + CONSTRAINT relation_unq_key UNIQUE (from_id, from_type, relation_type_group, relation_type, to_id, to_type) +); +ALTER TABLE relation OWNER TO postgres; + CREATE TABLE IF NOT EXISTS rule ( id uuid NOT NULL CONSTRAINT rule_pkey PRIMARY KEY, action jsonb, @@ -217,6 +217,32 @@ CREATE TABLE IF NOT EXISTS tenant ( ); ALTER TABLE tenant OWNER TO postgres; +CREATE TABLE IF NOT EXISTS ts_kv ( + entity_type character varying(255) NOT NULL, + entity_id uuid NOT NULL, + key character varying(255) NOT NULL, + ts bigint NOT NULL, + bool_v boolean, + str_v character varying(255), + long_v bigint, + dbl_v double precision, + CONSTRAINT ts_kv_unq_key UNIQUE (entity_type, entity_id, key, ts) +); +ALTER TABLE ts_kv OWNER TO postgres; + +CREATE TABLE IF NOT EXISTS ts_kv_latest ( + entity_type character varying(255) NOT NULL, + entity_id uuid NOT NULL, + key character varying(255) NOT NULL, + ts bigint NOT NULL, + bool_v boolean, + str_v character varying(255), + long_v bigint, + dbl_v double precision, + CONSTRAINT ts_kv_latest_unq_key UNIQUE (entity_type, entity_id, key) +); +ALTER TABLE ts_kv OWNER TO postgres; + CREATE TABLE IF NOT EXISTS user_credentials ( id uuid NOT NULL CONSTRAINT user_credentials_pkey PRIMARY KEY, activate_token character varying(255) UNIQUE, From 1141a26a17faf3f7c677b53d3268ef88d2d20d6d Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Thu, 15 Jun 2017 21:42:52 +0300 Subject: [PATCH 54/69] Changed blobd type to json text Added JPA support for service test --- ...e.java => ApplicationServerTestSuite.java} | 17 +- .../server/ThingsboardApplicationTests.java | 49 ----- .../controller/AbstractControllerTest.java | 20 +- .../controller/AssetControllerTest.java | 1 - .../CassandraControllerTestSuite.java | 38 ---- .../mqtt/AbstractFeatureIntegrationTest.java | 71 ------- .../rpc/MqttServerSideRpcIntegrationTest.java | 98 +++++---- ...java => MqttTelemetryIntegrationTest.java} | 31 ++- .../server/system/SystemTestSuite.java | 7 +- .../resources/thingsboard-test.properties | 3 - .../dao/model/sql/AdminSettingsEntity.java | 71 +------ .../server/dao/model/sql/AlarmEntity.java | 12 +- .../server/dao/model/sql/AssetEntity.java | 86 +------- .../model/sql/AttributeKvCompositeKey.java | 6 +- .../model/sql/ComponentDescriptorEntity.java | 18 +- .../server/dao/model/sql/CustomerEntity.java | 133 +------------ .../server/dao/model/sql/DashboardEntity.java | 95 +-------- .../dao/model/sql/DashboardInfoEntity.java | 77 +------ .../model/sql/DeviceCredentialsEntity.java | 71 +------ .../server/dao/model/sql/DeviceEntity.java | 89 +-------- .../server/dao/model/sql/EventEntity.java | 25 ++- .../dao/model/sql/PluginMetaDataEntity.java | 47 +---- .../dao/model/sql/RelationCompositeKey.java | 6 +- .../server/dao/model/sql/RelationEntity.java | 7 +- .../dao/model/sql/RuleMetaDataEntity.java | 64 ++---- .../dao/model/sql/TenantDeviceTypeEntity.java | 4 + .../server/dao/model/sql/TenantEntity.java | 147 +------------- .../dao/model/sql/TsKvCompositeKey.java | 6 +- .../dao/model/sql/TsKvLatestCompositeKey.java | 6 +- .../dao/model/sql/UserCredentialsEntity.java | 64 +----- .../server/dao/model/sql/UserEntity.java | 101 +--------- .../dao/model/sql/WidgetTypeEntity.java | 54 +---- .../dao/model/sql/WidgetsBundleEntity.java | 51 +---- .../server/dao/sql/asset/AssetRepository.java | 10 + .../server/dao/sql/asset/JpaAssetDao.java | 8 +- .../dashboard/DashboardInfoRepository.java | 2 +- ...ava => AbstractJsonSqlTypeDescriptor.java} | 48 +---- .../server/dao/util/JacksonUtil.java | 3 + .../dao/util/JsonStringSqlTypeDescriptor.java | 61 ++++++ ...sonBinaryType.java => JsonStringType.java} | 20 +- dao/src/main/resources/postgres/schema.sql | 70 ++----- .../main/resources/postgres/system-data.sql | 106 +++++----- .../server/dao/AbstractJpaDaoTest.java | 4 +- .../dao/plugin/BasePluginServiceTest.java | 2 - .../dao/service/AbstractServiceTest.java | 5 +- .../dao/service/UserServiceImplTest.java | 188 +++++++++--------- .../resources/application-test.properties | 4 +- dao/src/test/resources/jpa-test.properties | 15 +- .../extensions/kafka/KafkaDemoClient.java | 66 +++++- .../src/test/resources/logback.xml | 10 + tools/test.properties | 3 - .../server/transport/coap/CoapServerTest.java | 28 +-- 52 files changed, 626 insertions(+), 1602 deletions(-) rename application/src/test/java/org/thingsboard/server/{mqtt/MqttSuite.java => ApplicationServerTestSuite.java} (73%) delete mode 100644 application/src/test/java/org/thingsboard/server/ThingsboardApplicationTests.java delete mode 100644 application/src/test/java/org/thingsboard/server/controller/CassandraControllerTestSuite.java delete mode 100644 application/src/test/java/org/thingsboard/server/mqtt/AbstractFeatureIntegrationTest.java rename application/src/test/java/org/thingsboard/server/mqtt/telemetry/{MqttTelemetryIntergrationTest.java => MqttTelemetryIntegrationTest.java} (70%) delete mode 100644 application/src/test/resources/thingsboard-test.properties rename dao/src/main/java/org/thingsboard/server/dao/util/{JsonBinarySqlTypeDescriptor.java => AbstractJsonSqlTypeDescriptor.java} (61%) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/util/JsonStringSqlTypeDescriptor.java rename dao/src/main/java/org/thingsboard/server/dao/util/{JsonBinaryType.java => JsonStringType.java} (79%) create mode 100644 extensions/extension-kafka/src/test/resources/logback.xml delete mode 100644 tools/test.properties diff --git a/application/src/test/java/org/thingsboard/server/mqtt/MqttSuite.java b/application/src/test/java/org/thingsboard/server/ApplicationServerTestSuite.java similarity index 73% rename from application/src/test/java/org/thingsboard/server/mqtt/MqttSuite.java rename to application/src/test/java/org/thingsboard/server/ApplicationServerTestSuite.java index c43b97bcad..3ce72d24bd 100644 --- a/application/src/test/java/org/thingsboard/server/mqtt/MqttSuite.java +++ b/application/src/test/java/org/thingsboard/server/ApplicationServerTestSuite.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.mqtt; +package org.thingsboard.server; import org.cassandraunit.dataset.cql.ClassPathCQLDataSet; import org.junit.ClassRule; @@ -23,19 +23,18 @@ import org.thingsboard.server.dao.CustomCassandraCQLUnit; import java.util.Arrays; -/** - * @author Valerii Sosliuk - */ @RunWith(ClasspathSuite.class) -@ClasspathSuite.ClassnameFilters({"org.thingsboard.server.mqtt.*.*Test"}) -public class MqttSuite { +@ClasspathSuite.ClassnameFilters({ + "org.thingsboard.server.controller.*Test", + "org.thingsboard.server.mqtt.*.*Test"}) +public class ApplicationServerTestSuite { @ClassRule public static CustomCassandraCQLUnit cassandraUnit = new CustomCassandraCQLUnit( - Arrays.asList(new ClassPathCQLDataSet("cassandra/schema.cql", false, false), + Arrays.asList( + new ClassPathCQLDataSet("cassandra/schema.cql", false, false), new ClassPathCQLDataSet("cassandra/system-data.cql", false, false), - new ClassPathCQLDataSet("cassandra/demo-data.cql", false, false)), + new ClassPathCQLDataSet("system-test.cql", false, false)), "cassandra-test.yaml", 30000l); - } diff --git a/application/src/test/java/org/thingsboard/server/ThingsboardApplicationTests.java b/application/src/test/java/org/thingsboard/server/ThingsboardApplicationTests.java deleted file mode 100644 index 80d0b62205..0000000000 --- a/application/src/test/java/org/thingsboard/server/ThingsboardApplicationTests.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * 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; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.web.WebAppConfiguration; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = ThingsboardServerApplication.class) -@WebAppConfiguration -@IntegrationTest("server.port:0") -public class ThingsboardApplicationTests { - - @Test - public void contextLoads() { - String test = "[ \n" + - " {\n" + - " \"key\": \"name\",\n" + - "\t\"type\": \"text\" \n" + - " },\n" + - " {\n" + - "\t\"key\": \"name2\",\n" + - "\t\"type\": \"color\"\n" + - " },\n" + - " {\n" + - "\t\"key\": \"name3\",\n" + - "\t\"type\": \"javascript\"\n" + - " } \n" + - "]"; - } - -} diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java index de77fe9b19..ca02138d2a 100644 --- a/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java @@ -29,8 +29,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationContextLoader; +import org.springframework.boot.test.context.SpringBootContextLoader; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpHeaders; @@ -43,7 +43,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultActions; @@ -78,14 +78,14 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup; @ActiveProfiles("test") -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes=AbstractControllerTest.class, loader=SpringApplicationContextLoader.class) -@TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:thingsboard-test.properties"}) +@RunWith(SpringRunner.class) +@ContextConfiguration(classes = AbstractControllerTest.class, loader = SpringBootContextLoader.class) +@TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:application-test.properties"}) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) @Configuration @ComponentScan({"org.thingsboard.server"}) @WebAppConfiguration -@IntegrationTest("server.port:0") +@SpringBootTest public abstract class AbstractControllerTest { protected static final String TEST_TENANT_NAME = "TEST TENANT"; @@ -294,7 +294,7 @@ public abstract class AbstractControllerTest { protected T doPost(String urlTemplate, T content, Class responseClass, String... params) throws Exception { return readResponse(doPost(urlTemplate, content, params).andExpect(status().isOk()), responseClass); } - + protected T doDelete(String urlTemplate, Class responseClass, String... params) throws Exception { return readResponse(doDelete(urlTemplate, params).andExpect(status().isOk()), responseClass); } @@ -353,8 +353,8 @@ public abstract class AbstractControllerTest { ObjectMapper mapper = new ObjectMapper(); return mapper.readerFor(type).readValue(content); } - - class IdComparator> implements Comparator { + + public class IdComparator> implements Comparator { @Override public int compare(D o1, D o2) { return o1.getId().getId().compareTo(o2.getId().getId()); diff --git a/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java index 10a2ff7c8f..d15023b91f 100644 --- a/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java @@ -28,7 +28,6 @@ import org.thingsboard.server.common.data.*; import org.thingsboard.server.common.data.asset.Asset; import org.thingsboard.server.common.data.asset.TenantAssetType; import org.thingsboard.server.common.data.id.CustomerId; -import org.thingsboard.server.common.data.id.AssetId; import org.thingsboard.server.common.data.page.TextPageData; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.security.Authority; diff --git a/application/src/test/java/org/thingsboard/server/controller/CassandraControllerTestSuite.java b/application/src/test/java/org/thingsboard/server/controller/CassandraControllerTestSuite.java deleted file mode 100644 index 825b2cb653..0000000000 --- a/application/src/test/java/org/thingsboard/server/controller/CassandraControllerTestSuite.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * 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.controller; - -import org.cassandraunit.dataset.cql.ClassPathCQLDataSet; -import org.junit.ClassRule; -import org.junit.extensions.cpsuite.ClasspathSuite; -import org.junit.extensions.cpsuite.ClasspathSuite.ClassnameFilters; -import org.junit.runner.RunWith; -import org.thingsboard.server.dao.CustomCassandraCQLUnit; - -import java.util.Arrays; - -@RunWith(ClasspathSuite.class) -@ClassnameFilters({"org.thingsboard.server.controller.*Test"}) -public class CassandraControllerTestSuite { - - @ClassRule - public static CustomCassandraCQLUnit cassandraUnit = - new CustomCassandraCQLUnit(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); -} diff --git a/application/src/test/java/org/thingsboard/server/mqtt/AbstractFeatureIntegrationTest.java b/application/src/test/java/org/thingsboard/server/mqtt/AbstractFeatureIntegrationTest.java deleted file mode 100644 index 13943eab7c..0000000000 --- a/application/src/test/java/org/thingsboard/server/mqtt/AbstractFeatureIntegrationTest.java +++ /dev/null @@ -1,71 +0,0 @@ -/** - * 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.mqtt; - -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationContextLoader; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; -import org.springframework.web.context.WebApplicationContext; -import org.thingsboard.server.mqtt.telemetry.MqttTelemetryIntergrationTest; - -import java.util.Arrays; - -import static org.junit.Assert.assertNotNull; - -/** - * @author Valerii Sosliuk - */ -@ActiveProfiles("default") -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes= MqttTelemetryIntergrationTest.class, loader=SpringApplicationContextLoader.class) -@TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:thingsboard-test.properties"}) -@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) -@Configuration -@ComponentScan({"org.thingsboard.server"}) -@WebAppConfiguration -@IntegrationTest("server.port:8080") -public class AbstractFeatureIntegrationTest { - - @SuppressWarnings("rawtypes") - private HttpMessageConverter mappingJackson2HttpMessageConverter; - - @Autowired - private WebApplicationContext webApplicationContext; - - @Autowired - void setConverters(HttpMessageConverter[] converters) { - - this.mappingJackson2HttpMessageConverter = Arrays.stream(converters) - .filter(hmc -> hmc instanceof MappingJackson2HttpMessageConverter) - .findAny() - .get(); - - assertNotNull("the JSON message converter must not be null", - this.mappingJackson2HttpMessageConverter); - } - -} diff --git a/application/src/test/java/org/thingsboard/server/mqtt/rpc/MqttServerSideRpcIntegrationTest.java b/application/src/test/java/org/thingsboard/server/mqtt/rpc/MqttServerSideRpcIntegrationTest.java index ac47d7ed64..a3a2355387 100644 --- a/application/src/test/java/org/thingsboard/server/mqtt/rpc/MqttServerSideRpcIntegrationTest.java +++ b/application/src/test/java/org/thingsboard/server/mqtt/rpc/MqttServerSideRpcIntegrationTest.java @@ -17,47 +17,67 @@ package org.thingsboard.server.mqtt.rpc; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.*; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.*; import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.web.client.HttpClientErrorException; -import org.thingsboard.client.tools.RestClient; import org.thingsboard.server.common.data.Device; +import org.thingsboard.server.common.data.Tenant; +import org.thingsboard.server.common.data.User; +import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.common.data.security.DeviceCredentials; -import org.thingsboard.server.mqtt.AbstractFeatureIntegrationTest; +import org.thingsboard.server.controller.AbstractControllerTest; import java.util.UUID; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; /** * @author Valerii Sosliuk */ @Slf4j -public class MqttServerSideRpcIntegrationTest extends AbstractFeatureIntegrationTest { +public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest { private static final String MQTT_URL = "tcp://localhost:1883"; - private static final String BASE_URL = "http://localhost:8080"; + private static final String FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED = "HttpClientErrorException expected, but not encountered"; - private static final String USERNAME = "tenant@thingsboard.org"; - private static final String PASSWORD = "tenant"; - - private RestClient restClient; + private Tenant savedTenant; + private User tenantAdmin; @Before public void beforeTest() throws Exception { - restClient = new RestClient(BASE_URL); - restClient.login(USERNAME, PASSWORD); + loginSysAdmin(); + + Tenant tenant = new Tenant(); + tenant.setTitle("My tenant"); + savedTenant = doPost("/api/tenant", tenant, Tenant.class); + Assert.assertNotNull(savedTenant); + + tenantAdmin = new User(); + tenantAdmin.setAuthority(Authority.TENANT_ADMIN); + tenantAdmin.setTenantId(savedTenant.getId()); + tenantAdmin.setEmail("tenant2@thingsboard.org"); + tenantAdmin.setFirstName("Joe"); + tenantAdmin.setLastName("Downs"); + + createUserAndLogin(tenantAdmin, "testPassword1"); + } + + @After + public void afterTest() throws Exception { + loginSysAdmin(); + + doDelete("/api/tenant/" + savedTenant.getId().getId().toString()) + .andExpect(status().isOk()); } @Test + @Ignore public void testServerMqttOneWayRpc() throws Exception { Device device = new Device(); device.setName("Test One-Way Server-Side RPC"); + device.setType("default"); Device savedDevice = getSavedDevice(device); DeviceCredentials deviceCredentials = getDeviceCredentials(savedDevice); assertEquals(savedDevice.getId(), deviceCredentials.getDeviceId()); @@ -69,22 +89,22 @@ public class MqttServerSideRpcIntegrationTest extends AbstractFeatureIntegration MqttConnectOptions options = new MqttConnectOptions(); options.setUserName(accessToken); - client.connect(options); - Thread.sleep(3000); + client.connect(options).waitForCompletion(); client.subscribe("v1/devices/me/rpc/request/+", 1); client.setCallback(new TestMqttCallback(client)); String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}"; String deviceId = savedDevice.getId().getId().toString(); - ResponseEntity result = restClient.getRestTemplate().postForEntity(BASE_URL + "api/plugins/rpc/oneway/" + deviceId, setGpioRequest, String.class); - Assert.assertEquals(HttpStatus.OK, result.getStatusCode()); - Assert.assertNull(result.getBody()); + String result = doPost("api/plugins/rpc/oneway/" + deviceId, setGpioRequest, String.class); + Assert.assertNull(result); } @Test + @Ignore public void testServerMqttOneWayRpcDeviceOffline() throws Exception { Device device = new Device(); device.setName("Test One-Way Server-Side RPC Device Offline"); + device.setType("default"); Device savedDevice = getSavedDevice(device); DeviceCredentials deviceCredentials = getDeviceCredentials(savedDevice); assertEquals(savedDevice.getId(), deviceCredentials.getDeviceId()); @@ -94,8 +114,8 @@ public class MqttServerSideRpcIntegrationTest extends AbstractFeatureIntegration String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}"; String deviceId = savedDevice.getId().getId().toString(); try { - restClient.getRestTemplate().postForEntity(BASE_URL + "api/plugins/rpc/oneway/" + deviceId, setGpioRequest, String.class); - Assert.fail("HttpClientErrorException expected, but not encountered"); + doPost("api/plugins/rpc/oneway/" + deviceId, setGpioRequest, String.class); + Assert.fail(FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED); } catch (HttpClientErrorException e) { log.error(e.getMessage(), e); Assert.assertEquals(HttpStatus.REQUEST_TIMEOUT, e.getStatusCode()); @@ -104,12 +124,13 @@ public class MqttServerSideRpcIntegrationTest extends AbstractFeatureIntegration } @Test + @Ignore public void testServerMqttOneWayRpcDeviceDoesNotExist() throws Exception { String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}"; String nonExistentDeviceId = UUID.randomUUID().toString(); try { - restClient.getRestTemplate().postForEntity(BASE_URL + "api/plugins/rpc/oneway/" + nonExistentDeviceId, setGpioRequest, String.class); - Assert.fail("HttpClientErrorException expected, but not encountered"); + doPost("api/plugins/rpc/oneway/" + nonExistentDeviceId, setGpioRequest, String.class); + Assert.fail(FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED); } catch (HttpClientErrorException e) { log.error(e.getMessage(), e); Assert.assertEquals(HttpStatus.BAD_REQUEST, e.getStatusCode()); @@ -118,10 +139,11 @@ public class MqttServerSideRpcIntegrationTest extends AbstractFeatureIntegration } @Test + @Ignore public void testServerMqttTwoWayRpc() throws Exception { - Device device = new Device(); device.setName("Test Two-Way Server-Side RPC"); + device.setType("default"); Device savedDevice = getSavedDevice(device); DeviceCredentials deviceCredentials = getDeviceCredentials(savedDevice); assertEquals(savedDevice.getId(), deviceCredentials.getDeviceId()); @@ -133,8 +155,7 @@ public class MqttServerSideRpcIntegrationTest extends AbstractFeatureIntegration MqttConnectOptions options = new MqttConnectOptions(); options.setUserName(accessToken); - client.connect(options); - Thread.sleep(3000); + client.connect(options).waitForCompletion(); client.subscribe("v1/devices/me/rpc/request/+", 1); client.setCallback(new TestMqttCallback(client)); @@ -145,9 +166,11 @@ public class MqttServerSideRpcIntegrationTest extends AbstractFeatureIntegration } @Test + @Ignore public void testServerMqttTwoWayRpcDeviceOffline() throws Exception { Device device = new Device(); device.setName("Test Two-Way Server-Side RPC Device Offline"); + device.setType("default"); Device savedDevice = getSavedDevice(device); DeviceCredentials deviceCredentials = getDeviceCredentials(savedDevice); assertEquals(savedDevice.getId(), deviceCredentials.getDeviceId()); @@ -157,8 +180,8 @@ public class MqttServerSideRpcIntegrationTest extends AbstractFeatureIntegration String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}"; String deviceId = savedDevice.getId().getId().toString(); try { - restClient.getRestTemplate().postForEntity(BASE_URL + "api/plugins/rpc/twoway/" + deviceId, setGpioRequest, String.class); - Assert.fail("HttpClientErrorException expected, but not encountered"); + doPost("api/plugins/rpc/twoway/" + deviceId, setGpioRequest, String.class); + Assert.fail(FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED); } catch (HttpClientErrorException e) { log.error(e.getMessage(), e); Assert.assertEquals(HttpStatus.REQUEST_TIMEOUT, e.getStatusCode()); @@ -167,12 +190,13 @@ public class MqttServerSideRpcIntegrationTest extends AbstractFeatureIntegration } @Test + @Ignore public void testServerMqttTwoWayRpcDeviceDoesNotExist() throws Exception { String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}"; String nonExistentDeviceId = UUID.randomUUID().toString(); try { - restClient.getRestTemplate().postForEntity(BASE_URL + "api/plugins/rpc/oneway/" + nonExistentDeviceId, setGpioRequest, String.class); - Assert.fail("HttpClientErrorException expected, but not encountered"); + doPost("api/plugins/rpc/oneway/" + nonExistentDeviceId, setGpioRequest, String.class); + Assert.fail(FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED); } catch (HttpClientErrorException e) { log.error(e.getMessage(), e); Assert.assertEquals(HttpStatus.BAD_REQUEST, e.getStatusCode()); @@ -180,16 +204,16 @@ public class MqttServerSideRpcIntegrationTest extends AbstractFeatureIntegration } } - private Device getSavedDevice(Device device) { - return restClient.getRestTemplate().postForEntity(BASE_URL + "/api/device", device, Device.class).getBody(); + private Device getSavedDevice(Device device) throws Exception { + return doPost("/api/device", device, Device.class); } - private DeviceCredentials getDeviceCredentials(Device savedDevice) { - return restClient.getRestTemplate().getForEntity(BASE_URL + "/api/device/" + savedDevice.getId().getId().toString() + "/credentials", DeviceCredentials.class).getBody(); + private DeviceCredentials getDeviceCredentials(Device savedDevice) throws Exception { + return doGet("/api/device/" + savedDevice.getId().getId().toString() + "/credentials", DeviceCredentials.class); } - private String getStringResult(String requestData, String callType, String deviceId) { - return restClient.getRestTemplate().postForEntity(BASE_URL + "api/plugins/rpc/" + callType + "/" + deviceId, requestData, String.class).getBody(); + private String getStringResult(String requestData, String callType, String deviceId) throws Exception { + return doPost("api/plugins/rpc/" + callType + "/" + deviceId, requestData, String.class); } private static class TestMqttCallback implements MqttCallback { diff --git a/application/src/test/java/org/thingsboard/server/mqtt/telemetry/MqttTelemetryIntergrationTest.java b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/MqttTelemetryIntegrationTest.java similarity index 70% rename from application/src/test/java/org/thingsboard/server/mqtt/telemetry/MqttTelemetryIntergrationTest.java rename to application/src/test/java/org/thingsboard/server/mqtt/telemetry/MqttTelemetryIntegrationTest.java index d4f139c893..b0b628a8a1 100644 --- a/application/src/test/java/org/thingsboard/server/mqtt/telemetry/MqttTelemetryIntergrationTest.java +++ b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/MqttTelemetryIntegrationTest.java @@ -20,12 +20,12 @@ import org.eclipse.paho.client.mqttv3.MqttAsyncClient; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; import org.eclipse.paho.client.mqttv3.MqttMessage; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.springframework.web.util.UriComponentsBuilder; -import org.thingsboard.client.tools.RestClient; import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.security.DeviceCredentials; -import org.thingsboard.server.mqtt.AbstractFeatureIntegrationTest; +import org.thingsboard.server.controller.AbstractControllerTest; import java.net.URI; import java.util.Arrays; @@ -39,35 +39,32 @@ import static org.junit.Assert.assertNotNull; * @author Valerii Sosliuk */ @Slf4j -public class MqttTelemetryIntergrationTest extends AbstractFeatureIntegrationTest { +public class MqttTelemetryIntegrationTest extends AbstractControllerTest { private static final String MQTT_URL = "tcp://localhost:1883"; - private static final String BASE_URL = "http://localhost:8080"; - - private static final String USERNAME = "tenant@thingsboard.org"; - private static final String PASSWORD = "tenant"; private Device savedDevice; - private String accessToken; - private RestClient restClient; @Before public void beforeTest() throws Exception { - restClient = new RestClient(BASE_URL); - restClient.login(USERNAME, PASSWORD); + loginTenantAdmin(); Device device = new Device(); device.setName("Test device"); - savedDevice = restClient.getRestTemplate().postForEntity(BASE_URL + "/api/device", device, Device.class).getBody(); + device.setType("default"); + savedDevice = doPost("/api/device", device, Device.class); + DeviceCredentials deviceCredentials = - restClient.getRestTemplate().getForEntity(BASE_URL + "/api/device/" + savedDevice.getId().getId().toString() + "/credentials", DeviceCredentials.class).getBody(); + doGet("/api/device/" + savedDevice.getId().getId().toString() + "/credentials", DeviceCredentials.class); + assertEquals(savedDevice.getId(), deviceCredentials.getDeviceId()); accessToken = deviceCredentials.getCredentialsId(); assertNotNull(accessToken); } @Test + @Ignore public void testPushMqttRpcData() throws Exception { String clientId = MqttAsyncClient.generateClientId(); MqttAsyncClient client = new MqttAsyncClient(MQTT_URL, clientId); @@ -83,13 +80,13 @@ public class MqttTelemetryIntergrationTest extends AbstractFeatureIntegrationTes String deviceId = savedDevice.getId().getId().toString(); Thread.sleep(1000); - List keys = restClient.getRestTemplate().getForEntity(BASE_URL + "/api/plugins/telemetry/" + deviceId + "/keys/timeseries", List.class).getBody(); + Object keys = doGet("/api/plugins/telemetry/" + deviceId + "/keys/timeseries", Object.class); assertEquals(Arrays.asList("key1", "key2", "key3", "key4"), keys); - UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(BASE_URL + "/api/plugins/telemetry/" + deviceId + "/values/timeseries") - .queryParam("keys", String.join(",", keys)); + UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl("/api/plugins/telemetry/" + deviceId + "/values/timeseries") + .queryParam("keys", String.join(",", (CharSequence[]) keys)); URI uri = builder.build().encode().toUri(); - Map>> values = restClient.getRestTemplate().getForEntity(uri, Map.class).getBody(); + Map>> values = doGet(uri.getPath(), Map.class); assertEquals("value1", values.get("key1").get(0).get("value")); assertEquals("true", values.get("key2").get(0).get("value")); diff --git a/application/src/test/java/org/thingsboard/server/system/SystemTestSuite.java b/application/src/test/java/org/thingsboard/server/system/SystemTestSuite.java index cb2ef56318..fac12e76a0 100644 --- a/application/src/test/java/org/thingsboard/server/system/SystemTestSuite.java +++ b/application/src/test/java/org/thingsboard/server/system/SystemTestSuite.java @@ -32,8 +32,9 @@ public class SystemTestSuite { @ClassRule public static CustomCassandraCQLUnit cassandraUnit = - new CustomCassandraCQLUnit(Arrays.asList( - new ClassPathCQLDataSet("cassandra/schema.cql", false, false), - new ClassPathCQLDataSet("cassandra/system-data.cql", false, false)), + new CustomCassandraCQLUnit( + Arrays.asList( + new ClassPathCQLDataSet("cassandra/schema.cql", false, false), + new ClassPathCQLDataSet("cassandra/system-data.cql", false, false)), "cassandra-test.yaml", 30000l); } diff --git a/application/src/test/resources/thingsboard-test.properties b/application/src/test/resources/thingsboard-test.properties deleted file mode 100644 index 983da30de4..0000000000 --- a/application/src/test/resources/thingsboard-test.properties +++ /dev/null @@ -1,3 +0,0 @@ -updates.enabled=false -cassandra.enabled=true -sql.enabled=false \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java index 27f988a780..717caf52ff 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java @@ -16,31 +16,28 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; -import lombok.extern.slf4j.Slf4j; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.hibernate.annotations.Type; 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.JsonBinaryType; +import org.thingsboard.server.dao.util.JsonStringType; -import java.io.IOException; +import javax.persistence.*; import java.util.UUID; import static org.thingsboard.server.dao.model.ModelConstants.*; @Data @Entity -@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) +@TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ADMIN_SETTINGS_COLUMN_FAMILY_NAME) +@EqualsAndHashCode +@ToString public final class AdminSettingsEntity implements BaseEntity { @Transient @@ -53,8 +50,8 @@ public final class AdminSettingsEntity implements BaseEntity { @Column(name = ADMIN_SETTINGS_KEY_PROPERTY) private String key; - @Type(type = "jsonb") - @Column(name = ADMIN_SETTINGS_JSON_VALUE_PROPERTY, columnDefinition = "jsonb") + @Type(type = "json") + @Column(name = ADMIN_SETTINGS_JSON_VALUE_PROPERTY, columnDefinition = "json") private JsonNode jsonValue; public AdminSettingsEntity() { @@ -79,56 +76,6 @@ public final class AdminSettingsEntity implements BaseEntity { this.id = id; } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((id == null) ? 0 : id.hashCode()); - result = prime * result + ((jsonValue == null) ? 0 : jsonValue.hashCode()); - result = prime * result + ((key == null) ? 0 : key.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - AdminSettingsEntity other = (AdminSettingsEntity) obj; - if (id == null) { - if (other.id != null) - return false; - } else if (!id.equals(other.id)) - return false; - if (jsonValue == null) { - if (other.jsonValue != null) - return false; - } else if (!jsonValue.equals(other.jsonValue)) - return false; - if (key == null) { - if (other.key != null) - return false; - } else if (!key.equals(other.key)) - return false; - return true; - } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("AdminSettingsEntity [id="); - builder.append(id); - builder.append(", key="); - builder.append(key); - builder.append(", jsonValue="); - builder.append(jsonValue); - builder.append("]"); - return builder.toString(); - } - @Override public AdminSettings toData() { AdminSettings adminSettings = new AdminSettings(new AdminSettingsId(id)); diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java index d807c59dbe..c6642d6dbd 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java @@ -18,7 +18,10 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.hibernate.annotations.Type; +import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.alarm.Alarm; import org.thingsboard.server.common.data.alarm.AlarmId; @@ -28,6 +31,8 @@ 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.JacksonUtil; +import org.thingsboard.server.dao.util.JsonStringType; import javax.persistence.*; import java.util.UUID; @@ -36,7 +41,10 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Data @Entity +@TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ALARM_COLUMN_FAMILY_NAME) +@EqualsAndHashCode +@ToString public final class AlarmEntity implements BaseEntity { @Transient @@ -78,8 +86,8 @@ public final class AlarmEntity implements BaseEntity { @Column(name = ALARM_CLEAR_TS_PROPERTY) private Long clearTs; - @Type(type = "jsonb") - @Column(name = ModelConstants.ASSET_ADDITIONAL_INFO_PROPERTY, columnDefinition = "jsonb") + @Type(type = "json") + @Column(name = ModelConstants.ASSET_ADDITIONAL_INFO_PROPERTY, columnDefinition = "json") private JsonNode details; @Column(name = ALARM_PROPAGATE_PROPERTY) diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java index dd7362278e..6c05fb7879 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java @@ -18,13 +18,18 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.hibernate.annotations.Type; +import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.asset.Asset; import org.thingsboard.server.common.data.id.AssetId; 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.JacksonUtil; +import org.thingsboard.server.dao.util.JsonStringType; import javax.persistence.*; import java.util.UUID; @@ -33,7 +38,10 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Data @Entity +@TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ASSET_COLUMN_FAMILY_NAME) +@EqualsAndHashCode +@ToString public final class AssetEntity implements SearchTextEntity { @Transient @@ -58,8 +66,8 @@ public final class AssetEntity implements SearchTextEntity { @Column(name = SEARCH_TEXT_PROPERTY) private String searchText; - @Type(type = "jsonb") - @Column(name = ModelConstants.ASSET_ADDITIONAL_INFO_PROPERTY, columnDefinition = "jsonb") + @Type(type = "json") + @Column(name = ModelConstants.ASSET_ADDITIONAL_INFO_PROPERTY, columnDefinition = "json") private JsonNode additionalInfo; public AssetEntity() { @@ -95,80 +103,6 @@ public final class AssetEntity implements SearchTextEntity { return searchText; } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((additionalInfo == null) ? 0 : additionalInfo.hashCode()); - result = prime * result + ((customerId == null) ? 0 : customerId.hashCode()); - result = prime * result + ((id == null) ? 0 : id.hashCode()); - result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result + ((type == null) ? 0 : type.hashCode()); - result = prime * result + ((tenantId == null) ? 0 : tenantId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - AssetEntity other = (AssetEntity) obj; - if (additionalInfo == null) { - if (other.additionalInfo != null) - return false; - } else if (!additionalInfo.equals(other.additionalInfo)) - return false; - if (customerId == null) { - if (other.customerId != null) - return false; - } else if (!customerId.equals(other.customerId)) - return false; - if (id == null) { - if (other.id != null) - return false; - } else if (!id.equals(other.id)) - return false; - if (name == null) { - if (other.name != null) - return false; - } else if (!name.equals(other.name)) - return false; - if (type == null) { - if (other.type != null) - return false; - } else if (!type.equals(other.type)) - return false; - if (tenantId == null) { - if (other.tenantId != null) - return false; - } else if (!tenantId.equals(other.tenantId)) - return false; - return true; - } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("AssetEntity [id="); - builder.append(id); - builder.append(", tenantId="); - builder.append(tenantId); - builder.append(", customerId="); - builder.append(customerId); - builder.append(", name="); - builder.append(name); - builder.append(", type="); - builder.append(type); - builder.append(", additionalInfo="); - builder.append(additionalInfo); - builder.append("]"); - return builder.toString(); - } - @Override public Asset toData() { Asset asset = new Asset(new AssetId(id)); diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java index 7424e1fb89..830b73575d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java @@ -15,9 +15,7 @@ */ package org.thingsboard.server.dao.model.sql; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import java.io.Serializable; import java.util.UUID; @@ -25,6 +23,8 @@ import java.util.UUID; @Data @AllArgsConstructor @NoArgsConstructor +@EqualsAndHashCode +@ToString public class AttributeKvCompositeKey implements Serializable { private String entityType; private UUID entityId; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java index 00e34e8081..2843762dcd 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java @@ -15,12 +15,10 @@ */ package org.thingsboard.server.dao.model.sql; -import javax.persistence.*; - import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; -import lombok.extern.slf4j.Slf4j; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.id.ComponentDescriptorId; @@ -29,15 +27,17 @@ 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.JsonBinaryType; +import org.thingsboard.server.dao.util.JsonStringType; -import java.io.IOException; +import javax.persistence.*; import java.util.UUID; @Data @Entity -@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) +@TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ModelConstants.COMPONENT_DESCRIPTOR_COLUMN_FAMILY_NAME) +@EqualsAndHashCode +@ToString public class ComponentDescriptorEntity implements SearchTextEntity { @Transient @@ -61,8 +61,8 @@ public class ComponentDescriptorEntity implements SearchTextEntity { @Transient @@ -73,8 +80,8 @@ public final class CustomerEntity implements SearchTextEntity { @Column(name = ModelConstants.EMAIL_PROPERTY) private String email; - @Type(type = "jsonb") - @Column(name = ModelConstants.CUSTOMER_ADDITIONAL_INFO_PROPERTY, columnDefinition = "jsonb") + @Type(type = "json") + @Column(name = ModelConstants.CUSTOMER_ADDITIONAL_INFO_PROPERTY, columnDefinition = "json") private JsonNode additionalInfo; public CustomerEntity() { @@ -117,128 +124,6 @@ public final class CustomerEntity implements SearchTextEntity { public void setSearchText(String searchText) { this.searchText = searchText; } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((additionalInfo == null) ? 0 : additionalInfo.hashCode()); - result = prime * result + ((address == null) ? 0 : address.hashCode()); - result = prime * result + ((address2 == null) ? 0 : address2.hashCode()); - result = prime * result + ((city == null) ? 0 : city.hashCode()); - result = prime * result + ((country == null) ? 0 : country.hashCode()); - result = prime * result + ((email == null) ? 0 : email.hashCode()); - result = prime * result + ((id == null) ? 0 : id.hashCode()); - result = prime * result + ((phone == null) ? 0 : phone.hashCode()); - result = prime * result + ((state == null) ? 0 : state.hashCode()); - result = prime * result + ((tenantId == null) ? 0 : tenantId.hashCode()); - result = prime * result + ((title == null) ? 0 : title.hashCode()); - result = prime * result + ((zip == null) ? 0 : zip.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - CustomerEntity other = (CustomerEntity) obj; - if (additionalInfo == null) { - if (other.additionalInfo != null) - return false; - } else if (!additionalInfo.equals(other.additionalInfo)) - return false; - if (address == null) { - if (other.address != null) - return false; - } else if (!address.equals(other.address)) - return false; - if (address2 == null) { - if (other.address2 != null) - return false; - } else if (!address2.equals(other.address2)) - return false; - if (city == null) { - if (other.city != null) - return false; - } else if (!city.equals(other.city)) - return false; - if (country == null) { - if (other.country != null) - return false; - } else if (!country.equals(other.country)) - return false; - if (email == null) { - if (other.email != null) - return false; - } else if (!email.equals(other.email)) - return false; - if (id == null) { - if (other.id != null) - return false; - } else if (!id.equals(other.id)) - return false; - if (phone == null) { - if (other.phone != null) - return false; - } else if (!phone.equals(other.phone)) - return false; - if (state == null) { - if (other.state != null) - return false; - } else if (!state.equals(other.state)) - return false; - if (tenantId == null) { - if (other.tenantId != null) - return false; - } else if (!tenantId.equals(other.tenantId)) - return false; - if (title == null) { - if (other.title != null) - return false; - } else if (!title.equals(other.title)) - return false; - if (zip == null) { - if (other.zip != null) - return false; - } else if (!zip.equals(other.zip)) - return false; - return true; - } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("CustomerEntity [id="); - builder.append(id); - builder.append(", tenantId="); - builder.append(tenantId); - builder.append(", title="); - builder.append(title); - builder.append(", country="); - builder.append(country); - builder.append(", state="); - builder.append(state); - builder.append(", city="); - builder.append(city); - builder.append(", address="); - builder.append(address); - builder.append(", address2="); - builder.append(address2); - builder.append(", zip="); - builder.append(zip); - builder.append(", phone="); - builder.append(phone); - builder.append(", email="); - builder.append(email); - builder.append(", additionalInfo="); - builder.append(additionalInfo); - builder.append("]"); - return builder.toString(); - } @Override public Customer toData() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java index 4cc46f466c..e7967159f2 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java @@ -16,15 +16,10 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; -import lombok.extern.slf4j.Slf4j; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.Dashboard; @@ -33,15 +28,17 @@ 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.JsonBinaryType; +import org.thingsboard.server.dao.util.JsonStringType; -import java.io.IOException; +import javax.persistence.*; import java.util.UUID; @Data @Entity -@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) +@TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME) +@EqualsAndHashCode +@ToString public final class DashboardEntity implements SearchTextEntity { @Transient @@ -63,8 +60,8 @@ public final class DashboardEntity implements SearchTextEntity { @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) private String searchText; - @Type(type = "jsonb") - @Column(name = ModelConstants.DASHBOARD_CONFIGURATION_PROPERTY, columnDefinition = "jsonb") + @Type(type = "json") + @Column(name = ModelConstants.DASHBOARD_CONFIGURATION_PROPERTY, columnDefinition = "json") private JsonNode configuration; public DashboardEntity() { @@ -108,80 +105,6 @@ public final class DashboardEntity implements SearchTextEntity { return searchText; } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((configuration == null) ? 0 : configuration.hashCode()); - result = prime * result + ((customerId == null) ? 0 : customerId.hashCode()); - result = prime * result + ((id == null) ? 0 : id.hashCode()); - result = prime * result + ((searchText == null) ? 0 : searchText.hashCode()); - result = prime * result + ((tenantId == null) ? 0 : tenantId.hashCode()); - result = prime * result + ((title == null) ? 0 : title.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - DashboardEntity other = (DashboardEntity) obj; - if (configuration == null) { - if (other.configuration != null) - return false; - } else if (!configuration.equals(other.configuration)) - return false; - if (customerId == null) { - if (other.customerId != null) - return false; - } else if (!customerId.equals(other.customerId)) - return false; - if (id == null) { - if (other.id != null) - return false; - } else if (!id.equals(other.id)) - return false; - if (searchText == null) { - if (other.searchText != null) - return false; - } else if (!searchText.equals(other.searchText)) - return false; - if (tenantId == null) { - if (other.tenantId != null) - return false; - } else if (!tenantId.equals(other.tenantId)) - return false; - if (title == null) { - if (other.title != null) - return false; - } else if (!title.equals(other.title)) - return false; - return true; - } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("DashboardEntity [id="); - builder.append(id); - builder.append(", tenantId="); - builder.append(tenantId); - builder.append(", customerId="); - builder.append(customerId); - builder.append(", title="); - builder.append(title); - builder.append(", searchText="); - builder.append(searchText); - builder.append(", configuration="); - builder.append(configuration); - builder.append("]"); - return builder.toString(); - } - @Override public Dashboard toData() { Dashboard dashboard = new Dashboard(new DashboardId(id)); diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java index e5f1400d08..9a2e5110e3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java @@ -16,13 +16,9 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; - import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.thingsboard.server.common.data.DashboardInfo; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DashboardId; @@ -30,11 +26,14 @@ import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.SearchTextEntity; +import javax.persistence.*; import java.util.UUID; @Data @Entity @Table(name = ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME) +@EqualsAndHashCode +@ToString public class DashboardInfoEntity implements SearchTextEntity { @Transient @@ -87,72 +86,6 @@ public class DashboardInfoEntity implements SearchTextEntity { return searchText; } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((customerId == null) ? 0 : customerId.hashCode()); - result = prime * result + ((id == null) ? 0 : id.hashCode()); - result = prime * result + ((searchText == null) ? 0 : searchText.hashCode()); - result = prime * result + ((tenantId == null) ? 0 : tenantId.hashCode()); - result = prime * result + ((title == null) ? 0 : title.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - DashboardInfoEntity other = (DashboardInfoEntity) obj; - if (customerId == null) { - if (other.customerId != null) - return false; - } else if (!customerId.equals(other.customerId)) - return false; - if (id == null) { - if (other.id != null) - return false; - } else if (!id.equals(other.id)) - return false; - if (searchText == null) { - if (other.searchText != null) - return false; - } else if (!searchText.equals(other.searchText)) - return false; - if (tenantId == null) { - if (other.tenantId != null) - return false; - } else if (!tenantId.equals(other.tenantId)) - return false; - if (title == null) { - if (other.title != null) - return false; - } else if (!title.equals(other.title)) - return false; - return true; - } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("DashboardInfoEntity [id="); - builder.append(id); - builder.append(", tenantId="); - builder.append(tenantId); - builder.append(", customerId="); - builder.append(customerId); - builder.append(", title="); - builder.append(title); - builder.append(", searchText="); - builder.append(searchText); - builder.append("]"); - return builder.toString(); - } - @Override public DashboardInfo toData() { DashboardInfo dashboardInfo = new DashboardInfo(new DashboardId(id)); diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java index 711e346158..cf31775c67 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java @@ -16,10 +16,9 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; - -import javax.persistence.*; - import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.thingsboard.server.common.data.id.DeviceCredentialsId; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.security.DeviceCredentials; @@ -27,11 +26,14 @@ import org.thingsboard.server.common.data.security.DeviceCredentialsType; import org.thingsboard.server.dao.model.BaseEntity; import org.thingsboard.server.dao.model.ModelConstants; +import javax.persistence.*; import java.util.UUID; @Data @Entity @Table(name = ModelConstants.DEVICE_CREDENTIALS_COLUMN_FAMILY_NAME) +@EqualsAndHashCode +@ToString public final class DeviceCredentialsEntity implements BaseEntity { @Transient @@ -69,69 +71,6 @@ public final class DeviceCredentialsEntity implements BaseEntity { @Transient @@ -66,8 +63,8 @@ public final class DeviceEntity implements SearchTextEntity { @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) private String searchText; - @Type(type = "jsonb") - @Column(name = ModelConstants.DEVICE_ADDITIONAL_INFO_PROPERTY, columnDefinition = "jsonb") + @Type(type = "json") + @Column(name = ModelConstants.DEVICE_ADDITIONAL_INFO_PROPERTY, columnDefinition = "json") private JsonNode additionalInfo; public DeviceEntity() { @@ -85,6 +82,7 @@ public final class DeviceEntity implements SearchTextEntity { this.customerId = device.getCustomerId().getId(); } this.name = device.getName(); + this.type = device.getType(); this.additionalInfo = device.getAdditionalInfo(); } @@ -102,72 +100,6 @@ public final class DeviceEntity implements SearchTextEntity { return searchText; } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((additionalInfo == null) ? 0 : additionalInfo.hashCode()); - result = prime * result + ((customerId == null) ? 0 : customerId.hashCode()); - result = prime * result + ((id == null) ? 0 : id.hashCode()); - result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result + ((tenantId == null) ? 0 : tenantId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - DeviceEntity other = (DeviceEntity) obj; - if (additionalInfo == null) { - if (other.additionalInfo != null) - return false; - } else if (!additionalInfo.equals(other.additionalInfo)) - return false; - if (customerId == null) { - if (other.customerId != null) - return false; - } else if (!customerId.equals(other.customerId)) - return false; - if (id == null) { - if (other.id != null) - return false; - } else if (!id.equals(other.id)) - return false; - if (name == null) { - if (other.name != null) - return false; - } else if (!name.equals(other.name)) - return false; - if (tenantId == null) { - if (other.tenantId != null) - return false; - } else if (!tenantId.equals(other.tenantId)) - return false; - return true; - } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("DeviceEntity [id="); - builder.append(id); - builder.append(", tenantId="); - builder.append(tenantId); - builder.append(", customerId="); - builder.append(customerId); - builder.append(", name="); - builder.append(name); - builder.append(", additionalInfo="); - builder.append(additionalInfo); - builder.append("]"); - return builder.toString(); - } - @Override public Device toData() { Device device = new Device(new DeviceId(id)); @@ -179,6 +111,7 @@ public final class DeviceEntity implements SearchTextEntity { device.setCustomerId(new CustomerId(customerId)); } device.setName(name); + device.setType(type); device.setAdditionalInfo(additionalInfo); return device; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java index 21fe3d73e5..7384e37e9b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java @@ -16,32 +16,31 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; - -import javax.persistence.*; - import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import lombok.extern.slf4j.Slf4j; +import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; 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.JsonBinaryType; - -import static org.thingsboard.server.dao.model.ModelConstants.*; +import org.thingsboard.server.dao.util.JsonStringType; -import java.io.IOException; +import javax.persistence.*; import java.util.UUID; +import static org.thingsboard.server.dao.model.ModelConstants.*; + @Data -@NoArgsConstructor @Entity -@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) +@TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = EVENT_COLUMN_FAMILY_NAME) +@NoArgsConstructor +@EqualsAndHashCode +@ToString public class EventEntity implements BaseEntity { @Transient @@ -67,8 +66,8 @@ public class EventEntity implements BaseEntity { @Column(name = EVENT_UID_PROPERTY) private String eventUid; - @Type(type = "jsonb") - @Column(name = EVENT_BODY_PROPERTY, columnDefinition = "jsonb") + @Type(type = "json") + @Column(name = EVENT_BODY_PROPERTY, columnDefinition = "json") private JsonNode body; public EventEntity(Event event) { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java index 283ca35e3b..66617be1d4 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java @@ -16,13 +16,10 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; - -import javax.persistence.*; - import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; -import lombok.extern.slf4j.Slf4j; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.id.PluginId; @@ -31,16 +28,17 @@ 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.JsonBinaryType; +import org.thingsboard.server.dao.util.JsonStringType; -import java.io.IOException; -import java.util.Objects; +import javax.persistence.*; import java.util.UUID; @Data @Entity -@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) +@TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ModelConstants.PLUGIN_COLUMN_FAMILY_NAME) +@EqualsAndHashCode +@ToString public class PluginMetaDataEntity implements SearchTextEntity { @Transient @@ -68,12 +66,12 @@ public class PluginMetaDataEntity implements SearchTextEntity { @Column(name = ModelConstants.PLUGIN_STATE_PROPERTY) private ComponentLifecycleState state; - @Type(type = "jsonb") - @Column(name = ModelConstants.PLUGIN_CONFIGURATION_PROPERTY, columnDefinition = "jsonb") + @Type(type = "json") + @Column(name = ModelConstants.PLUGIN_CONFIGURATION_PROPERTY, columnDefinition = "json") private JsonNode configuration; - @Type(type = "jsonb") - @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY, columnDefinition = "jsonb") + @Type(type = "json") + @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY, columnDefinition = "json") private JsonNode additionalInfo; @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) @@ -132,27 +130,4 @@ public class PluginMetaDataEntity implements SearchTextEntity { return data; } - @Override - public boolean equals(Object o) { - if (this == o) - return true; - if (o == null || getClass() != o.getClass()) - return false; - PluginMetaDataEntity entity = (PluginMetaDataEntity) o; - return Objects.equals(id, entity.id) && Objects.equals(apiToken, entity.apiToken) && Objects.equals(tenantId, entity.tenantId) - && Objects.equals(name, entity.name) && Objects.equals(clazz, entity.clazz) && Objects.equals(state, entity.state) - && Objects.equals(configuration, entity.configuration) - && Objects.equals(searchText, entity.searchText); - } - - @Override - public int hashCode() { - return Objects.hash(id, apiToken, tenantId, name, clazz, state, configuration, searchText); - } - - @Override - public String toString() { - return "PluginMetaDataEntity{" + "id=" + id + ", apiToken='" + apiToken + '\'' + ", tenantId=" + tenantId + ", name='" + name + '\'' + ", clazz='" - + clazz + '\'' + ", state=" + state + ", configuration=" + configuration + ", searchText='" + searchText + '\'' + '}'; - } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java index f08f873b61..31fc832c30 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java @@ -15,16 +15,14 @@ */ package org.thingsboard.server.dao.model.sql; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; +import lombok.*; import org.thingsboard.server.common.data.relation.EntityRelation; import javax.persistence.Transient; import java.io.Serializable; import java.util.UUID; +@NoArgsConstructor @AllArgsConstructor @Data @EqualsAndHashCode diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java index f8aa72cb8a..78c96d987c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java @@ -20,10 +20,12 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import org.hibernate.annotations.Type; +import org.hibernate.annotations.TypeDef; 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 javax.persistence.*; import java.util.UUID; @@ -32,6 +34,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Data @Entity +@TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = RELATION_COLUMN_FAMILY_NAME) @IdClass(RelationCompositeKey.class) @EqualsAndHashCode @@ -62,8 +65,8 @@ public final class RelationEntity implements ToData { @Column(name = RELATION_TYPE_PROPERTY) private String relationType; - @Type(type = "jsonb") - @Column(name = ADDITIONAL_INFO_PROPERTY, columnDefinition = "jsonb") + @Type(type = "json") + @Column(name = ADDITIONAL_INFO_PROPERTY, columnDefinition = "json") private JsonNode additionalInfo; public RelationEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java index 77a8562568..b1d47c75cb 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java @@ -16,13 +16,10 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; - -import javax.persistence.*; - import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; -import lombok.extern.slf4j.Slf4j; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.id.RuleId; @@ -32,16 +29,17 @@ 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.JsonBinaryType; +import org.thingsboard.server.dao.util.JsonStringType; -import java.io.IOException; -import java.util.Objects; +import javax.persistence.*; import java.util.UUID; @Data @Entity -@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) +@TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ModelConstants.RULE_COLUMN_FAMILY_NAME) +@EqualsAndHashCode +@ToString public class RuleMetaDataEntity implements SearchTextEntity { @Transient @@ -69,20 +67,20 @@ public class RuleMetaDataEntity implements SearchTextEntity { @Column(name = ModelConstants.RULE_PLUGIN_TOKEN_PROPERTY) private String pluginToken; - @Type(type = "jsonb") - @Column(name = ModelConstants.RULE_FILTERS, columnDefinition = "jsonb") + @Type(type = "json") + @Column(name = ModelConstants.RULE_FILTERS, columnDefinition = "json") private JsonNode filters; - @Type(type = "jsonb") - @Column(name = ModelConstants.RULE_PROCESSOR, columnDefinition = "jsonb") + @Type(type = "json") + @Column(name = ModelConstants.RULE_PROCESSOR, columnDefinition = "json") private JsonNode processor; - @Type(type = "jsonb") - @Column(name = ModelConstants.RULE_ACTION, columnDefinition = "jsonb") + @Type(type = "json") + @Column(name = ModelConstants.RULE_ACTION, columnDefinition = "json") private JsonNode action; - @Type(type = "jsonb") - @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY, columnDefinition = "jsonb") + @Type(type = "json") + @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY, columnDefinition = "json") private JsonNode additionalInfo; public RuleMetaDataEntity() { @@ -139,36 +137,4 @@ public class RuleMetaDataEntity implements SearchTextEntity { rule.setAdditionalInfo(additionalInfo); return rule; } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - RuleMetaDataEntity that = (RuleMetaDataEntity) o; - return weight == that.weight && - Objects.equals(id, that.id) && - Objects.equals(tenantId, that.tenantId) && - Objects.equals(name, that.name) && - Objects.equals(pluginToken, that.pluginToken) && - Objects.equals(state, that.state) && - Objects.equals(searchText, that.searchText); - } - - @Override - public int hashCode() { - return Objects.hash(id, tenantId, name, pluginToken, state, weight, searchText); - } - - @Override - public String toString() { - return "RuleMetaDataEntity{" + - "id=" + id + - ", tenantId=" + tenantId + - ", name='" + name + '\'' + - ", pluginToken='" + pluginToken + '\'' + - ", state='" + state + '\'' + - ", weight=" + weight + - ", searchText='" + searchText + '\'' + - '}'; - } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeEntity.java index 3b717505cc..db818a0fea 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeEntity.java @@ -17,11 +17,15 @@ package org.thingsboard.server.dao.model.sql; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.util.UUID; @AllArgsConstructor @Data +@EqualsAndHashCode +@ToString public class TenantDeviceTypeEntity { private UUID tenantId; private String type; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java index fcd5b19f63..327ad26206 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java @@ -16,32 +16,27 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; - -import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; -import lombok.extern.slf4j.Slf4j; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; 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 com.fasterxml.jackson.databind.JsonNode; -import org.thingsboard.server.dao.util.JsonBinaryType; +import org.thingsboard.server.dao.util.JsonStringType; -import java.io.IOException; +import javax.persistence.*; import java.util.UUID; @Data @Entity -@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) +@TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ModelConstants.TENANT_COLUMN_FAMILY_NAME) +@EqualsAndHashCode +@ToString public final class TenantEntity implements SearchTextEntity { @Transient @@ -84,8 +79,8 @@ public final class TenantEntity implements SearchTextEntity { @Column(name = ModelConstants.EMAIL_PROPERTY) private String email; - @Type(type="jsonb") - @Column(name = ModelConstants.TENANT_ADDITIONAL_INFO_PROPERTY, columnDefinition = "jsonb") + @Type(type="json") + @Column(name = ModelConstants.TENANT_ADDITIONAL_INFO_PROPERTY, columnDefinition = "json") private JsonNode additionalInfo; public TenantEntity() { @@ -123,128 +118,6 @@ public final class TenantEntity implements SearchTextEntity { return searchText; } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((additionalInfo == null) ? 0 : additionalInfo.hashCode()); - result = prime * result + ((address == null) ? 0 : address.hashCode()); - result = prime * result + ((address2 == null) ? 0 : address2.hashCode()); - result = prime * result + ((city == null) ? 0 : city.hashCode()); - result = prime * result + ((country == null) ? 0 : country.hashCode()); - result = prime * result + ((email == null) ? 0 : email.hashCode()); - result = prime * result + ((id == null) ? 0 : id.hashCode()); - result = prime * result + ((phone == null) ? 0 : phone.hashCode()); - result = prime * result + ((region == null) ? 0 : region.hashCode()); - result = prime * result + ((state == null) ? 0 : state.hashCode()); - result = prime * result + ((title == null) ? 0 : title.hashCode()); - result = prime * result + ((zip == null) ? 0 : zip.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - TenantEntity other = (TenantEntity) obj; - if (additionalInfo == null) { - if (other.additionalInfo != null) - return false; - } else if (!additionalInfo.equals(other.additionalInfo)) - return false; - if (address == null) { - if (other.address != null) - return false; - } else if (!address.equals(other.address)) - return false; - if (address2 == null) { - if (other.address2 != null) - return false; - } else if (!address2.equals(other.address2)) - return false; - if (city == null) { - if (other.city != null) - return false; - } else if (!city.equals(other.city)) - return false; - if (country == null) { - if (other.country != null) - return false; - } else if (!country.equals(other.country)) - return false; - if (email == null) { - if (other.email != null) - return false; - } else if (!email.equals(other.email)) - return false; - if (id == null) { - if (other.id != null) - return false; - } else if (!id.equals(other.id)) - return false; - if (phone == null) { - if (other.phone != null) - return false; - } else if (!phone.equals(other.phone)) - return false; - if (region == null) { - if (other.region != null) - return false; - } else if (!region.equals(other.region)) - return false; - if (state == null) { - if (other.state != null) - return false; - } else if (!state.equals(other.state)) - return false; - if (title == null) { - if (other.title != null) - return false; - } else if (!title.equals(other.title)) - return false; - if (zip == null) { - if (other.zip != null) - return false; - } else if (!zip.equals(other.zip)) - return false; - return true; - } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("TenantEntity [id="); - builder.append(id); - builder.append(", title="); - builder.append(title); - builder.append(", region="); - builder.append(region); - builder.append(", country="); - builder.append(country); - builder.append(", state="); - builder.append(state); - builder.append(", city="); - builder.append(city); - builder.append(", address="); - builder.append(address); - builder.append(", address2="); - builder.append(address2); - builder.append(", zip="); - builder.append(zip); - builder.append(", phone="); - builder.append(phone); - builder.append(", email="); - builder.append(email); - builder.append(", additionalInfo="); - builder.append(additionalInfo); - builder.append("]"); - return builder.toString(); - } - @Override public Tenant toData() { Tenant tenant = new Tenant(new TenantId(id)); diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvCompositeKey.java index 037c2dff6f..87948df3b1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvCompositeKey.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvCompositeKey.java @@ -15,10 +15,7 @@ */ package org.thingsboard.server.dao.model.sql; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; +import lombok.*; import javax.persistence.Transient; import java.io.Serializable; @@ -26,6 +23,7 @@ import java.util.UUID; @Data @AllArgsConstructor +@NoArgsConstructor @EqualsAndHashCode @ToString public class TsKvCompositeKey implements Serializable{ diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestCompositeKey.java index a68ddf7067..32b02be80e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestCompositeKey.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestCompositeKey.java @@ -15,16 +15,14 @@ */ package org.thingsboard.server.dao.model.sql; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; +import lombok.*; import javax.persistence.Transient; import java.io.Serializable; import java.util.UUID; @Data +@NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode @ToString diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java index 8e228d5056..97d2a8c088 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java @@ -16,25 +16,23 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; - import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.thingsboard.server.common.data.id.UserCredentialsId; import org.thingsboard.server.common.data.id.UserId; import org.thingsboard.server.common.data.security.UserCredentials; import org.thingsboard.server.dao.model.BaseEntity; import org.thingsboard.server.dao.model.ModelConstants; +import javax.persistence.*; import java.util.UUID; @Data @Entity @Table(name = ModelConstants.USER_CREDENTIALS_COLUMN_FAMILY_NAME) +@EqualsAndHashCode +@ToString public final class UserCredentialsEntity implements BaseEntity { @Transient @@ -76,58 +74,6 @@ public final class UserCredentialsEntity implements BaseEntity this.resetToken = userCredentials.getResetToken(); } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((activateToken == null) ? 0 : activateToken.hashCode()); - result = prime * result + (enabled ? 1231 : 1237); - result = prime * result + ((id == null) ? 0 : id.hashCode()); - result = prime * result + ((password == null) ? 0 : password.hashCode()); - result = prime * result + ((resetToken == null) ? 0 : resetToken.hashCode()); - result = prime * result + ((userId == null) ? 0 : userId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - UserCredentialsEntity other = (UserCredentialsEntity) obj; - if (activateToken == null) { - if (other.activateToken != null) - return false; - } else if (!activateToken.equals(other.activateToken)) - return false; - if (enabled != other.enabled) - return false; - if (id == null) { - if (other.id != null) - return false; - } else if (!id.equals(other.id)) - return false; - if (password == null) { - if (other.password != null) - return false; - } else if (!password.equals(other.password)) - return false; - if (resetToken == null) { - if (other.resetToken != null) - return false; - } else if (!resetToken.equals(other.resetToken)) - return false; - if (userId == null) { - if (other.userId != null) - return false; - } else if (!userId.equals(other.userId)) - return false; - return true; - } - @Override public UserCredentials toData() { UserCredentials userCredentials = new UserCredentials(new UserCredentialsId(id)); diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java index e7bc7fae3e..d1a1c71cb1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java @@ -17,9 +17,9 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; -import lombok.extern.slf4j.Slf4j; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.User; @@ -29,10 +29,9 @@ 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.JsonBinaryType; +import org.thingsboard.server.dao.util.JsonStringType; import javax.persistence.*; -import java.io.IOException; import java.util.UUID; /** @@ -40,8 +39,10 @@ import java.util.UUID; */ @Data @Entity -@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) +@TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ModelConstants.USER_PG_HIBERNATE_COLUMN_FAMILY_NAME) +@EqualsAndHashCode +@ToString public class UserEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = -271106508790582977L; @@ -72,8 +73,8 @@ public class UserEntity implements SearchTextEntity { @Column(name = ModelConstants.USER_LAST_NAME_PROPERTY) private String lastName; - @Type(type="jsonb") - @Column(name = ModelConstants.USER_ADDITIONAL_INFO_PROPERTY, columnDefinition = "jsonb") + @Type(type="json") + @Column(name = ModelConstants.USER_ADDITIONAL_INFO_PROPERTY, columnDefinition = "json") private JsonNode additionalInfo; public UserEntity() { @@ -116,28 +117,7 @@ public class UserEntity implements SearchTextEntity { this.id = id; } - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("UserEntity [id="); - builder.append(id); - builder.append(", authority="); - builder.append(authority); - builder.append(", tenantId="); - builder.append(tenantId); - builder.append(", customerId="); - builder.append(customerId); - builder.append(", email="); - builder.append(email); - builder.append(", firstName="); - builder.append(firstName); - builder.append(", lastName="); - builder.append(lastName); - builder.append(", additionalInfo="); - builder.append(additionalInfo); - builder.append("]"); - return builder.toString(); - } + @Override public User toData() { @@ -157,67 +137,4 @@ public class UserEntity implements SearchTextEntity { return user; } - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((additionalInfo == null) ? 0 : additionalInfo.hashCode()); - result = prime * result + ((authority == null) ? 0 : authority.hashCode()); - result = prime * result + ((customerId == null) ? 0 : customerId.hashCode()); - result = prime * result + ((email == null) ? 0 : email.hashCode()); - result = prime * result + ((firstName == null) ? 0 : firstName.hashCode()); - result = prime * result + ((id == null) ? 0 : id.hashCode()); - result = prime * result + ((lastName == null) ? 0 : lastName.hashCode()); - result = prime * result + ((tenantId == null) ? 0 : tenantId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - UserEntity other = (UserEntity) obj; - if (additionalInfo == null) { - if (other.additionalInfo != null) - return false; - } else if (!additionalInfo.equals(other.additionalInfo)) - return false; - if (authority != other.authority) - return false; - if (customerId == null) { - if (other.customerId != null) - return false; - } else if (!customerId.equals(other.customerId)) - return false; - if (email == null) { - if (other.email != null) - return false; - } else if (!email.equals(other.email)) - return false; - if (firstName == null) { - if (other.firstName != null) - return false; - } else if (!firstName.equals(other.firstName)) - return false; - if (id == null) { - if (other.id != null) - return false; - } else if (!id.equals(other.id)) - return false; - if (lastName == null) { - if (other.lastName != null) - return false; - } else if (!lastName.equals(other.lastName)) - return false; - if (tenantId == null) { - if (other.tenantId != null) - return false; - } else if (!tenantId.equals(other.tenantId)) - return false; - return true; - } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java index 28de47ffc6..93756536d7 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java @@ -16,9 +16,10 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; -import com.datastax.driver.mapping.annotations.PartitionKey; import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.id.TenantId; @@ -26,15 +27,17 @@ 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.JsonBinaryType; +import org.thingsboard.server.dao.util.JsonStringType; import javax.persistence.*; import java.util.UUID; @Data @Entity -@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class) +@TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ModelConstants.WIDGET_TYPE_COLUMN_FAMILY_NAME) +@EqualsAndHashCode +@ToString public final class WidgetTypeEntity implements BaseEntity { @Transient @@ -44,11 +47,9 @@ public final class WidgetTypeEntity implements BaseEntity { @Column(name = ModelConstants.ID_PROPERTY) private UUID id; - @PartitionKey(value = 1) @Column(name = ModelConstants.WIDGET_TYPE_TENANT_ID_PROPERTY) private UUID tenantId; - @PartitionKey(value = 2) @Column(name = ModelConstants.WIDGET_TYPE_BUNDLE_ALIAS_PROPERTY) private String bundleAlias; @@ -58,8 +59,8 @@ public final class WidgetTypeEntity implements BaseEntity { @Column(name = ModelConstants.WIDGET_TYPE_NAME_PROPERTY) private String name; - @Type(type="jsonb") - @Column(name = ModelConstants.WIDGET_TYPE_DESCRIPTOR_PROPERTY, columnDefinition = "jsonb") + @Type(type="json") + @Column(name = ModelConstants.WIDGET_TYPE_DESCRIPTOR_PROPERTY, columnDefinition = "json") private JsonNode descriptor; public WidgetTypeEntity() { @@ -89,45 +90,6 @@ public final class WidgetTypeEntity implements BaseEntity { this.id = id; } - @Override - public int hashCode() { - int result = id != null ? id.hashCode() : 0; - result = 31 * result + (tenantId != null ? tenantId.hashCode() : 0); - result = 31 * result + (bundleAlias != null ? bundleAlias.hashCode() : 0); - result = 31 * result + (alias != null ? alias.hashCode() : 0); - result = 31 * result + (name != null ? name.hashCode() : 0); - result = 31 * result + (descriptor != null ? descriptor.hashCode() : 0); - return result; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - WidgetTypeEntity that = (WidgetTypeEntity) o; - - if (id != null ? !id.equals(that.id) : that.id != null) return false; - if (tenantId != null ? !tenantId.equals(that.tenantId) : that.tenantId != null) return false; - if (bundleAlias != null ? !bundleAlias.equals(that.bundleAlias) : that.bundleAlias != null) return false; - if (alias != null ? !alias.equals(that.alias) : that.alias != null) return false; - if (name != null ? !name.equals(that.name) : that.name != null) return false; - return descriptor != null ? descriptor.equals(that.descriptor) : that.descriptor == null; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("WidgetTypeEntity{"); - sb.append("id=").append(id); - sb.append(", tenantId=").append(tenantId); - sb.append(", bundleAlias='").append(bundleAlias).append('\''); - sb.append(", alias='").append(alias).append('\''); - sb.append(", name='").append(name).append('\''); - sb.append(", descriptor=").append(descriptor); - sb.append('}'); - return sb.toString(); - } - @Override public WidgetType toData() { WidgetType widgetType = new WidgetType(new WidgetTypeId(id)); diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java index 3e72606885..2e50cd2d16 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java @@ -17,25 +17,23 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; - import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.WidgetsBundleId; import org.thingsboard.server.common.data.widget.WidgetsBundle; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.SearchTextEntity; -import java.nio.ByteBuffer; +import javax.persistence.*; import java.util.UUID; @Data @Entity @Table(name = ModelConstants.WIDGETS_BUNDLE_COLUMN_FAMILY_NAME) +@EqualsAndHashCode +@ToString public final class WidgetsBundleEntity implements SearchTextEntity { @Transient @@ -98,45 +96,6 @@ public final class WidgetsBundleEntity implements SearchTextEntity :idOffset ORDER BY ID LIMIT :limit") + List findByTenantIdAndType(@Param("limit") int limit, + @Param("tenantId") UUID tenantId, + @Param("type") String type, + @Param("textSearch") String textSearch, + @Param("idOffset") UUID idOffset); + @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = :tenantId " + "AND CUSTOMER_ID = :customerId AND TYPE = :type " + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java index 17f2024c78..f6296dda91 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java @@ -95,7 +95,13 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao im @Override public List findAssetsByTenantIdAndType(UUID tenantId, String type, TextPageLink pageLink) { - return null; + return DaoUtil.convertDataList(assetRepository + .findByTenantIdAndType( + pageLink.getLimit(), + tenantId, + type, + pageLink.getTextSearch(), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java index 729e6980a9..16bd0a2df7 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java @@ -40,7 +40,7 @@ public interface DashboardInfoRepository extends CrudRepository :idOffset ORDER BY ID LIMIT :limit?1") + "AND ID > :idOffset ORDER BY ID LIMIT :limit") List findByTenantIdAndCustomerId(@Param("limit") int limit, @Param("tenantId") UUID tenantId, @Param("customerId") UUID customerId, diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/JsonBinarySqlTypeDescriptor.java b/dao/src/main/java/org/thingsboard/server/dao/util/AbstractJsonSqlTypeDescriptor.java similarity index 61% rename from dao/src/main/java/org/thingsboard/server/dao/util/JsonBinarySqlTypeDescriptor.java rename to dao/src/main/java/org/thingsboard/server/dao/util/AbstractJsonSqlTypeDescriptor.java index 77c768712e..a9ac0ff7cb 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/util/JsonBinarySqlTypeDescriptor.java +++ b/dao/src/main/java/org/thingsboard/server/dao/util/AbstractJsonSqlTypeDescriptor.java @@ -15,29 +15,23 @@ */ package org.thingsboard.server.dao.util; -import com.fasterxml.jackson.databind.JsonNode; -import org.hibernate.type.descriptor.ValueBinder; import org.hibernate.type.descriptor.ValueExtractor; import org.hibernate.type.descriptor.WrapperOptions; import org.hibernate.type.descriptor.java.JavaTypeDescriptor; -import org.hibernate.type.descriptor.sql.BasicBinder; import org.hibernate.type.descriptor.sql.BasicExtractor; import org.hibernate.type.descriptor.sql.SqlTypeDescriptor; -import java.sql.*; +import java.sql.CallableStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Types; -/** - * Created by Valerii Sosliuk on 5/12/2017. - */ -public class JsonBinarySqlTypeDescriptor +public abstract class AbstractJsonSqlTypeDescriptor implements SqlTypeDescriptor { - public static final JsonBinarySqlTypeDescriptor INSTANCE = - new JsonBinarySqlTypeDescriptor(); - @Override public int getSqlType() { - return Types.OTHER; + return Types.VARCHAR; } @Override @@ -81,34 +75,4 @@ public class JsonBinarySqlTypeDescriptor }; } - @Override - public ValueBinder getBinder( - final JavaTypeDescriptor javaTypeDescriptor) { - return new BasicBinder(javaTypeDescriptor, this) { - @Override - protected void doBind( - PreparedStatement st, - X value, - int index, - WrapperOptions options) throws SQLException { - st.setObject(index, - javaTypeDescriptor.unwrap( - value, JsonNode.class, options), getSqlType() - ); - } - - @Override - protected void doBind( - CallableStatement st, - X value, - String name, - WrapperOptions options) - throws SQLException { - st.setObject(name, - javaTypeDescriptor.unwrap( - value, JsonNode.class, options), getSqlType() - ); - } - }; - } } \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/JacksonUtil.java b/dao/src/main/java/org/thingsboard/server/dao/util/JacksonUtil.java index 5b1f5455ce..1324b885b9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/util/JacksonUtil.java +++ b/dao/src/main/java/org/thingsboard/server/dao/util/JacksonUtil.java @@ -47,6 +47,9 @@ public class JacksonUtil { } public static JsonNode toJsonNode(String value) { + if (value == null || value.isEmpty()) { + return null; + } try { return OBJECT_MAPPER.readTree(value); } catch (IOException e) { diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/JsonStringSqlTypeDescriptor.java b/dao/src/main/java/org/thingsboard/server/dao/util/JsonStringSqlTypeDescriptor.java new file mode 100644 index 0000000000..90a25ad97d --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/util/JsonStringSqlTypeDescriptor.java @@ -0,0 +1,61 @@ +/** + * 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.util; + +import org.hibernate.type.descriptor.ValueBinder; +import org.hibernate.type.descriptor.WrapperOptions; +import org.hibernate.type.descriptor.java.JavaTypeDescriptor; +import org.hibernate.type.descriptor.sql.BasicBinder; + +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.SQLException; + +public class JsonStringSqlTypeDescriptor + extends AbstractJsonSqlTypeDescriptor { + + public static final JsonStringSqlTypeDescriptor INSTANCE = + new JsonStringSqlTypeDescriptor(); + + @Override + public ValueBinder getBinder( + final JavaTypeDescriptor javaTypeDescriptor) { + return new BasicBinder(javaTypeDescriptor, this) { + @Override + protected void doBind( + PreparedStatement st, + X value, + int index, + WrapperOptions options) throws SQLException { + st.setString(index, + javaTypeDescriptor.unwrap(value, String.class, options) + ); + } + + @Override + protected void doBind( + CallableStatement st, + X value, + String name, + WrapperOptions options) + throws SQLException { + st.setString(name, + javaTypeDescriptor.unwrap(value, String.class, options + )); + } + }; + } +} \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/JsonBinaryType.java b/dao/src/main/java/org/thingsboard/server/dao/util/JsonStringType.java similarity index 79% rename from dao/src/main/java/org/thingsboard/server/dao/util/JsonBinaryType.java rename to dao/src/main/java/org/thingsboard/server/dao/util/JsonStringType.java index 81d776b3de..514caa1c41 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/util/JsonBinaryType.java +++ b/dao/src/main/java/org/thingsboard/server/dao/util/JsonStringType.java @@ -20,25 +20,29 @@ import org.hibernate.usertype.DynamicParameterizedType; import java.util.Properties; -/** - * Created by Valerii Sosliuk on 5/12/2017. - */ -public class JsonBinaryType extends AbstractSingleColumnStandardBasicType +public class JsonStringType + extends AbstractSingleColumnStandardBasicType implements DynamicParameterizedType { - public JsonBinaryType() { + public JsonStringType() { super( - JsonBinarySqlTypeDescriptor.INSTANCE, + JsonStringSqlTypeDescriptor.INSTANCE, new JsonTypeDescriptor() ); } public String getName() { - return "jsonb"; + return "json"; + } + + @Override + protected boolean registerUnderJavaType() { + return true; } @Override public void setParameterValues(Properties parameters) { ((JsonTypeDescriptor) getJavaTypeDescriptor()) .setParameterValues(parameters); - }} \ No newline at end of file + } +} \ No newline at end of file diff --git a/dao/src/main/resources/postgres/schema.sql b/dao/src/main/resources/postgres/schema.sql index 6791e0e7dd..da500209b6 100644 --- a/dao/src/main/resources/postgres/schema.sql +++ b/dao/src/main/resources/postgres/schema.sql @@ -14,31 +14,18 @@ -- limitations under the License. -- -SET statement_timeout = 0; -SET lock_timeout = 0; -SET idle_in_transaction_session_timeout = 0; -SET client_encoding = 'UTF8'; -SET standard_conforming_strings = on; -SET check_function_bodies = false; -SET client_min_messages = warning; -SET row_security = off; - -SET search_path = public, pg_catalog; -SET default_tablespace = ''; -SET default_with_oids = false; CREATE TABLE IF NOT EXISTS admin_settings ( id uuid NOT NULL CONSTRAINT admin_settings_pkey PRIMARY KEY, - json_value jsonb, + json_value varchar, key character varying(255) ); -ALTER TABLE admin_settings OWNER TO postgres; CREATE TABLE IF NOT EXISTS alarm ( id uuid NOT NULL CONSTRAINT alarm_pkey PRIMARY KEY, ack_ts bigint, clear_ts bigint, - additional_info jsonb, + additional_info varchar, end_ts bigint, originator_id uuid, originator_type integer, @@ -49,18 +36,16 @@ CREATE TABLE IF NOT EXISTS alarm ( tenant_id uuid, type character varying(255) ); -ALTER TABLE alarm OWNER TO postgres; CREATE TABLE IF NOT EXISTS asset ( id uuid NOT NULL CONSTRAINT asset_pkey PRIMARY KEY, - additional_info jsonb, + additional_info varchar, customer_id uuid, name character varying(255), search_text character varying(255), tenant_id uuid, type character varying(255) ); -ALTER TABLE asset OWNER TO postgres; CREATE TABLE IF NOT EXISTS attribute_kv ( entity_type character varying(255), @@ -74,23 +59,21 @@ CREATE TABLE IF NOT EXISTS attribute_kv ( last_update_ts bigint, CONSTRAINT attribute_kv_unq_key UNIQUE (entity_type, entity_id, attribute_type, attribute_key) ); -ALTER TABLE relation OWNER TO postgres; CREATE TABLE IF NOT EXISTS component_descriptor ( id uuid NOT NULL CONSTRAINT component_descriptor_pkey PRIMARY KEY, actions character varying(255), clazz character varying(255), - configuration_descriptor jsonb, + configuration_descriptor varchar, name character varying(255), scope character varying(255), search_text character varying(255), type character varying(255) ); -ALTER TABLE component_descriptor OWNER TO postgres; CREATE TABLE IF NOT EXISTS customer ( id uuid NOT NULL CONSTRAINT customer_pkey PRIMARY KEY, - additional_info jsonb, + additional_info varchar, address character varying(255), address2 character varying(255), city character varying(255), @@ -103,28 +86,25 @@ CREATE TABLE IF NOT EXISTS customer ( title character varying(255), zip character varying(255) ); -ALTER TABLE customer OWNER TO postgres; CREATE TABLE IF NOT EXISTS dashboard ( id uuid NOT NULL CONSTRAINT dashboard_pkey PRIMARY KEY, - configuration jsonb, + configuration varchar, customer_id uuid, search_text character varying(255), tenant_id uuid, title character varying(255) ); -ALTER TABLE dashboard OWNER TO postgres; CREATE TABLE IF NOT EXISTS device ( id uuid NOT NULL CONSTRAINT device_pkey PRIMARY KEY, - additional_info jsonb, + additional_info varchar, customer_id uuid, type character varying(255), name character varying(255), search_text character varying(255), tenant_id uuid ); -ALTER TABLE device OWNER TO postgres; CREATE TABLE IF NOT EXISTS device_credentials ( id uuid NOT NULL CONSTRAINT device_credentials_pkey PRIMARY KEY, @@ -133,32 +113,29 @@ CREATE TABLE IF NOT EXISTS device_credentials ( credentials_value character varying(255), device_id uuid ); -ALTER TABLE device_credentials OWNER TO postgres; CREATE TABLE IF NOT EXISTS event ( id uuid NOT NULL CONSTRAINT event_pkey PRIMARY KEY, - body jsonb, + body varchar, entity_id uuid, entity_type character varying(255), event_type character varying(255), event_uid character varying(255), tenant_id uuid ); -ALTER TABLE event OWNER TO postgres; CREATE TABLE IF NOT EXISTS plugin ( id uuid NOT NULL CONSTRAINT plugin_pkey PRIMARY KEY, - additional_info jsonb, + additional_info varchar, api_token character varying(255), plugin_class character varying(255), - configuration jsonb, + configuration varchar, name character varying(255), public_access boolean, search_text character varying(255), state character varying(255), tenant_id uuid ); -ALTER TABLE plugin OWNER TO postgres; CREATE TABLE IF NOT EXISTS relation ( from_id uuid, @@ -167,29 +144,27 @@ CREATE TABLE IF NOT EXISTS relation ( to_type character varying(255), relation_type_group character varying(255), relation_type character varying(255), - additional_info jsonb, + additional_info varchar, CONSTRAINT relation_unq_key UNIQUE (from_id, from_type, relation_type_group, relation_type, to_id, to_type) ); -ALTER TABLE relation OWNER TO postgres; CREATE TABLE IF NOT EXISTS rule ( id uuid NOT NULL CONSTRAINT rule_pkey PRIMARY KEY, - action jsonb, - additional_info jsonb, - filters jsonb, + action varchar, + additional_info varchar, + filters varchar, name character varying(255), plugin_token character varying(255), - processor jsonb, + processor varchar, search_text character varying(255), state character varying(255), tenant_id uuid, weight integer ); -ALTER TABLE rule OWNER TO postgres; CREATE TABLE IF NOT EXISTS tb_user ( id uuid NOT NULL CONSTRAINT tb_user_pkey PRIMARY KEY, - additional_info jsonb, + additional_info varchar, authority character varying(255), customer_id uuid, email character varying(255) UNIQUE, @@ -198,11 +173,10 @@ CREATE TABLE IF NOT EXISTS tb_user ( search_text character varying(255), tenant_id uuid ); -ALTER TABLE tb_user OWNER TO postgres; CREATE TABLE IF NOT EXISTS tenant ( id uuid NOT NULL CONSTRAINT tenant_pkey PRIMARY KEY, - additional_info jsonb, + additional_info varchar, address character varying(255), address2 character varying(255), city character varying(255), @@ -215,7 +189,6 @@ CREATE TABLE IF NOT EXISTS tenant ( title character varying(255), zip character varying(255) ); -ALTER TABLE tenant OWNER TO postgres; CREATE TABLE IF NOT EXISTS ts_kv ( entity_type character varying(255) NOT NULL, @@ -228,7 +201,6 @@ CREATE TABLE IF NOT EXISTS ts_kv ( dbl_v double precision, CONSTRAINT ts_kv_unq_key UNIQUE (entity_type, entity_id, key, ts) ); -ALTER TABLE ts_kv OWNER TO postgres; CREATE TABLE IF NOT EXISTS ts_kv_latest ( entity_type character varying(255) NOT NULL, @@ -241,7 +213,6 @@ CREATE TABLE IF NOT EXISTS ts_kv_latest ( dbl_v double precision, CONSTRAINT ts_kv_latest_unq_key UNIQUE (entity_type, entity_id, key) ); -ALTER TABLE ts_kv OWNER TO postgres; CREATE TABLE IF NOT EXISTS user_credentials ( id uuid NOT NULL CONSTRAINT user_credentials_pkey PRIMARY KEY, @@ -251,17 +222,15 @@ CREATE TABLE IF NOT EXISTS user_credentials ( reset_token character varying(255) UNIQUE, user_id uuid UNIQUE ); -ALTER TABLE user_credentials OWNER TO postgres; CREATE TABLE IF NOT EXISTS widget_type ( id uuid NOT NULL CONSTRAINT widget_type_pkey PRIMARY KEY, alias character varying(255), bundle_alias character varying(255), - descriptor jsonb, + descriptor varchar, name character varying(255), tenant_id uuid ); -ALTER TABLE widget_type OWNER TO postgres; CREATE TABLE IF NOT EXISTS widgets_bundle ( id uuid NOT NULL CONSTRAINT widgets_bundle_pkey PRIMARY KEY, @@ -270,5 +239,4 @@ CREATE TABLE IF NOT EXISTS widgets_bundle ( search_text character varying(255), tenant_id uuid, title character varying(255) -); -ALTER TABLE widgets_bundle OWNER TO postgres; +); \ No newline at end of file diff --git a/dao/src/main/resources/postgres/system-data.sql b/dao/src/main/resources/postgres/system-data.sql index 2b69fdfe02..a8d65d98f8 100644 --- a/dao/src/main/resources/postgres/system-data.sql +++ b/dao/src/main/resources/postgres/system-data.sql @@ -17,21 +17,21 @@ /** SYSTEM **/ /** System admin **/ -INSERT INTO public.tb_user ( id, tenant_id, customer_id, email, search_text, authority ) +INSERT INTO tb_user ( id, tenant_id, customer_id, email, search_text, authority ) VALUES ( '5a797660-4612-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', '13814000-1dd2-11b2-8080-808080808080', 'sysadmin@thingsboard.org', 'sysadmin@thingsboard.org', 'SYS_ADMIN' ); -INSERT INTO public.user_credentials ( id, user_id, enabled, password ) +INSERT INTO user_credentials ( id, user_id, enabled, password ) VALUES ( '61441950-4612-11e7-a919-92ebcb67fe33', '5a797660-4612-11e7-a919-92ebcb67fe33', true, '$2a$10$5JTB8/hxWc9WAy62nCGSxeefl3KWmipA9nFpVdDa0/xfIseeBB4Bu' ); /** System settings **/ -INSERT INTO public.admin_settings ( id, key, json_value ) +INSERT INTO admin_settings ( id, key, json_value ) VALUES ( '6a2266e4-4612-11e7-a919-92ebcb67fe33', 'general', '{ "baseUrl": "http://localhost:8080" }' ); -INSERT INTO public.admin_settings ( id, key, json_value ) +INSERT INTO admin_settings ( id, key, json_value ) VALUES ( '6eaaefa6-4612-11e7-a919-92ebcb67fe33', 'mail', '{ "mailFrom": "Thingsboard ", "smtpProtocol": "smtp", @@ -44,248 +44,248 @@ VALUES ( '6eaaefa6-4612-11e7-a919-92ebcb67fe33', 'mail', '{ }' ); /** System widgets library **/ -INSERT INTO public.widgets_bundle ( "id", "tenant_id", "alias", "search_text", "title" ) +INSERT INTO widgets_bundle ( id, tenant_id, alias, search_text, title ) VALUES ( '720d2788-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'gpio_widgets', 'gpio widgets', 'GPIO widgets' ); -INSERT INTO public.widgets_bundle ( "id", "tenant_id", "alias", "search_text", "title" ) +INSERT INTO widgets_bundle ( id, tenant_id, alias, search_text, title ) VALUES ( '75d009da-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'maps', 'maps', 'Maps' ); -INSERT INTO public.widgets_bundle ( "id", "tenant_id", "alias", "search_text", "title" ) +INSERT INTO widgets_bundle ( id, tenant_id, alias, search_text, title ) VALUES ( '7b2bf538-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', 'digital gauges', 'Digital gauges' ); -INSERT INTO public.widgets_bundle ( "id", "tenant_id", "alias", "search_text", "title" ) +INSERT INTO widgets_bundle ( id, tenant_id, alias, search_text, title ) VALUES ( '7ec2783e-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'charts', 'Charts' ); -INSERT INTO public.widgets_bundle ( "id", "tenant_id", "alias", "search_text", "title" ) +INSERT INTO widgets_bundle ( id, tenant_id, alias, search_text, title ) VALUES ( '82ded5f2-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'cards', 'cards', 'Cards' ); -INSERT INTO public.widgets_bundle ( "id", "tenant_id", "alias", "search_text", "title" ) +INSERT INTO widgets_bundle ( id, tenant_id, alias, search_text, title ) VALUES ( '85a1fa1c-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'analogue_gauges', 'analogue gauges', 'Analogue gauges' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( '89ab3f2e-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'timeseries', '{"type":"timeseries","sizeX":8,"sizeY":5,"resources":[{"url":"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.4.0/Chart.min.js"}],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n \n var lineData = {\n labels: [],\n datasets: []\n };\n \n for (var i=0; i < self.ctx.data.length; i++) {\n var dataKey = self.ctx.data[i].dataKey;\n var keySettings = dataKey.settings;\n var backgroundColor = tinycolor(dataKey.color);\n backgroundColor.setAlpha(0.4);\n var dataset = {\n label: dataKey.label,\n data: [],\n borderColor: dataKey.color,\n borderWidth: 2,\n backgroundColor: backgroundColor.toRgbString(),\n pointRadius: keySettings.showPoints ? 1 : 0,\n fill: keySettings.fillLines || false,\n showLine: keySettings.showLines || true,\n spanGaps: false,\n lineTension: angular.isDefined(keySettings.tension) ? keySettings.tension : 0.2\n }\n lineData.datasets.push(dataset);\n }\n\n var ctx = $(''#lineChart'', self.ctx.$container);\n self.ctx.chart = new Chart(ctx, {\n type: ''line'',\n data: lineData,\n options: {\n responsive: false,\n tooltips: {\n mode: ''index'',\n inersect: true\n },\n hover: {\n mode: ''index'',\n inersect: true\n },\n maintainAspectRatio: false,\n /*animation: {\n duration: 200,\n easing: ''linear''\n },*/\n elements: {\n line: {\n tension: 0.2\n } \n },\n scales: {\n xAxes: [{\n type: ''time'',\n ticks: {\n maxRotation: 20,\n autoSkip: true\n },\n time: {\n displayFormats: {\n second: ''hh:mm:ss'',\n minute: ''hh:mm:ss''\n }\n }\n }]\n },\n zoom: {\n onSelect: function(startTimeMs, endTimeMs) {\n self.ctx.timewindowFunctions.onUpdateTimewindow(startTimeMs, endTimeMs);\n },\n onResetSelect: function() {\n self.ctx.timewindowFunctions.onResetTimewindow();\n }\n }\n }\n });\n \n self.onResize();\n \n}\n\nself.onDataUpdated = function() {\n \n if (self.ctx.chart.zoom.isMouseInteraction) {\n return;\n }\n if (!self.ctx.tickUpdate) {\n for (var i = 0; i < self.ctx.data.length; i++) {\n var dataSetData = [];\n var dataKeyData = self.ctx.data[i].data;\n for (var i2 = 0; i2 < dataKeyData.length; i2 ++) {\n dataSetData.push({x: moment(dataKeyData[i2][0]), y: dataKeyData[i2][1]});\n \n }\n self.ctx.chart.data.datasets[i].data = dataSetData; \n }\n }\n \n self.ctx.chart.options.scales.xAxes[0].time.min = moment(self.ctx.timeWindow.minTime);\n self.ctx.chart.options.scales.xAxes[0].time.max = moment(self.ctx.timeWindow.maxTime);\n \n self.ctx.chart.update(0, true);\n\n}\n\nself.onResize = function() {\n self.ctx.chart.resize();\n self.ctx.chart.update(0, true);\n}\n\nself.onDestroy = function() {\n}\n\nfunction getYAxis(chartInstance) {\n var scales = chartInstance.scales;\n for (var scaleId in scales) {\n\t var scale = scales[scaleId];\n\n\t if (!scale.isHorizontal()) {\n\t\t return scale;\n\t }\n }\n}\n\nfunction getXAxis(chartInstance) {\n var scales = chartInstance.scales;\n for (var scaleId in scales) {\n\t var scale = scales[scaleId];\n\n\t if (scale.isHorizontal()) {\n\t\t return scale;\n\t }\n }\n}\n\nfunction eventPointer (e) {\n if (angular.isDefined(e.touches) && e.touches.length > 0) {\n return {\n x : e.touches[0].pageX,\n y : e.touches[0].pageY\n };\n } else if (angular.isDefined(e.changedTouches) && e.changedTouches.length > 0) {\n return {\n x : e.changedTouches[0].pageX,\n y : e.changedTouches[0].pageY\n };\n } else if (e.pageX || e.pageY) {\n return {\n x : e.pageX,\n y : e.pageY\n };\n } else if (e.clientX || e.clientY) {\n var\n d = document,\n b = d.body,\n de = d.documentElement;\n return {\n x: e.clientX + b.scrollLeft + de.scrollLeft,\n y: e.clientY + b.scrollTop + de.scrollTop\n };\n }\n}\n\nvar zoomPlugin = {\n beforeInit: function(chartInstance) {\n chartInstance.zoom = {};\n var node = chartInstance.zoom.node = chartInstance.chart.ctx.canvas;\n \n chartInstance.zoom.mouseDownHandler = function(event) {\n chartInstance.zoom.dragZoomStart = event;\n chartInstance.zoom.dragZoomStartPointer = eventPointer(event);\n chartInstance.zoom.isMouseInteraction = true;\n };\n\n node.addEventListener(''mousedown'', chartInstance.zoom.mouseDownHandler);\n \n chartInstance.zoom.mouseMoveHandler = function(event) {\n if (chartInstance.zoom.dragZoomStart) {\n chartInstance.update(0);\n chartInstance.zoom.dragZoomEnd = event;\n chartInstance.zoom.dragZoomEndPointer = eventPointer(event);\n }\n };\n \n node.addEventListener(''mousemove'', chartInstance.zoom.mouseMoveHandler);\n \n chartInstance.zoom.mouseUpHandler = function(event) {\n if (chartInstance.zoom.dragZoomStart) {\n \n var chartArea = chartInstance.chartArea;\n var yAxis = getYAxis(chartInstance);\n\t\t\t\t\tvar beginPoint = chartInstance.zoom.dragZoomStart;\n\t\t\t\t\tvar beginPointer = chartInstance.zoom.dragZoomStartPointer;\n\t\t\t\t\tvar upEventPointer = eventPointer(event);\n\t\t\t\t\tvar offsetX = beginPoint.target.getBoundingClientRect().left;\n\t\t\t\t\tvar startX = Math.min(beginPointer.x, upEventPointer.x) - offsetX;\n\t\t\t\t\tvar endX = Math.max(beginPointer.x, upEventPointer.x) - offsetX;\n\t\t\t\t\tvar dragDistance = endX - startX;\n\t\t\t\t\t\n\t\t\t\t\tif (dragDistance > 0) {\n \t\t\t\t\tvar xAxis = getXAxis(chartInstance);\n \t\t\t\t\tvar options = chartInstance.options;\n \t\t\t\t\tif (options.scales.xAxes[0].time) {\n \t\t\t\t\t startX = Math.max(startX, xAxis.left);\n \t\t\t\t\t endX = Math.min(endX, xAxis.right);\n \t\t\t\t\t if (endX - startX > 0) {\n \t\t\t\t\t startX = startX - xAxis.left;\n \t\t\t\t\t endX = endX - xAxis.left;\n \t\t\t\t\t var time = options.scales.xAxes[0].time;\n \t\t\t\t\t var min = time.min.valueOf();\n \t\t\t\t\t var max = time.max.valueOf();\n \t\t\t\t\t var axisDistance = xAxis.right - xAxis.left;\n \t\t\t\t\t var timeDistance = max - min;\n \t\t\t\t\t \n \t\t\t\t\t var zoomStartTime = min + startX / axisDistance * timeDistance;\n \t\t\t\t\t var zoomEndTime = min + endX / axisDistance * timeDistance;\n\n \t\t\t\t\t if (options.zoom && options.zoom.onSelect) {\n \t\t\t\t\t options.zoom.onSelect(zoomStartTime, zoomEndTime);\n \t\t\t\t\t }\n \t\t\t\t\t }\n \t\t\t\t\t}\n\t\t\t\t\t}\n \t\t\tchartInstance.zoom.dragZoomStart = null;\n \t\t\tchartInstance.zoom.dragZoomEnd = null; \n }\n chartInstance.zoom.isMouseInteraction = false;\n };\n \n node.addEventListener(''mouseup'', chartInstance.zoom.mouseUpHandler);\n \n chartInstance.zoom.mouseLeaveHandler = function(event) {\n if (chartInstance.zoom.dragZoomStart) {\n \t\t\tchartInstance.zoom.dragZoomStart = null;\n \t\t\tchartInstance.zoom.dragZoomEnd = null; \n }\n chartInstance.zoom.isMouseInteraction = false;\n };\n \n node.addEventListener(''mouseleave'', chartInstance.zoom.mouseLeaveHandler);\n \n chartInstance.zoom.dblClickHandler = function(event) {\n if (chartInstance.zoom.dragZoomStart) {\n \t\t\tchartInstance.zoom.dragZoomStart = null;\n \t\t\tchartInstance.zoom.dragZoomEnd = null; \n }\n var options = chartInstance.options;\n if (options.zoom && options.zoom.onResetSelect) {\n options.zoom.onResetSelect();\n }\n };\n \n node.addEventListener(''dblclick'', chartInstance.zoom.dblClickHandler);\n },\n beforeDatasetsDraw: function(chartInstance, easing) {\n \t\tvar ctx = chartInstance.chart.ctx;\n \t\tvar chartArea = chartInstance.chartArea;\n \t\tctx.save();\n \t\tctx.beginPath();\n \t\tif (chartInstance.zoom && chartInstance.zoom.dragZoomEnd) {\n \t\t\tvar yAxis = getYAxis(chartInstance);\n \t\t\tvar beginPoint = chartInstance.zoom.dragZoomStart;\n \t\t\tvar beginPointer = chartInstance.zoom.dragZoomStartPointer;\n \t\t\tvar endPoint = chartInstance.zoom.dragZoomEnd;\n \t\t\tvar endPointer = chartInstance.zoom.dragZoomEndPointer;\n \t\t\t\n \t\t\tvar offsetX = beginPoint.target.getBoundingClientRect().left;\n \t\t\tvar startX = Math.min(beginPointer.x, endPointer.x) - offsetX;\n \t\t\tvar endX = Math.max(beginPointer.x, endPointer.x) - offsetX;\n \t\t\tvar rectWidth = endX - startX;\n \t\t\tctx.fillStyle = ''rgba(157,203,255,0.1)'';\n \t\t\tctx.lineWidth = 1;\n \t\t\tctx.strokeRect(startX, yAxis.top, rectWidth, yAxis.bottom - yAxis.top);\n \t\t\tctx.fillRect(startX, yAxis.top, rectWidth, yAxis.bottom - yAxis.top);\n \t\t}\n \t\tif (chartArea) {\n \t\t ctx.rect(chartArea.left, chartArea.top, chartArea.right - chartArea.left, chartArea.bottom - chartArea.top);\n \t\t}\n\t\t ctx.clip(); \n },\n \n afterDatasetsDraw: function(chartInstance) {\n\t chartInstance.chart.ctx.restore();\n },\n \n destroy: function(chartInstance) {\n if (chartInstance.zoom) {\n var node = chartInstance.zoom.node;\n\t\t\t\tnode.removeEventListener(''mousedown'', chartInstance.zoom.mouseDownHandler);\n\t\t\t\tnode.removeEventListener(''mousemove'', chartInstance.zoom.mouseMoveHandler);\n\t\t\t\tnode.removeEventListener(''mouseup'', chartInstance.zoom.mouseUpHandler);\n\t\t\t\tnode.removeEventListener(''mouseleave'', chartInstance.zoom.mouseLeaveHandler);\t \n\t\t\t\tnode.removeEventListener(''dblclick'', chartInstance.zoom.dblClickHandler);\n\t\t\t\tdelete chartInstance.zoom;\n }\n }\n };\n\nChart.pluginService.register(zoomPlugin);\n","settingsSchema":"{}","dataKeySettingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"DataKeySettings\",\n \"properties\": {\n \"showLines\": {\n \"title\": \"Show lines\",\n \"type\": \"boolean\",\n \"default\": true\n },\n \"fillLines\": {\n \"title\": \"Fill lines\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"showPoints\": {\n \"title\": \"Show points\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"tension\": {\n \"title\": \"Line tension\",\n \"type\": \"number\",\n \"default\": 0.2\n }\n },\n \"required\": [\"showLines\", \"fillLines\", \"showPoints\"]\n },\n \"form\": [\n \"showLines\",\n \"fillLines\",\n \"showPoints\",\n \"tension\"\n ]\n}","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{\"showLines\":true,\"fillLines\":false,\"showPoints\":false},\"_hash\":0.5644745944820795,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#ffc107\",\"settings\":{\"showLines\":true,\"fillLines\":true,\"showPoints\":false},\"_hash\":0.18379294198604845,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Timeseries - Chart.js (Deprecated)\"}"}', 'Timeseries - Chart.js (Deprecated)' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( '8d5ffd08-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', 'digital_vertical_bar', '{"type":"latest","sizeX":2.5,"sizeY":4.5,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#000000\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":60,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[\"#3d5afe\",\"#f44336\"],\"refreshAnimationType\":\"<>\",\"refreshAnimationTime\":700,\"startAnimationType\":\"<>\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":14},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":8,\"style\":\"normal\",\"weight\":\"normal\",\"color\":\"#cccccc\"},\"neonGlowBrightness\":20,\"decimals\":0,\"showUnitTitle\":true,\"gaugeColor\":\"#171a1c\",\"gaugeType\":\"verticalBar\",\"showTitle\":false,\"units\":\"°C\",\"minValue\":-60,\"dashThickness\":1.2},\"title\":\"Digital vertical bar\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'Digital vertical bar' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( '90e8e4ee-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'gpio_widgets', 'gpio_panel', '{"type":"latest","sizeX":5,"sizeY":2,"resources":[],"templateHtml":"
\n
\n
\n
\n {{ cell.label }}\n
\n {{cell.pin}}\n \n \n \n \n {{cell.pin}}\n
\n {{ cell.label }}\n
\n
\n \n \n \n
\n
\n
\n
","templateCss":".error {\n font-size: 14px !important;\n color: maroon;/*rgb(250,250,250);*/\n background-color: transparent;\n padding: 6px;\n}\n\n.error span {\n margin: auto;\n}\n\n.gpio-panel {\n padding-top: 10px;\n white-space: nowrap;\n}\n\n.gpio-panel tb-led-light > div {\n margin: auto;\n}\n\n.led-panel {\n margin: 0;\n width: 66px;\n min-width: 66px;\n}\n\n.led-container {\n width: 48px;\n min-width: 48px;\n}\n\n.pin {\n margin-top: auto;\n margin-bottom: auto;\n color: white;\n font-size: 12px;\n width: 16px;\n min-width: 16px;\n}\n\n.led-panel.col-0 .pin {\n margin-left: auto;\n padding-left: 2px;\n text-align: right;\n}\n\n.led-panel.col-1 .pin {\n margin-right: auto;\n \n text-align: left;\n}\n\n.gpio-left-label {\n margin-right: 8px;\n}\n\n.gpio-right-label {\n margin-left: 8px;\n}","controllerScript":"self.onInit = function() {\n var i, gpio;\n \n var scope = self.ctx.$scope;\n var settings = self.ctx.settings;\n \n scope.gpioList = [];\n scope.gpioByPin = {};\n for (var g = 0; g < settings.gpioList.length; g++) {\n gpio = settings.gpioList[g];\n scope.gpioList.push(\n {\n row: gpio.row,\n col: gpio.col,\n pin: gpio.pin,\n label: gpio.label,\n enabled: false,\n colorOn: tinycolor(gpio.color).lighten(20).toHexString(),\n colorOff: tinycolor(gpio.color).darken().toHexString()\n }\n );\n scope.gpioByPin[gpio.pin] = scope.gpioList[scope.gpioList.length-1];\n }\n\n scope.ledPanelBackgroundColor = settings.ledPanelBackgroundColor || tinycolor(''green'').lighten(2).toRgbString();\n\n scope.gpioCells = {};\n var rowCount = 0;\n for (i = 0; i < scope.gpioList.length; i++) {\n gpio = scope.gpioList[i];\n scope.gpioCells[gpio.row+''_''+gpio.col] = gpio;\n rowCount = Math.max(rowCount, gpio.row+1);\n }\n \n scope.prefferedRowHeight = 32;\n scope.rows = [];\n for (i = 0; i < rowCount; i++) {\n var row = [];\n for (var c =0; c<2;c++) {\n if (scope.gpioCells[i+''_''+c]) {\n row[c] = scope.gpioCells[i+''_''+c];\n } else {\n row[c] = null;\n }\n }\n scope.rows.push(row);\n } \n \n self.onResize();\n}\n\nself.onDataUpdated = function() {\n var changed = false;\n for (var d = 0; d < self.ctx.data.length; d++) {\n var cellData = self.ctx.data[d];\n var dataKey = cellData.dataKey;\n var gpio = self.ctx.$scope.gpioByPin[dataKey.label];\n if (gpio) {\n var enabled = false;\n if (cellData.data.length > 0) {\n var tvPair = cellData.data[cellData.data.length - 1];\n enabled = (tvPair[1] === true || tvPair[1] === ''true'');\n }\n if (gpio.enabled != enabled) {\n changed = true;\n gpio.enabled = enabled;\n }\n }\n }\n if (changed) {\n self.ctx.$scope.$digest();\n } \n}\n\nself.onResize = function() {\n var rowCount = self.ctx.$scope.rows.length;\n var prefferedRowHeight = (self.ctx.height - 35)/rowCount;\n prefferedRowHeight = Math.min(32, prefferedRowHeight);\n prefferedRowHeight = Math.max(12, prefferedRowHeight);\n self.ctx.$scope.prefferedRowHeight = prefferedRowHeight;\n \n var ratio = prefferedRowHeight/32;\n \n var leftLabels = $(''.gpio-left-label'', self.ctx.$container);\n leftLabels.css(''font-size'', 16*ratio+''px'');\n var rightLabels = $(''.gpio-right-label'', self.ctx.$container);\n rightLabels.css(''font-size'', 16*ratio+''px'');\n var pins = $(''.pin'', self.ctx.$container);\n var pinsFontSize = Math.max(9, 12*ratio);\n pins.css(''font-size'', pinsFontSize+''px''); \n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"Settings\",\n \"properties\": {\n \"gpioList\": {\n \"title\": \"Gpio leds\",\n \"type\": \"array\",\n \"minItems\" : 1,\n \"items\": {\n \"title\": \"Gpio led\",\n \"type\": \"object\",\n \"properties\": {\n \"pin\": {\n \"title\": \"Pin\",\n \"type\": \"number\"\n },\n \"label\": {\n \"title\": \"Label\",\n \"type\": \"string\"\n },\n \"row\": {\n \"title\": \"Row\",\n \"type\": \"number\"\n },\n \"col\": {\n \"title\": \"Column\",\n \"type\": \"number\"\n },\n \"color\": {\n \"title\": \"Color\",\n \"type\": \"string\",\n \"default\": \"red\"\n }\n },\n \"required\": [\"pin\", \"label\", \"row\", \"col\", \"color\"]\n }\n },\n \"ledPanelBackgroundColor\": {\n \"title\": \"LED panel background color\",\n \"type\": \"string\",\n \"default\": \"#008a00\"\n } \n },\n \"required\": [\"gpioList\", \n \"ledPanelBackgroundColor\"]\n },\n \"form\": [\n {\n \"key\": \"gpioList\",\n \"items\": [\n \"gpioList[].pin\",\n \"gpioList[].label\",\n \"gpioList[].row\",\n \"gpioList[].col\",\n {\n \"key\": \"gpioList[].color\",\n \"type\": \"color\"\n }\n ]\n },\n {\n \"key\": \"ledPanelBackgroundColor\",\n \"type\": \"color\"\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"gpioList\":[{\"pin\":1,\"label\":\"GPIO 1\",\"row\":0,\"col\":0,\"color\":\"#008000\",\"_uniqueKey\":0},{\"pin\":2,\"label\":\"GPIO 2\",\"row\":0,\"col\":1,\"color\":\"#ffff00\",\"_uniqueKey\":1},{\"pin\":3,\"label\":\"GPIO 3\",\"row\":1,\"col\":0,\"color\":\"#cf006f\",\"_uniqueKey\":2}],\"ledPanelBackgroundColor\":\"#b71c1c\"},\"title\":\"Basic GPIO Panel\",\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"1\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.22518255793320163,\"funcBody\":\"var period = time % 1500;\\nreturn period < 500;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"2\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.7008206860666621,\"funcBody\":\"var period = time % 1500;\\nreturn period >= 500 && period < 1000;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"3\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.42600325102193426,\"funcBody\":\"var period = time % 1500;\\nreturn period >= 1000;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}}}"}', 'Basic GPIO Panel' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( '955ad5fa-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'cards', 'timeseries_table', '{"type":"timeseries","sizeX":8,"sizeY":6.5,"resources":[],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n \n var scope = self.ctx.$scope;\n var id = self.ctx.$scope.$injector.get(''utils'').guid();\n\n scope.config = {\n settings: self.ctx.settings,\n widgetConfig: self.ctx.widgetConfig\n }\n\n scope.datasources = self.ctx.datasources;\n scope.data = self.ctx.data;\n scope.tableId = \"table-\"+id;\n \n}\n\nself.onDataUpdated = function() {\n self.ctx.$scope.data = self.ctx.data;\n self.ctx.$scope.$broadcast(''timeseries-table-data-updated'', self.ctx.$scope.tableId);\n}\n\nself.onDestroy = function() {\n}","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"TimeseriesTableSettings\",\n \"properties\": {\n \"showTimestamp\": {\n \"title\": \"Display timestamp column\",\n \"type\": \"boolean\",\n \"default\": true\n }\n },\n \"required\": []\n },\n \"form\": [\n \"showTimestamp\"\n ]\n}","dataKeySettingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"DataKeySettings\",\n \"properties\": {\n \"useCellStyleFunction\": {\n \"title\": \"Use cell style function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"cellStyleFunction\": {\n \"title\": \"Cell style function: f(value)\",\n \"type\": \"string\",\n \"default\": \"\"\n },\n \"useCellContentFunction\": {\n \"title\": \"Use cell content function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"cellContentFunction\": {\n \"title\": \"Cell content function: f(value, rowData, filter)\",\n \"type\": \"string\",\n \"default\": \"\"\n }\n },\n \"required\": []\n },\n \"form\": [\n \"useCellStyleFunction\",\n {\n \"key\": \"cellStyleFunction\",\n \"type\": \"javascript\"\n },\n \"useCellContentFunction\",\n {\n \"key\": \"cellContentFunction\",\n \"type\": \"javascript\"\n }\n ]\n}","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temperature °C\",\"color\":\"#2196f3\",\"settings\":{\"useCellStyleFunction\":true,\"cellStyleFunction\":\"if (value) {\\n var percent = (value + 60)/120 * 100;\\n var color = tinycolor.mix(''blue'', ''red'', amount = percent);\\n color.setAlpha(.5);\\n return {\\n paddingLeft: ''20px'',\\n color: ''#ffffff'',\\n background: color.toRgbString(),\\n fontSize: ''18px''\\n };\\n} else {\\n return {};\\n}\"},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nvar multiplier = Math.pow(10, 1 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Humidity, %\",\"color\":\"#ffc107\",\"settings\":{\"useCellStyleFunction\":true,\"cellStyleFunction\":\"if (value) {\\n var percent = value;\\n var backgroundColor = tinycolor(''blue'');\\n backgroundColor.setAlpha(value/100);\\n var color = ''blue'';\\n if (value > 50) {\\n color = ''white'';\\n }\\n \\n return {\\n paddingLeft: ''20px'',\\n color: color,\\n background: backgroundColor.toRgbString(),\\n fontSize: ''18px''\\n };\\n} else {\\n return {};\\n}\",\"useCellContentFunction\":false},\"_hash\":0.12775350966079668,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nvar multiplier = Math.pow(10, 1 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < 5) {\\n\\tvalue = 5;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"interval\":1000,\"timewindowMs\":60000},\"aggregation\":{\"type\":\"NONE\",\"limit\":200}},\"showTitle\":true,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"showTimestamp\":true},\"title\":\"Timeseries table\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"useDashboardTimewindow\":false,\"showLegend\":false}"}', 'Timeseries table' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( '9aa48574-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'polar_area_chart_js', '{"type":"latest","sizeX":7,"sizeY":5,"resources":[{"url":"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"}],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n var pieData = {\n labels: [],\n datasets: []\n };\n\n var dataset = {\n data: [],\n backgroundColor: [],\n borderColor: [],\n borderWidth: [],\n hoverBackgroundColor: []\n }\n \n pieData.datasets.push(dataset);\n \n for (var i = 0; i < self.ctx.data.length; i++) {\n var dataKey = self.ctx.data[i].dataKey;\n pieData.labels.push(dataKey.label);\n dataset.data.push(0);\n var hoverBackgroundColor = tinycolor(dataKey.color).lighten(15);\n var borderColor = tinycolor(dataKey.color).darken();\n dataset.backgroundColor.push(dataKey.color);\n dataset.borderColor.push(''#fff'');\n dataset.borderWidth.push(5);\n dataset.hoverBackgroundColor.push(hoverBackgroundColor.toRgbString());\n }\n\n var ctx = $(''#pieChart'', self.ctx.$container);\n self.ctx.chart = new Chart(ctx, {\n type: ''polarArea'',\n data: pieData,\n options: {\n responsive: false,\n maintainAspectRatio: false\n }\n });\n \n self.onResize();\n}\n\nself.onDataUpdated = function() {\n for (var i = 0; i < self.ctx.data.length; i++) {\n var cellData = self.ctx.data[i];\n if (cellData.data.length > 0) {\n var tvPair = cellData.data[cellData.data.length - 1];\n var value = tvPair[1];\n self.ctx.chart.data.datasets[0].data[i] = parseFloat(value);\n }\n }\n \n self.ctx.chart.update();\n}\n\nself.onResize = function() {\n if (self.ctx.height >= 70) {\n try {\n self.ctx.chart.resize();\n } catch (e) {}\n }\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fifth\",\"color\":\"#607d8b\",\"settings\":{},\"_hash\":0.2074391823443591,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Polar Area - Chart.js\"}"}', 'Polar Area - Chart.js' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( '9d896bb0-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'cards', 'html_card', '{"type":"static","sizeX":7.5,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"","controllerScript":"self.onInit = function() {\n\n var cssParser = new cssjs();\n cssParser.testMode = false;\n var namespace = ''html-card-'' + hashCode(self.ctx.settings.cardCss);\n cssParser.cssPreviewNamespace = namespace;\n cssParser.createStyleElement(namespace, self.ctx.settings.cardCss);\n self.ctx.$container.addClass(namespace);\n cardHtml = self.ctx.settings.cardHtml;\n self.ctx.$container.html(cardHtml);\n \n function hashCode(str) {\n var hash = 0;\n var i, char;\n if (str.length === 0) return hash;\n for (i = 0; i < str.length; i++) {\n char = str.charCodeAt(i);\n hash = ((hash << 5) - hash) + char;\n hash = hash & hash;\n }\n return hash;\n }\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"Settings\",\n \"required\": [\"cardHtml\"],\n \"properties\": {\n \"cardCss\": {\n \"title\": \"CSS\",\n \"type\": \"string\",\n \"default\": \".card {\\n font-weight: bold; \\n}\"\n },\n \"cardHtml\": {\n \"title\": \"HTML\",\n \"type\": \"string\",\n \"default\": \"
HTML code here
\"\n }\n }\n },\n \"form\": [\n {\n \"key\": \"cardCss\",\n \"type\": \"css\"\n }, \n {\n \"key\": \"cardHtml\",\n \"type\": \"html\"\n } \n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"static\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Random\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"cardHtml\":\"
HTML code here
\",\"cardCss\":\".card {\\n font-weight: bold;\\n font-size: 32px;\\n color: #999;\\n width: 100%;\\n height: 100%;\\n display: flex;\\n align-items: center;\\n justify-content: center;\\n}\"},\"title\":\"HTML Card\",\"dropShadow\":true}"}', 'HTML Card' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'a0cf40e2-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', 'simple_neon_gauge_justgage', '{"type":"latest","sizeX":3,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#388e3c\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#000000\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":1,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":32},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"neonGlowBrightness\":40,\"dashThickness\":1.5,\"decimals\":0,\"gaugeType\":\"donut\"},\"title\":\"Simple neon gauge - justGage\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'Simple neon gauge - justGage' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'a4e28428-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'analogue_gauges', 'radial_gauge_canvas_gauges', '{"type":"latest","sizeX":6,"sizeY":5,"resources":[],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbAnalogueRadialGauge(self.ctx, ''radialGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.getSettingsSchema = function() {\n return TbAnalogueRadialGauge.settingsSchema;\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 50 - 25;\\nif (value < -100) {\\n\\tvalue = -100;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"maxValue\":100,\"startAngle\":45,\"ticksAngle\":270,\"showBorder\":true,\"defaultColor\":\"#e65100\",\"needleCircleSize\":10,\"highlights\":[],\"showUnitTitle\":true,\"colorPlate\":\"#fff\",\"colorMajorTicks\":\"#444\",\"colorMinorTicks\":\"#666\",\"minorTicks\":10,\"valueInt\":3,\"valueDec\":0,\"highlightsWidth\":15,\"valueBox\":true,\"animation\":true,\"animationDuration\":500,\"animationRule\":\"cycle\",\"colorNeedleShadowUp\":\"rgba(2, 255, 255, 0)\",\"numbersFont\":{\"family\":\"Roboto\",\"size\":18,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#616161\"},\"titleFont\":{\"family\":\"Roboto\",\"size\":24,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#888\"},\"unitsFont\":{\"family\":\"Roboto\",\"size\":22,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#616161\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"size\":36,\"style\":\"normal\",\"weight\":\"normal\",\"shadowColor\":\"rgba(0, 0, 0, 0.49)\",\"color\":\"#444\"},\"minValue\":-100,\"colorNeedleShadowDown\":\"rgba(188,143,143,0.45)\",\"colorValueBoxRect\":\"#888\",\"colorValueBoxRectEnd\":\"#666\",\"colorValueBoxBackground\":\"#babab2\",\"colorValueBoxShadow\":\"rgba(0,0,0,1)\"},\"title\":\"Radial gauge - Canvas Gauges\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'Radial gauge - Canvas Gauges' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'a9005382-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', 'digital_speedometer', '{"type":"latest","sizeX":5,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Speed\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 45) {\\n\\tvalue = 45;\\n} else if (value > 130) {\\n\\tvalue = 130;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#000000\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":180,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[\"#008000\",\"#fbc02d\",\"#f44336\"],\"refreshAnimationType\":\"linear\",\"refreshAnimationTime\":700,\"startAnimationType\":\"linear\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":32},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#ffffff\"},\"neonGlowBrightness\":40,\"dashThickness\":1.5,\"decimals\":0,\"unitTitle\":\"MPH\",\"showUnitTitle\":true,\"gaugeColor\":\"#171a1c\",\"gaugeType\":\"arc\"},\"title\":\"Digital speedometer\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'Digital speedometer' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'b0e395d2-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'doughnut_chart_js', '{"type":"latest","sizeX":7,"sizeY":5,"resources":[{"url":"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"}],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n var pieData = {\n labels: [],\n datasets: []\n };\n\n var dataset = {\n data: [],\n backgroundColor: [],\n borderColor: [],\n borderWidth: [],\n hoverBackgroundColor: []\n }\n \n var borderColor = self.ctx.settings.borderColor || ''#fff'';\n var borderWidth = angular.isDefined(self.ctx.settings.borderWidth) ? self.ctx.settings.borderWidth : 5;\n \n pieData.datasets.push(dataset);\n \n for (var i=0; i < self.ctx.data.length; i++) {\n var dataKey = self.ctx.data[i].dataKey;\n pieData.labels.push(dataKey.label);\n dataset.data.push(0);\n var hoverBackgroundColor = tinycolor(dataKey.color).lighten(15);\n dataset.backgroundColor.push(dataKey.color);\n dataset.borderColor.push(borderColor);\n dataset.borderWidth.push(borderWidth);\n dataset.hoverBackgroundColor.push(hoverBackgroundColor.toRgbString());\n }\n\n var options = {\n responsive: false,\n maintainAspectRatio: false,\n legend: {\n display: true,\n labels: {\n fontColor: ''#666''\n }\n },\n tooltips: {\n callbacks: {\n label: function(tooltipItem, data) {\n var label = data.labels[tooltipItem.index];\n var value = data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];\n var content = label + '': '' + value;\n var units = self.ctx.settings.units ? self.ctx.settings.units : self.ctx.units;\n if (units) {\n content += '' '' + units;\n } \n return content;\n }\n }\n }\n };\n\n if (self.ctx.settings.legend) {\n options.legend.display = self.ctx.settings.legend.display !== false;\n options.legend.labels.fontColor = self.ctx.settings.legend.labelsFontColor || ''#666'';\n }\n\n var ctx = $(''#pieChart'', self.ctx.$container);\n self.ctx.chart = new Chart(ctx, {\n type: ''doughnut'',\n data: pieData,\n options: options\n });\n \n self.onResize();\n}\n\nself.onDataUpdated = function() {\n for (var i = 0; i < self.ctx.data.length; i++) {\n var cellData = self.ctx.data[i];\n if (cellData.data.length > 0) {\n var tvPair = cellData.data[cellData.data.length - 1];\n var value = tvPair[1];\n self.ctx.chart.data.datasets[0].data[i] = parseFloat(value);\n }\n }\n self.ctx.chart.update();\n}\n\nself.onResize = function() {\n self.ctx.chart.resize();\n}\n\n","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"Settings\",\n \"properties\": {\n \"borderWidth\": {\n \"title\": \"Border width\",\n \"type\": \"number\",\n \"default\": 5\n },\n \"borderColor\": {\n \"title\": \"Border color\",\n \"type\": \"string\",\n \"default\": \"#fff\"\n },\n \"legend\": {\n \"title\": \"Legend settings\",\n \"type\": \"object\",\n \"properties\": {\n \"display\": {\n \"title\": \"Display legend\",\n \"type\": \"boolean\",\n \"default\": true\n },\n \"labelsFontColor\": {\n \"title\": \"Labels font color\",\n \"type\": \"string\",\n \"default\": \"#666\"\n }\n }\n }\n },\n \"required\": []\n },\n \"form\": [\n \"borderWidth\", \n {\n \"key\": \"borderColor\",\n \"type\": \"color\"\n }, \n {\n \"key\": \"legend\",\n \"items\": [\n \"legend.display\",\n {\n \"key\": \"legend.labelsFontColor\",\n \"type\": \"color\"\n }\n ]\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#26a69a\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#f57c00\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#afb42b\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#673ab7\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"borderWidth\":5,\"borderColor\":\"#fff\",\"legend\":{\"display\":true,\"labelsFontColor\":\"#666666\"}},\"title\":\"Doughnut - Chart.js\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'Doughnut - Chart.js' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'b456a0f6-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'pie_chart_js', '{"type":"latest","sizeX":8,"sizeY":5,"resources":[{"url":"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"}],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n \n var pieData = {\n labels: [],\n datasets: []\n };\n\n var dataset = {\n data: [],\n backgroundColor: [],\n borderColor: [],\n borderWidth: [],\n hoverBackgroundColor: []\n }\n \n pieData.datasets.push(dataset);\n \n for (var i=0; i < self.ctx.data.length; i++) {\n var dataKey = self.ctx.data[i].dataKey;\n pieData.labels.push(dataKey.label);\n dataset.data.push(0);\n var hoverBackgroundColor = tinycolor(dataKey.color).lighten(15);\n var borderColor = tinycolor(dataKey.color).darken();\n dataset.backgroundColor.push(dataKey.color);\n dataset.borderColor.push(''#fff'');\n dataset.borderWidth.push(5);\n dataset.hoverBackgroundColor.push(hoverBackgroundColor.toRgbString());\n }\n\n var ctx = $(''#pieChart'', self.ctx.$container);\n self.ctx.chart = new Chart(ctx, {\n type: ''pie'',\n data: pieData,\n options: {\n responsive: false,\n maintainAspectRatio: false\n }\n }); \n \n self.onResize();\n}\n\nself.onDataUpdated = function() {\n for (var i = 0; i < self.ctx.data.length; i++) {\n var cellData = self.ctx.data[i];\n if (cellData.data.length > 0) {\n var tvPair = cellData.data[cellData.data.length - 1];\n var value = tvPair[1];\n self.ctx.chart.data.datasets[0].data[i] = parseFloat(value);\n }\n }\n self.ctx.chart.update();\n}\n\nself.onResize = function() {\n self.ctx.chart.resize();\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Pie - Chart.js\"}"}', 'Pie - Chart.js' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'b72c406a-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'bars', '{"type":"latest","sizeX":7,"sizeY":5,"resources":[{"url":"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"}],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n var barData = {\n labels: [],\n datasets: []\n };\n \n for (var i = 0; i < self.ctx.datasources.length; i++) {\n var datasource = self.ctx.datasources[i];\n for (var d = 0; d < datasource.dataKeys.length; d++) {\n var dataset = {\n label: datasource.dataKeys[d].label,\n data: [0],\n backgroundColor: [datasource.dataKeys[d].color],\n borderColor: [datasource.dataKeys[d].color],\n borderWidth: 1\n }\n barData.datasets.push(dataset);\n }\n }\n\n var ctx = $(''#barChart'', self.ctx.$container);\n self.ctx.chart = new Chart(ctx, {\n type: ''bar'',\n data: barData,\n options: {\n responsive: false,\n maintainAspectRatio: false,\n scales: {\n yAxes: [{\n ticks: {\n beginAtZero:true\n }\n }]\n }\n }\n });\n \n self.onResize();\n}\n\nself.onDataUpdated = function() {\n var c = 0;\n for (var i = 0; i < self.ctx.chart.data.datasets.length; i++) {\n var dataset = self.ctx.chart.data.datasets[i];\n var cellData = self.ctx.data[i]; \n if (cellData.data.length > 0) {\n var tvPair = cellData.data[cellData.data.length - 1];\n var value = tvPair[1];\n dataset.data[0] = parseFloat(value);\n }\n }\n self.ctx.chart.update();\n}\n\nself.onResize = function() {\n self.ctx.chart.resize();\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Bars - Chart.js\"}"}', 'Bars - Chart.js' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'bb14af46-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', 'digital_bar', '{"type":"latest","sizeX":6,"sizeY":2.5,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Speed\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 80) {\\n\\tvalue = 80;\\n} else if (value > 160) {\\n\\tvalue = 160;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#000000\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":180,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[\"#008000\",\"#fbc02d\",\"#f44336\"],\"refreshAnimationType\":\"linear\",\"refreshAnimationTime\":700,\"startAnimationType\":\"linear\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":18},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#ffffff\"},\"neonGlowBrightness\":40,\"dashThickness\":1.5,\"decimals\":0,\"unitTitle\":\"MPH\",\"showUnitTitle\":true,\"gaugeColor\":\"#171a1c\",\"gaugeType\":\"horizontalBar\",\"showTitle\":false},\"title\":\"Digital horizontal bar\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'Digital horizontal bar' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'be62e9f6-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', 'mini_gauge_justgage', '{"type":"latest","sizeX":2,"sizeY":2,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#7cb342\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Roboto\",\"style\":\"normal\",\"weight\":\"500\",\"size\":32},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"neonGlowBrightness\":0,\"dashThickness\":0,\"decimals\":0,\"roundedLineCap\":true,\"gaugeType\":\"donut\"},\"title\":\"Mini gauge - justGage\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'Mini gauge - justGage' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'c7a95f5e-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'maps', 'route_map_openstreetmap', '{"type":"timeseries","sizeX":8.5,"sizeY":6,"resources":[],"templateHtml":"","templateCss":".leaflet-zoom-box {\n\tz-index: 9;\n}\n\n.leaflet-pane { z-index: 4; }\n\n.leaflet-tile-pane { z-index: 2; }\n.leaflet-overlay-pane { z-index: 4; }\n.leaflet-shadow-pane { z-index: 5; }\n.leaflet-marker-pane { z-index: 6; }\n.leaflet-tooltip-pane { z-index: 7; }\n.leaflet-popup-pane { z-index: 8; }\n\n.leaflet-map-pane canvas { z-index: 1; }\n.leaflet-map-pane svg { z-index: 2; }\n\n.leaflet-control {\n\tz-index: 9;\n}\n.leaflet-top,\n.leaflet-bottom {\n\tz-index: 11;\n}\n\n.tb-marker-label {\n border: none;\n background: none;\n box-shadow: none;\n}\n\n.tb-marker-label:before {\n border: none;\n background: none;\n}\n","controllerScript":"self.onInit = function() {\n self.ctx.map = new TbMapWidget(''openstreet-map'', true, self.ctx);\n}\n\nself.onDataUpdated = function() {\n self.ctx.map.update();\n}\n\nself.onResize = function() {\n self.ctx.map.resize();\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"title\": \"Route Map Configuration\",\n \"type\": \"object\",\n \"properties\": {\n \"defaultZoomLevel\": {\n \"title\": \"Default map zoom level (1 - 20)\",\n \"type\": \"number\"\n },\n \"fitMapBounds\": {\n \"title\": \"Fit map bounds to cover all markers\",\n \"type\": \"boolean\",\n \"default\": true\n },\n \"routesSettings\": {\n \"title\": \"Routes\",\n \"type\": \"array\",\n \"items\": {\n \"title\": \"Route settings\",\n \"type\": \"object\",\n \"properties\": {\n \"latKeyName\": {\n \"title\": \"Latitude key name\",\n \"type\": \"string\",\n \"default\": \"lat\"\n },\n \"lngKeyName\": {\n \"title\": \"Longitude key name\",\n \"type\": \"string\",\n \"default\": \"lng\"\n },\n \"showLabel\": {\n \"title\": \"Show label\",\n \"type\": \"boolean\",\n \"default\": true\n }, \n \"label\": {\n \"title\": \"Label\",\n \"type\": \"string\"\n },\n \"tooltipPattern\": {\n \"title\": \"Pattern ( for ex. ''Text ${keyName} units.'' or ''${#} units'' )\",\n \"type\": \"string\",\n \"default\": \"Latitude: ${lat:7}
Longitude: ${lng:7}\"\n },\n \"color\": {\n \"title\": \"Color\",\n \"type\": \"string\"\n },\n \"useColorFunction\": {\n \"title\": \"Use color function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"colorFunction\": {\n \"title\": \"Color function: f(data)\",\n \"type\": \"string\"\n },\n \"markerImage\": {\n \"title\": \"Custom marker image\",\n \"type\": \"string\"\n },\n \"markerImageSize\": {\n \"title\": \"Custom marker image size (px)\",\n \"type\": \"number\",\n \"default\": 34\n },\n \"useMarkerImageFunction\": {\n \"title\": \"Use marker image function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"markerImageFunction\": {\n \"title\": \"Marker image function: f(data, images)\",\n \"type\": \"string\"\n },\n \"markerImages\": {\n \"title\": \"Marker images\",\n \"type\": \"array\",\n \"items\": {\n \"title\": \"Marker image\",\n \"type\": \"string\"\n }\n },\n \"strokeWeight\": {\n \"title\": \"Stroke weight\",\n \"type\": \"number\",\n \"default\": 2\n },\n \"strokeOpacity\": {\n \"title\": \"Stroke opacity\",\n \"type\": \"number\",\n \"default\": 1.0\n }\n }\n }\n }\n },\n \"required\": [\n ]\n },\n \"form\": [\n \"defaultZoomLevel\",\n \"fitMapBounds\",\n {\n \"key\": \"routesSettings\",\n \"items\": [\n \"routesSettings[].latKeyName\",\n \"routesSettings[].lngKeyName\",\n \"routesSettings[].showLabel\",\n \"routesSettings[].label\",\n \"routesSettings[].tooltipPattern\",\n {\n \"key\": \"routesSettings[].color\",\n \"type\": \"color\"\n },\n \"routesSettings[].useColorFunction\",\n {\n \"key\": \"routesSettings[].colorFunction\",\n \"type\": \"javascript\"\n },\n {\n \"key\": \"routesSettings[].markerImage\",\n \"type\": \"image\"\n },\n \"routesSettings[].markerImageSize\",\n \"routesSettings[].useMarkerImageFunction\",\n {\n \"key\": \"routesSettings[].markerImageFunction\",\n \"type\": \"javascript\"\n },\n {\n \"key\": \"routesSettings[].markerImages\",\n \"items\": [\n {\n \"key\": \"routesSettings[].markerImages[]\",\n \"type\": \"image\"\n }\n ]\n },\n \"routesSettings[].strokeWeight\",\n \"routesSettings[].strokeOpacity\"\n ]\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"latitude\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.8950926999078694,\"funcBody\":\"var lats = [37.7696499,\\n37.7699074,\\n37.7699536,\\n37.7697242,\\n37.7695189,\\n37.7696889,\\n37.7697153,\\n37.7701244,\\n37.7700604,\\n37.7705491,\\n37.7715705,\\n37.771752,\\n37.7707533,\\n37.769866];\\n\\nvar i = Math.floor((time/3 % 14000) / 1000);\\n\\nreturn lats[i];\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"longitude\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.2757675428823283,\"funcBody\":\"var lons = [-122.4261215,\\n-122.4219157,\\n-122.4199623,\\n-122.4179074,\\n-122.4155876,\\n-122.4155521,\\n-122.4163203,\\n-122.4193876,\\n-122.4210496,\\n-122.422284,\\n-122.4232717,\\n-122.4235138,\\n-122.4247605,\\n-122.4258812];\\n\\nvar i = Math.floor((time/3 % 14000) / 1000);\\n\\nreturn lons[i];\"}],\"intervalSec\":60},{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Speed\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.14481354591724638,\"funcBody\":\"var value = prevValue;\\nif (time % 500 < 100) {\\n value = value + Math.random() * 40 - 20;\\n if (value < 45) {\\n \\tvalue = 45;\\n } else if (value > 130) {\\n \\tvalue = 130;\\n }\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":30000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"fitMapBounds\":true,\"routesSettings\":[{\"latKeyName\":\"latitude\",\"lngKeyName\":\"longitude\",\"showLabel\":true,\"tooltipPattern\":\"Latitude: ${latitude:7}
Longitude: ${longitude:7}
Speed: ${Speed} MPH
See advanced settings for details\",\"strokeWeight\":4,\"label\":\"First route\",\"color\":\"#3d5afe\",\"strokeOpacity\":1,\"useColorFunction\":true,\"useMarkerImageFunction\":true,\"markerImages\":[\"data:image/png;base64,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\",\"data:image/png;base64,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\",\"data:image/png;base64,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\"],\"colorFunction\":\"var speed = data[''Speed''];\\nif (typeof speed !== undefined) {\\n var percent = (speed - 45)/85;\\n if (percent < 0.5) {\\n percent *=2*100; \\n return tinycolor.mix(''green'', ''yellow'', amount = percent).toHexString();\\n } else {\\n percent = (percent - 0.5)*2*100;\\n return tinycolor.mix(''yellow'', ''red'', amount = percent).toHexString();\\n }\\n}\\nreturn ''green'';\",\"markerImageFunction\":\"var speed = data[''Speed''];\\nvar res = {\\n url: images[0],\\n size: 55\\n};\\nif (typeof speed !== undefined) {\\n var percent = (speed - 45)/85;\\n var index = Math.floor(3 * percent);\\n res.url = images[index];\\n}\\nreturn res;\"}]},\"title\":\"Route Map - OpenStreetMap\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"useDashboardTimewindow\":true,\"showLegend\":false}"}', 'Route Map - OpenStreetMap' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'cb0e48b2-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'cards', 'label_widget', '{"type":"latest","sizeX":4.5,"sizeY":5,"resources":[],"templateHtml":"","templateCss":"#container {\n overflow: auto;\n}\n\n.tbDatasource-container {\n margin: 5px;\n padding: 8px;\n}\n\n.tbDatasource-title {\n font-size: 1.200rem;\n font-weight: 500;\n padding-bottom: 10px;\n}\n\n.tbDatasource-table {\n width: 100%;\n box-shadow: 0 0 10px #ccc;\n border-collapse: collapse;\n white-space: nowrap;\n font-size: 1.000rem;\n color: #757575;\n}\n\n.tbDatasource-table td {\n position: relative;\n border-top: 1px solid rgba(0, 0, 0, 0.12);\n border-bottom: 1px solid rgba(0, 0, 0, 0.12);\n padding: 0px 18px;\n box-sizing: border-box;\n}","controllerScript":"self.onInit = function() {\n self.ctx.varsRegex = /\\$\\{([^\\}]*)\\}/g;\n \n var imageUrl = self.ctx.settings.backgroundImageUrl ? self.ctx.settings.backgroundImageUrl :\n ''data:image/svg+xml;base64,PHN2ZyBpZD0ic3ZnMiIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMTAwIiB3aWR0aD0iMTAwIiB2ZXJzaW9uPSIxLjEiIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgdmlld0JveD0iMCAwIDEwMCAxMDAiPgogPGcgaWQ9ImxheWVyMSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAtOTUyLjM2KSI+CiAgPHJlY3QgaWQ9InJlY3Q0Njg0IiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBoZWlnaHQ9Ijk5LjAxIiB3aWR0aD0iOTkuMDEiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiB5PSI5NTIuODYiIHg9Ii40OTUwNSIgc3Ryb2tlLXdpZHRoPSIuOTkwMTAiIGZpbGw9IiNlZWUiLz4KICA8dGV4dCBpZD0idGV4dDQ2ODYiIHN0eWxlPSJ3b3JkLXNwYWNpbmc6MHB4O2xldHRlci1zcGFjaW5nOjBweDt0ZXh0LWFuY2hvcjptaWRkbGU7dGV4dC1hbGlnbjpjZW50ZXIiIGZvbnQtd2VpZ2h0PSJib2xkIiB4bWw6c3BhY2U9InByZXNlcnZlIiBmb250LXNpemU9IjEwcHgiIGxpbmUtaGVpZ2h0PSIxMjUlIiB5PSI5NzAuNzI4MDkiIHg9IjQ5LjM5NjQ3NyIgZm9udC1mYW1pbHk9IlJvYm90byIgZmlsbD0iIzY2NjY2NiI+PHRzcGFuIGlkPSJ0c3BhbjQ2OTAiIHg9IjUwLjY0NjQ3NyIgeT0iOTcwLjcyODA5Ij5JbWFnZSBiYWNrZ3JvdW5kIDwvdHNwYW4+PHRzcGFuIGlkPSJ0c3BhbjQ2OTIiIHg9IjQ5LjM5NjQ3NyIgeT0iOTgzLjIyODA5Ij5pcyBub3QgY29uZmlndXJlZDwvdHNwYW4+PC90ZXh0PgogIDxyZWN0IGlkPSJyZWN0NDY5NCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgaGVpZ2h0PSIxOS4zNiIgd2lkdGg9IjY5LjM2IiBzdHJva2U9IiMwMDAiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgeT0iOTkyLjY4IiB4PSIxNS4zMiIgc3Ryb2tlLXdpZHRoPSIuNjM5ODYiIGZpbGw9Im5vbmUiLz4KIDwvZz4KPC9zdmc+Cg=='';\n\n self.ctx.$container.css(''background'', ''url(\"''+imageUrl+''\") no-repeat'');\n self.ctx.$container.css(''backgroundSize'', ''contain'');\n self.ctx.$container.css(''backgroundPosition'', ''50% 50%'');\n \n function processLabelPattern(pattern, data) {\n var match = self.ctx.varsRegex.exec(pattern);\n var replaceInfo = {};\n replaceInfo.variables = [];\n while (match !== null) {\n var variableInfo = {};\n variableInfo.dataKeyIndex = -1;\n var variable = match[0];\n var label = match[1];\n var valDec = 2;\n var splitVals = label.split('':'');\n if (splitVals.length > 1) {\n label = splitVals[0];\n valDec = parseFloat(splitVals[1]);\n }\n variableInfo.variable = variable;\n variableInfo.valDec = valDec;\n \n if (label.startsWith(''#'')) {\n var keyIndexStr = label.substring(1);\n var n = Math.floor(Number(keyIndexStr));\n if (String(n) === keyIndexStr && n >= 0) {\n variableInfo.dataKeyIndex = n;\n }\n }\n if (variableInfo.dataKeyIndex === -1) {\n for (var i = 0; i < data.length; i++) {\n var datasourceData = data[i];\n var dataKey = datasourceData.dataKey;\n if (dataKey.label === label) {\n variableInfo.dataKeyIndex = i;\n break;\n }\n }\n }\n replaceInfo.variables.push(variableInfo);\n match = self.ctx.varsRegex.exec(pattern);\n }\n return replaceInfo;\n }\n\n var configuredLabels = self.ctx.settings.labels;\n if (!configuredLabels) {\n configuredLabels = [];\n }\n \n self.ctx.labels = [];\n\n for (var l = 0; l < configuredLabels.length; l++) {\n var labelConfig = configuredLabels[l];\n var localConfig = {};\n localConfig.font = {};\n \n localConfig.pattern = labelConfig.pattern ? labelConfig.pattern : ''${#0}'';\n localConfig.x = labelConfig.x ? labelConfig.x : 0;\n localConfig.y = labelConfig.y ? labelConfig.y : 0;\n localConfig.backgroundColor = labelConfig.backgroundColor ? labelConfig.backgroundColor : ''rgba(0,0,0,0)'';\n \n var settingsFont = labelConfig.font;\n if (!settingsFont) {\n settingsFont = {};\n }\n \n localConfig.font.family = settingsFont.family || ''RobotoDraft'';\n localConfig.font.size = settingsFont.size ? settingsFont.size : 6;\n localConfig.font.style = settingsFont.style ? settingsFont.style : ''normal'';\n localConfig.font.weight = settingsFont.weight ? settingsFont.weight : ''500'';\n localConfig.font.color = settingsFont.color ? settingsFont.color : ''#fff'';\n \n localConfig.replaceInfo = processLabelPattern(localConfig.pattern, self.ctx.data);\n \n var label = {};\n var labelElement = $(''
'');\n labelElement.css(''position'', ''absolute'');\n labelElement.css(''display'', ''none'');\n labelElement.css(''top'', ''0'');\n labelElement.css(''left'', ''0'');\n labelElement.css(''backgroundColor'', localConfig.backgroundColor);\n labelElement.css(''color'', localConfig.font.color);\n labelElement.css(''fontFamily'', localConfig.font.family);\n labelElement.css(''fontStyle'', localConfig.font.style);\n labelElement.css(''fontWeight'', localConfig.font.weight);\n \n labelElement.html(localConfig.pattern);\n self.ctx.$container.append(labelElement);\n label.element = labelElement;\n label.config = localConfig;\n label.htmlSet = false;\n label.visible = false;\n self.ctx.labels.push(label);\n }\n\n var bgImg = $('''');\n bgImg.hide();\n bgImg.bind(''load'', function()\n {\n self.ctx.bImageHeight = $(this).height();\n self.ctx.bImageWidth = $(this).width();\n self.onResize();\n });\n self.ctx.$container.append(bgImg);\n bgImg.attr(''src'', imageUrl);\n \n self.onDataUpdated();\n}\n\nself.onDataUpdated = function() {\n updateLabels();\n}\n\nself.onResize = function() {\n if (self.ctx.bImageHeight && self.ctx.bImageWidth) {\n var backgroundRect = {};\n var imageRatio = self.ctx.bImageWidth / self.ctx.bImageHeight;\n var componentRatio = self.ctx.width / self.ctx.height;\n if (componentRatio >= imageRatio) {\n backgroundRect.top = 0;\n backgroundRect.bottom = 1.0;\n backgroundRect.xRatio = imageRatio / componentRatio;\n backgroundRect.yRatio = 1;\n var offset = (1 - backgroundRect.xRatio) / 2;\n backgroundRect.left = offset;\n backgroundRect.right = 1 - offset;\n } else {\n backgroundRect.left = 0;\n backgroundRect.right = 1.0;\n backgroundRect.xRatio = 1;\n backgroundRect.yRatio = componentRatio / imageRatio;\n var offset = (1 - backgroundRect.yRatio) / 2;\n backgroundRect.top = offset;\n backgroundRect.bottom = 1 - offset;\n }\n for (var l = 0; l < self.ctx.labels.length; l++) {\n var label = self.ctx.labels[l];\n var labelLeft = backgroundRect.left*100 + (label.config.x*backgroundRect.xRatio);\n var labelTop = backgroundRect.top*100 + (label.config.y*backgroundRect.yRatio);\n var fontSize = self.ctx.height * backgroundRect.yRatio * label.config.font.size / 100;\n label.element.css(''top'', labelTop + ''%'');\n label.element.css(''left'', labelLeft + ''%'');\n label.element.css(''fontSize'', fontSize + ''px'');\n if (!label.visible) {\n label.element.css(''display'', ''block'');\n label.visible = true;\n }\n }\n } \n}\n\n\nfunction isNumber(n) {\n return !isNaN(parseFloat(n)) && isFinite(n);\n}\n\nfunction padValue(val, dec, int) {\n var i = 0;\n var s, strVal, n;\n\n val = parseFloat(val);\n n = (val < 0);\n val = Math.abs(val);\n\n if (dec > 0) {\n strVal = val.toFixed(dec).toString().split(''.'');\n s = int - strVal[0].length;\n\n for (; i < s; ++i) {\n strVal[0] = ''0'' + strVal[0];\n }\n\n strVal = (n ? ''-'' : '''') + strVal[0] + ''.'' + strVal[1];\n }\n\n else {\n strVal = Math.round(val).toString();\n s = int - strVal.length;\n\n for (; i < s; ++i) {\n strVal = ''0'' + strVal;\n }\n\n strVal = (n ? ''-'' : '''') + strVal;\n }\n\n return strVal;\n}\n\nfunction updateLabels() {\n for (var l = 0; l < self.ctx.labels.length; l++) {\n var label = self.ctx.labels[l];\n var text = label.config.pattern;\n var replaceInfo = label.config.replaceInfo;\n var updated = false;\n for (var v = 0; v < replaceInfo.variables.length; v++) {\n var variableInfo = replaceInfo.variables[v];\n var txtVal = '''';\n if (variableInfo.dataKeyIndex > -1) {\n var varData = self.ctx.data[variableInfo.dataKeyIndex].data;\n if (varData.length > 0) {\n var val = varData[varData.length-1][1];\n if (isNumber(val)) {\n txtVal = padValue(val, variableInfo.valDec, 0);\n updated = true;\n } else {\n txtVal = val;\n updated = true;\n }\n }\n }\n text = text.split(variableInfo.variable).join(txtVal);\n }\n if (updated || !label.htmlSet) {\n label.element.html(text);\n if (!label.htmlSet) {\n label.htmlSet = true;\n }\n }\n }\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"Settings\",\n \"required\": [\"backgroundImageUrl\"],\n \"properties\": {\n \"backgroundImageUrl\": {\n \"title\": \"Background image\",\n \"type\": \"string\",\n \"default\": \"data:image/svg+xml;base64,PHN2ZyBpZD0ic3ZnMiIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMTAwIiB3aWR0aD0iMTAwIiB2ZXJzaW9uPSIxLjEiIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgdmlld0JveD0iMCAwIDEwMCAxMDAiPgogPGcgaWQ9ImxheWVyMSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAtOTUyLjM2KSI+CiAgPHJlY3QgaWQ9InJlY3Q0Njg0IiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBoZWlnaHQ9Ijk5LjAxIiB3aWR0aD0iOTkuMDEiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiB5PSI5NTIuODYiIHg9Ii40OTUwNSIgc3Ryb2tlLXdpZHRoPSIuOTkwMTAiIGZpbGw9IiNlZWUiLz4KICA8dGV4dCBpZD0idGV4dDQ2ODYiIHN0eWxlPSJ3b3JkLXNwYWNpbmc6MHB4O2xldHRlci1zcGFjaW5nOjBweDt0ZXh0LWFuY2hvcjptaWRkbGU7dGV4dC1hbGlnbjpjZW50ZXIiIGZvbnQtd2VpZ2h0PSJib2xkIiB4bWw6c3BhY2U9InByZXNlcnZlIiBmb250LXNpemU9IjEwcHgiIGxpbmUtaGVpZ2h0PSIxMjUlIiB5PSI5NzAuNzI4MDkiIHg9IjQ5LjM5NjQ3NyIgZm9udC1mYW1pbHk9IlJvYm90byIgZmlsbD0iIzY2NjY2NiI+PHRzcGFuIGlkPSJ0c3BhbjQ2OTAiIHg9IjUwLjY0NjQ3NyIgeT0iOTcwLjcyODA5Ij5JbWFnZSBiYWNrZ3JvdW5kIDwvdHNwYW4+PHRzcGFuIGlkPSJ0c3BhbjQ2OTIiIHg9IjQ5LjM5NjQ3NyIgeT0iOTgzLjIyODA5Ij5pcyBub3QgY29uZmlndXJlZDwvdHNwYW4+PC90ZXh0PgogIDxyZWN0IGlkPSJyZWN0NDY5NCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgaGVpZ2h0PSIxOS4zNiIgd2lkdGg9IjY5LjM2IiBzdHJva2U9IiMwMDAiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgeT0iOTkyLjY4IiB4PSIxNS4zMiIgc3Ryb2tlLXdpZHRoPSIuNjM5ODYiIGZpbGw9Im5vbmUiLz4KIDwvZz4KPC9zdmc+Cg==\"\n },\n \"labels\": {\n \"title\": \"Labels\",\n \"type\": \"array\",\n \"items\": {\n \"title\": \"Label\",\n \"type\": \"object\",\n \"required\": [\"pattern\"],\n \"properties\": {\n \"pattern\": {\n \"title\": \"Pattern ( for ex. ''Text ${keyName} units.'' or ''${#} units'' )\",\n \"type\": \"string\",\n \"default\": \"${#0}\"\n },\n \"x\": {\n \"title\": \"X (Percentage relative to background)\",\n \"type\": \"number\",\n \"default\": 50\n },\n \"y\": {\n \"title\": \"Y (Percentage relative to background)\",\n \"type\": \"number\",\n \"default\": 50\n },\n \"backgroundColor\": {\n \"title\": \"Backround color\",\n \"type\": \"string\",\n \"default\": \"rgba(0,0,0,0)\"\n },\n \"font\": {\n \"type\": \"object\",\n \"properties\": {\n \"family\": {\n \"title\": \"Font family\",\n \"type\": \"string\",\n \"default\": \"RobotoDraft\"\n },\n \"size\": {\n \"title\": \"Relative font size (percents)\",\n \"type\": \"number\",\n \"default\": 6\n },\n \"style\": {\n \"title\": \"Style\",\n \"type\": \"string\",\n \"default\": \"normal\"\n },\n \"weight\": {\n \"title\": \"Weight\",\n \"type\": \"string\",\n \"default\": \"500\"\n },\n \"color\": {\n \"title\": \"color\",\n \"type\": \"string\",\n \"default\": \"#fff\"\n }\n }\n }\n }\n }\n }\n }\n },\n \"form\": [\n {\n \"key\": \"backgroundImageUrl\",\n \"type\": \"image\"\n },\n {\n \"key\": \"labels\",\n \"items\": [\n \"labels[].pattern\",\n \"labels[].x\",\n \"labels[].y\",\n {\n \"key\": \"labels[].backgroundColor\",\n \"type\": \"color\"\n },\n \"labels[].font.family\",\n \"labels[].font.size\",\n {\n \"key\": \"labels[].font.style\",\n \"type\": \"rc-select\",\n \"multiple\": false,\n \"items\": [\n {\n \"value\": \"normal\",\n \"label\": \"Normal\"\n },\n {\n \"value\": \"italic\",\n \"label\": \"Italic\"\n },\n {\n \"value\": \"oblique\",\n \"label\": \"Oblique\"\n }\n ]\n\n },\n {\n \"key\": \"labels[].font.weight\",\n \"type\": \"rc-select\",\n \"multiple\": false,\n \"items\": [\n {\n \"value\": \"normal\",\n \"label\": \"Normal\"\n },\n {\n \"value\": \"bold\",\n \"label\": \"Bold\"\n },\n {\n \"value\": \"bolder\",\n \"label\": \"Bolder\"\n },\n {\n \"value\": \"lighter\",\n \"label\": \"Lighter\"\n },\n {\n \"value\": \"100\",\n \"label\": \"100\"\n },\n {\n \"value\": \"200\",\n \"label\": \"200\"\n },\n {\n \"value\": \"300\",\n \"label\": \"300\"\n },\n {\n \"value\": \"400\",\n \"label\": \"400\"\n },\n {\n \"value\": \"500\",\n \"label\": \"500\"\n },\n {\n \"value\": \"600\",\n \"label\": \"600\"\n },\n {\n \"value\": \"700\",\n \"label\": \"800\"\n },\n {\n \"value\": \"800\",\n \"label\": \"800\"\n },\n {\n \"value\": \"900\",\n \"label\": \"900\"\n }\n ]\n },\n {\n \"key\": \"labels[].font.color\",\n \"type\": \"color\"\n }\n ]\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"var\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"backgroundImageUrl\":\"data:image/svg+xml;base64,PHN2ZyBpZD0ic3ZnMiIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMTAwIiB3aWR0aD0iMTAwIiB2ZXJzaW9uPSIxLjEiIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgdmlld0JveD0iMCAwIDEwMCAxMDAiPgogPGcgaWQ9ImxheWVyMSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAtOTUyLjM2KSI+CiAgPHJlY3QgaWQ9InJlY3Q0Njg0IiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBoZWlnaHQ9Ijk5LjAxIiB3aWR0aD0iOTkuMDEiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiB5PSI5NTIuODYiIHg9Ii40OTUwNSIgc3Ryb2tlLXdpZHRoPSIuOTkwMTAiIGZpbGw9IiNlZWUiLz4KICA8dGV4dCBpZD0idGV4dDQ2ODYiIHN0eWxlPSJ3b3JkLXNwYWNpbmc6MHB4O2xldHRlci1zcGFjaW5nOjBweDt0ZXh0LWFuY2hvcjptaWRkbGU7dGV4dC1hbGlnbjpjZW50ZXIiIGZvbnQtd2VpZ2h0PSJib2xkIiB4bWw6c3BhY2U9InByZXNlcnZlIiBmb250LXNpemU9IjEwcHgiIGxpbmUtaGVpZ2h0PSIxMjUlIiB5PSI5NzAuNzI4MDkiIHg9IjQ5LjM5NjQ3NyIgZm9udC1mYW1pbHk9IlJvYm90byIgZmlsbD0iIzY2NjY2NiI+PHRzcGFuIGlkPSJ0c3BhbjQ2OTAiIHg9IjUwLjY0NjQ3NyIgeT0iOTcwLjcyODA5Ij5JbWFnZSBiYWNrZ3JvdW5kIDwvdHNwYW4+PHRzcGFuIGlkPSJ0c3BhbjQ2OTIiIHg9IjQ5LjM5NjQ3NyIgeT0iOTgzLjIyODA5Ij5pcyBub3QgY29uZmlndXJlZDwvdHNwYW4+PC90ZXh0PgogIDxyZWN0IGlkPSJyZWN0NDY5NCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgaGVpZ2h0PSIxOS4zNiIgd2lkdGg9IjY5LjM2IiBzdHJva2U9IiMwMDAiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgeT0iOTkyLjY4IiB4PSIxNS4zMiIgc3Ryb2tlLXdpZHRoPSIuNjM5ODYiIGZpbGw9Im5vbmUiLz4KIDwvZz4KPC9zdmc+Cg==\",\"labels\":[{\"pattern\":\"Value: ${#0:2} units.\",\"x\":20,\"y\":47,\"font\":{\"color\":\"#515151\",\"family\":\"Roboto\",\"size\":6,\"style\":\"normal\",\"weight\":\"500\"}}]},\"title\":\"Label widget\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'Label widget' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'cdf0fc46-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'cards', 'simple_card', '{"type":"latest","sizeX":5,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#container {\n overflow: auto;\n}\n\n.tbDatasource-container {\n width: 100%;\n height: 100%;\n overflow: hidden;\n}\n\n.tbDatasource-table {\n width: 100%;\n height: 100%;\n border-collapse: collapse;\n white-space: nowrap;\n font-weight: 100;\n text-align: right;\n}\n\n.tbDatasource-table td {\n padding: 12px;\n position: relative;\n box-sizing: border-box;\n}\n\n.tbDatasource-data-key {\n opacity: 0.7;\n font-weight: 400;\n font-size: 3.500rem;\n}\n\n.tbDatasource-value {\n font-size: 5.000rem;\n}","controllerScript":"self.onInit = function() {\n self.ctx.units = self.ctx.settings.units || self.ctx.units;\n self.ctx.valueDec = (typeof self.ctx.settings.valueDec !== ''undefined'' && self.ctx.settings.valueDec !== null)\n ? self.ctx.settings.valueDec : self.ctx.decimals;\n \n self.ctx.labelPosition = self.ctx.settings.labelPosition || ''left'';\n \n if (self.ctx.datasources.length > 0) {\n var tbDatasource = self.ctx.datasources[0];\n var datasourceId = ''tbDatasource'' + 0;\n self.ctx.$container.append(\n \"
\"\n );\n \n self.ctx.datasourceContainer = $(''#'' + datasourceId,\n self.ctx.$container);\n \n var tableId = ''table'' + 0;\n self.ctx.datasourceContainer.append(\n \"
\"\n );\n var table = $(''#'' + tableId, self.ctx.$container);\n if (self.ctx.labelPosition === ''top'') {\n table.css(''text-align'', ''left'');\n }\n \n if (tbDatasource.dataKeys.length > 0) {\n var dataKey = tbDatasource.dataKeys[0];\n var labelCellId = ''labelCell'' + 0;\n var cellId = ''cell'' + 0;\n if (self.ctx.labelPosition === ''left'') {\n table.append(\n \"\" +\n dataKey.label +\n \"\");\n } else {\n table.append(\n \"\" +\n dataKey.label +\n \"\");\n }\n self.ctx.labelCell = $(''#'' + labelCellId, table);\n self.ctx.valueCell = $(''#'' + cellId, table);\n self.ctx.valueCell.html(0 + '' '' + self.ctx.units);\n }\n }\n \n $.fn.textWidth = function(){\n var html_org = $(this).html();\n var html_calc = '''' + html_org + '''';\n $(this).html(html_calc);\n var width = $(this).find(''span:first'').width();\n $(this).html(html_org);\n return width;\n }; \n \n self.onResize();\n}\n\nself.onDataUpdated = function() {\n \n function isNumber(n) {\n return !isNaN(parseFloat(n)) && isFinite(n);\n }\n \n function padValue(val, dec, int) {\n var i = 0;\n var s, strVal, n;\n \n val = parseFloat(val);\n n = (val < 0);\n val = Math.abs(val);\n \n if (dec > 0) {\n strVal = val.toFixed(dec).toString().split(''.'');\n s = int - strVal[0].length;\n \n for (; i < s; ++i) {\n strVal[0] = ''0'' + strVal[0];\n }\n \n strVal = (n ? ''-'' : '''') + strVal[0] + ''.'' + strVal[1];\n }\n \n else {\n strVal = Math.round(val).toString();\n s = int - strVal.length;\n \n for (; i < s; ++i) {\n strVal = ''0'' + strVal;\n }\n \n strVal = (n ? ''-'' : '''') + strVal;\n }\n \n return strVal;\n }\n \n if (self.ctx.valueCell && self.ctx.data.length > 0) {\n var cellData = self.ctx.data[0];\n if (cellData.data.length > 0) {\n var tvPair = cellData.data[cellData.data.length -\n 1];\n var value = tvPair[1];\n var txtValue;\n if (isNumber(value)) {\n txtValue = padValue(value, self.ctx.alueDec, 0) + '' '' + self.ctx.units;\n } else {\n txtValue = value;\n }\n self.ctx.valueCell.html(txtValue);\n var targetWidth;\n var minDelta;\n if (self.ctx.labelPosition === ''left'') {\n targetWidth = self.ctx.datasourceContainer.width() - self.ctx.labelCell.width();\n minDelta = self.ctx.width/16 + self.ctx.padding;\n } else {\n targetWidth = self.ctx.datasourceContainer.width();\n minDelta = self.ctx.padding;\n }\n var delta = targetWidth - self.ctx.valueCell.textWidth();\n var fontSize = self.ctx.valueFontSize;\n if (targetWidth > minDelta) {\n while (delta < minDelta && fontSize > 6) {\n fontSize--;\n self.ctx.valueCell.css(''font-size'', fontSize+''px'');\n delta = targetWidth - self.ctx.valueCell.textWidth();\n }\n }\n }\n } \n \n}\n\nself.onResize = function() {\n var labelFontSize;\n if (self.ctx.labelPosition === ''top'') {\n self.ctx.padding = self.ctx.height/20;\n labelFontSize = self.ctx.height/4;\n self.ctx.valueFontSize = self.ctx.height/2;\n } else {\n self.ctx.padding = self.ctx.width/50;\n labelFontSize = self.ctx.height/2.5;\n self.ctx.valueFontSize = height/2;\n if (self.ctx.width/self.ctx.height <= 2.7) {\n labelFontSize = self.ctx.width/7;\n self.ctx.valueFontSize = self.ctx.width/6;\n }\n }\n self.ctx.padding = Math.min(12, self.ctx.padding);\n \n if (self.ctx.labelCell) {\n self.ctx.labelCell.css(''font-size'', labelFontSize+''px'');\n self.ctx.labelCell.css(''padding'', self.ctx.padding+''px'');\n }\n if (self.ctx.valueCell) {\n self.ctx.valueCell.css(''font-size'', self.ctx.valueFontSize+''px'');\n self.ctx.valueCell.css(''padding'', self.ctx.padding+''px'');\n } \n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"Settings\",\n \"properties\": {\n \"labelPosition\": {\n \"title\": \"Label position\",\n \"type\": \"string\",\n \"default\": \"left\"\n }\n },\n \"required\": []\n },\n \"form\": [\n {\n \"key\": \"labelPosition\",\n \"type\": \"rc-select\",\n \"multiple\": false,\n \"items\": [\n {\n \"value\": \"left\",\n \"label\": \"Left\"\n },\n {\n \"value\": \"top\",\n \"label\": \"Top\"\n }\n ]\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.2392660816082064,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#ff5722\",\"color\":\"rgba(255, 255, 255, 0.87)\",\"padding\":\"16px\",\"settings\":{\"labelPosition\":\"top\"},\"title\":\"Simple card\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"units\":\"°C\",\"decimals\":0,\"useDashboardTimewindow\":true,\"showLegend\":false}"}', 'Simple card' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'd12897a2-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', 'lcd_bar_gauge', '{"type":"latest","sizeX":2,"sizeY":3.5,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Humidity\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#babab2\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\"linear\",\"refreshAnimationTime\":700,\"startAnimationType\":\"linear\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Roboto\",\"style\":\"normal\",\"weight\":\"400\",\"size\":16},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"neonGlowBrightness\":0,\"dashThickness\":1.5,\"decimals\":0,\"showUnitTitle\":true,\"defaultColor\":\"#444444\",\"gaugeType\":\"verticalBar\",\"units\":\"%\"},\"title\":\"LCD bar gauge\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'LCD bar gauge' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'd4041e6a-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', 'vertical_bar_justgage', '{"type":"latest","sizeX":2,"sizeY":3.5,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#f57c00\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#999999\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Roboto\",\"style\":\"normal\",\"weight\":\"500\",\"size\":12,\"color\":\"#666666\"},\"minMaxFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#666666\"},\"neonGlowBrightness\":0,\"decimals\":0,\"dashThickness\":1.5,\"gaugeColor\":\"#eeeeee\",\"showTitle\":false,\"gaugeType\":\"verticalBar\"},\"title\":\"Vertical bar - justGage\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'Vertical bar - justGage' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'd6d4e8ea-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'cards', 'html_value_card', '{"type":"latest","sizeX":7.5,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"","controllerScript":"self.onInit = function() {\n self.ctx.varsRegex = /\\$\\{([^\\}]*)\\}/g;\n self.ctx.htmlSet = false;\n \n var cssParser = new cssjs();\n cssParser.testMode = false;\n var namespace = ''html-value-card-'' + hashCode(self.ctx.settings.cardCss);\n cssParser.cssPreviewNamespace = namespace;\n cssParser.createStyleElement(namespace, self.ctx.settings.cardCss);\n self.ctx.$container.addClass(namespace);\n self.ctx.html = self.ctx.settings.cardHtml;\n self.ctx.replaceInfo = processHtmlPattern(self.ctx.html, self.ctx.data);\n \n updateHtml();\n \n function hashCode(str) {\n var hash = 0;\n var i, char;\n if (str.length === 0) return hash;\n for (i = 0; i < str.length; i++) {\n char = str.charCodeAt(i);\n hash = ((hash << 5) - hash) + char;\n hash = hash & hash;\n }\n return hash;\n }\n \n function processHtmlPattern(pattern, data) {\n var match = self.ctx.varsRegex.exec(pattern);\n var replaceInfo = {};\n replaceInfo.variables = [];\n while (match !== null) {\n var variableInfo = {};\n variableInfo.dataKeyIndex = -1;\n var variable = match[0];\n var label = match[1];\n var valDec = 2;\n var splitVals = label.split('':'');\n if (splitVals.length > 1) {\n label = splitVals[0];\n valDec = parseFloat(splitVals[1]);\n }\n variableInfo.variable = variable;\n variableInfo.valDec = valDec;\n \n if (label.startsWith(''#'')) {\n var keyIndexStr = label.substring(1);\n var n = Math.floor(Number(keyIndexStr));\n if (String(n) === keyIndexStr && n >= 0) {\n variableInfo.dataKeyIndex = n;\n }\n }\n if (variableInfo.dataKeyIndex === -1) {\n for (var i = 0; i < data.length; i++) {\n var datasourceData = data[i];\n var dataKey = datasourceData.dataKey;\n if (dataKey.label === label) {\n variableInfo.dataKeyIndex = i;\n break;\n }\n }\n }\n replaceInfo.variables.push(variableInfo);\n match = self.ctx.varsRegex.exec(pattern);\n }\n return replaceInfo;\n } \n}\n\nself.onDataUpdated = function() {\n updateHtml();\n}\n\nself.onDestroy = function() {\n}\n\nfunction isNumber(n) {\n return !isNaN(parseFloat(n)) && isFinite(n);\n}\n\nfunction padValue(val, dec, int) {\n var i = 0;\n var s, strVal, n;\n\n val = parseFloat(val);\n n = (val < 0);\n val = Math.abs(val);\n\n if (dec > 0) {\n strVal = val.toFixed(dec).toString().split(''.'');\n s = int - strVal[0].length;\n\n for (; i < s; ++i) {\n strVal[0] = ''0'' + strVal[0];\n }\n\n strVal = (n ? ''-'' : '''') + strVal[0] + ''.'' + strVal[1];\n }\n\n else {\n strVal = Math.round(val).toString();\n s = int - strVal.length;\n\n for (; i < s; ++i) {\n strVal = ''0'' + strVal;\n }\n\n strVal = (n ? ''-'' : '''') + strVal;\n }\n\n return strVal;\n}\n\nfunction updateHtml() {\n var text = self.ctx.html;\n var updated = false;\n for (var v in self.ctx.replaceInfo.variables) {\n var variableInfo = self.ctx.replaceInfo.variables[v];\n var txtVal = '''';\n if (variableInfo.dataKeyIndex > -1) {\n var varData = self.ctx.data[variableInfo.dataKeyIndex].data;\n if (varData.length > 0) {\n var val = varData[varData.length-1][1];\n if (isNumber(val)) {\n txtVal = padValue(val, variableInfo.valDec, 0);\n } else {\n txtVal = val;\n }\n }\n }\n if (typeof variableInfo.lastVal === undefined ||\n variableInfo.lastVal !== txtVal) {\n updated = true;\n variableInfo.lastVal = txtVal;\n }\n text = text.split(variableInfo.variable).join(txtVal);\n }\n if (updated || !self.ctx.htmlSet) {\n self.ctx.$container.html(text);\n if (!self.ctx.htmlSet) {\n self.ctx.htmlSet = true;\n }\n }\n}\n\n","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"Settings\",\n \"required\": [\"cardHtml\"],\n \"properties\": {\n \"cardCss\": {\n \"title\": \"CSS\",\n \"type\": \"string\",\n \"default\": \".card {\\n font-weight: bold; \\n}\"\n },\n \"cardHtml\": {\n \"title\": \"HTML\",\n \"type\": \"string\",\n \"default\": \"
HTML code here
\"\n }\n }\n },\n \"form\": [\n {\n \"key\": \"cardCss\",\n \"type\": \"css\"\n }, \n {\n \"key\": \"cardHtml\",\n \"type\": \"html\"\n } \n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"My value\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"return Math.random() * 5.45;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"cardCss\":\".card {\\n width: 100%;\\n height: 100%;\\n border: 2px solid #ccc;\\n box-sizing: border-box;\\n}\\n\\n.card .content {\\n padding: 20px;\\n display: flex;\\n flex-direction: row;\\n align-items: center;\\n justify-content: space-around;\\n height: 100%;\\n box-sizing: border-box;\\n}\\n\\n.card .content .column {\\n display: flex;\\n flex-direction: column; \\n justify-content: space-around;\\n height: 100%;\\n}\\n\\n.card h1 {\\n text-transform: uppercase;\\n color: #999;\\n font-size: 20px;\\n font-weight: bold;\\n margin: 0;\\n padding-bottom: 10px;\\n line-height: 32px;\\n}\\n\\n.card .value {\\n font-size: 38px;\\n font-weight: 200;\\n}\\n\\n.card .description {\\n font-size: 20px;\\n color: #999;\\n}\\n\",\"cardHtml\":\"
\\n
\\n
\\n

Value title

\\n
\\n ${My value:2} units.\\n
\\n
\\n Value description text\\n
\\n
\\n \\n
\\n
\"},\"title\":\"HTML Value Card\",\"dropShadow\":false}"}', 'HTML Value Card' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'e3ca1868-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'gpio_widgets', 'raspberry_pi_gpio_panel', '{"type":"latest","sizeX":7,"sizeY":10.5,"resources":[],"templateHtml":"
\n
\n
\n
\n {{ cell.label }}\n
\n {{cell.pin}}\n \n \n \n \n {{cell.pin}}\n
\n {{ cell.label }}\n
\n
\n \n \n \n
\n
\n
\n
","templateCss":".error {\n font-size: 14px !important;\n color: maroon;/*rgb(250,250,250);*/\n background-color: transparent;\n padding: 6px;\n}\n\n.error span {\n margin: auto;\n}\n\n.gpio-panel {\n padding-top: 10px;\n white-space: nowrap;\n}\n\n.gpio-panel tb-led-light > div {\n margin: auto;\n}\n\n.led-panel {\n margin: 0;\n width: 66px;\n min-width: 66px;\n}\n\n.led-container {\n width: 48px;\n min-width: 48px;\n}\n\n.pin {\n margin-top: auto;\n margin-bottom: auto;\n color: white;\n font-size: 12px;\n width: 16px;\n min-width: 16px;\n}\n\n.led-panel.col-0 .pin {\n margin-left: auto;\n padding-left: 2px;\n text-align: right;\n}\n\n.led-panel.col-1 .pin {\n margin-right: auto;\n \n text-align: left;\n}\n\n.gpio-left-label {\n margin-right: 8px;\n}\n\n.gpio-right-label {\n margin-left: 8px;\n}","controllerScript":"self.onInit = function() {\n var i, gpio;\n \n var scope = self.ctx.$scope;\n var settings = self.ctx.settings;\n \n scope.gpioList = [];\n scope.gpioByPin = {};\n for (var g = 0; g < settings.gpioList.length; g++) {\n gpio = settings.gpioList[g];\n scope.gpioList.push(\n {\n row: gpio.row,\n col: gpio.col,\n pin: gpio.pin,\n label: gpio.label,\n enabled: false,\n colorOn: tinycolor(gpio.color).lighten(20).toHexString(),\n colorOff: tinycolor(gpio.color).darken().toHexString()\n }\n );\n scope.gpioByPin[gpio.pin] = scope.gpioList[scope.gpioList.length-1];\n }\n\n scope.ledPanelBackgroundColor = settings.ledPanelBackgroundColor || tinycolor(''green'').lighten(2).toRgbString();\n\n scope.gpioCells = {};\n var rowCount = 0;\n for (i = 0; i < scope.gpioList.length; i++) {\n gpio = scope.gpioList[i];\n scope.gpioCells[gpio.row+''_''+gpio.col] = gpio;\n rowCount = Math.max(rowCount, gpio.row+1);\n }\n \n scope.prefferedRowHeight = 32;\n scope.rows = [];\n for (i = 0; i < rowCount; i++) {\n var row = [];\n for (var c =0; c<2;c++) {\n if (scope.gpioCells[i+''_''+c]) {\n row[c] = scope.gpioCells[i+''_''+c];\n } else {\n row[c] = null;\n }\n }\n scope.rows.push(row);\n } \n \n self.onResize();\n}\n\nself.onDataUpdated = function() {\n var changed = false;\n for (var d = 0; d < self.ctx.data.length; d++) {\n var cellData = self.ctx.data[d];\n var dataKey = cellData.dataKey;\n var gpio = self.ctx.$scope.gpioByPin[dataKey.label];\n if (gpio) {\n var enabled = false;\n if (cellData.data.length > 0) {\n var tvPair = cellData.data[cellData.data.length - 1];\n enabled = (tvPair[1] === true || tvPair[1] === ''true'');\n }\n if (gpio.enabled != enabled) {\n changed = true;\n gpio.enabled = enabled;\n }\n }\n }\n if (changed) {\n self.ctx.$scope.$digest();\n } \n}\n\nself.onResize = function() {\n var rowCount = self.ctx.$scope.rows.length;\n var prefferedRowHeight = (self.ctx.height - 35)/rowCount;\n prefferedRowHeight = Math.min(32, prefferedRowHeight);\n prefferedRowHeight = Math.max(12, prefferedRowHeight);\n self.ctx.$scope.prefferedRowHeight = prefferedRowHeight;\n \n var ratio = prefferedRowHeight/32;\n \n var leftLabels = $(''.gpio-left-label'', self.ctx.$container);\n leftLabels.css(''font-size'', 16*ratio+''px'');\n var rightLabels = $(''.gpio-right-label'', self.ctx.$container);\n rightLabels.css(''font-size'', 16*ratio+''px'');\n var pins = $(''.pin'', self.ctx.$container);\n var pinsFontSize = Math.max(9, 12*ratio);\n pins.css(''font-size'', pinsFontSize+''px''); \n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"Settings\",\n \"properties\": {\n \"gpioList\": {\n \"title\": \"Gpio leds\",\n \"type\": \"array\",\n \"minItems\" : 1,\n \"items\": {\n \"title\": \"Gpio led\",\n \"type\": \"object\",\n \"properties\": {\n \"pin\": {\n \"title\": \"Pin\",\n \"type\": \"number\"\n },\n \"label\": {\n \"title\": \"Label\",\n \"type\": \"string\"\n },\n \"row\": {\n \"title\": \"Row\",\n \"type\": \"number\"\n },\n \"col\": {\n \"title\": \"Column\",\n \"type\": \"number\"\n },\n \"color\": {\n \"title\": \"Color\",\n \"type\": \"string\",\n \"default\": \"red\"\n }\n },\n \"required\": [\"pin\", \"label\", \"row\", \"col\", \"color\"]\n }\n },\n \"ledPanelBackgroundColor\": {\n \"title\": \"LED panel background color\",\n \"type\": \"string\",\n \"default\": \"#008a00\"\n } \n },\n \"required\": [\"gpioList\", \n \"ledPanelBackgroundColor\"]\n },\n \"form\": [\n {\n \"key\": \"gpioList\",\n \"items\": [\n \"gpioList[].pin\",\n \"gpioList[].label\",\n \"gpioList[].row\",\n \"gpioList[].col\",\n {\n \"key\": \"gpioList[].color\",\n \"type\": \"color\"\n }\n ]\n },\n {\n \"key\": \"ledPanelBackgroundColor\",\n \"type\": \"color\"\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"gpioList\":[{\"pin\":1,\"label\":\"3.3V\",\"row\":0,\"col\":0,\"color\":\"#fc9700\",\"_uniqueKey\":0},{\"pin\":2,\"label\":\"5V\",\"row\":0,\"col\":1,\"color\":\"#fb0000\",\"_uniqueKey\":1},{\"pin\":3,\"label\":\"GPIO 2 (I2C1_SDA)\",\"row\":1,\"col\":0,\"color\":\"#02fefb\",\"_uniqueKey\":2},{\"color\":\"#fb0000\",\"pin\":4,\"label\":\"5V\",\"row\":1,\"col\":1},{\"color\":\"#02fefb\",\"pin\":5,\"label\":\"GPIO 3 (I2C1_SCL)\",\"row\":2,\"col\":0},{\"color\":\"#000000\",\"pin\":6,\"label\":\"GND\",\"row\":2,\"col\":1},{\"color\":\"#00fd00\",\"pin\":7,\"label\":\"GPIO 4 (GPCLK0)\",\"row\":3,\"col\":0},{\"color\":\"#fdfb00\",\"pin\":8,\"label\":\"GPIO 14 (UART_TXD)\",\"row\":3,\"col\":1},{\"color\":\"#000000\",\"pin\":9,\"label\":\"GND\",\"row\":4,\"col\":0},{\"color\":\"#fdfb00\",\"pin\":10,\"label\":\"GPIO 15 (UART_RXD)\",\"row\":4,\"col\":1},{\"color\":\"#00fd00\",\"pin\":11,\"label\":\"GPIO 17\",\"row\":5,\"col\":0},{\"color\":\"#00fd00\",\"pin\":12,\"label\":\"GPIO 18\",\"row\":5,\"col\":1},{\"color\":\"#00fd00\",\"pin\":13,\"label\":\"GPIO 27\",\"row\":6,\"col\":0},{\"color\":\"#000000\",\"pin\":14,\"label\":\"GND\",\"row\":6,\"col\":1},{\"color\":\"#00fd00\",\"pin\":15,\"label\":\"GPIO 22\",\"row\":7,\"col\":0},{\"color\":\"#00fd00\",\"pin\":16,\"label\":\"GPIO 23\",\"row\":7,\"col\":1},{\"color\":\"#fc9700\",\"pin\":17,\"label\":\"3.3V\",\"row\":8,\"col\":0},{\"color\":\"#00fd00\",\"pin\":18,\"label\":\"GPIO 24\",\"row\":8,\"col\":1},{\"color\":\"#fd01fd\",\"pin\":19,\"label\":\"GPIO 10 (SPI_MOSI)\",\"row\":9,\"col\":0},{\"color\":\"#000000\",\"pin\":20,\"label\":\"GND\",\"row\":9,\"col\":1},{\"color\":\"#fd01fd\",\"pin\":21,\"label\":\"GPIO 9 (SPI_MISO)\",\"row\":10,\"col\":0},{\"color\":\"#00fd00\",\"pin\":22,\"label\":\"GPIO 25\",\"row\":10,\"col\":1},{\"color\":\"#fd01fd\",\"pin\":23,\"label\":\"GPIO 11 (SPI_SCLK)\",\"row\":11,\"col\":0},{\"color\":\"#fd01fd\",\"pin\":24,\"label\":\"GPIO 8 (SPI_CE0)\",\"row\":11,\"col\":1},{\"color\":\"#000000\",\"pin\":25,\"label\":\"GND\",\"row\":12,\"col\":0},{\"color\":\"#fd01fd\",\"pin\":26,\"label\":\"GPIO 7 (SPI_CE1)\",\"row\":12,\"col\":1},{\"color\":\"#ffffff\",\"pin\":27,\"label\":\"ID_SD\",\"row\":13,\"col\":0},{\"color\":\"#ffffff\",\"pin\":28,\"label\":\"ID_SC\",\"row\":13,\"col\":1},{\"color\":\"#00fd00\",\"pin\":29,\"label\":\"GPIO 5\",\"row\":14,\"col\":0},{\"color\":\"#000000\",\"pin\":30,\"label\":\"GND\",\"row\":14,\"col\":1},{\"color\":\"#00fd00\",\"pin\":31,\"label\":\"GPIO 6\",\"row\":15,\"col\":0},{\"color\":\"#00fd00\",\"pin\":32,\"label\":\"GPIO 12\",\"row\":15,\"col\":1},{\"color\":\"#00fd00\",\"pin\":33,\"label\":\"GPIO 13\",\"row\":16,\"col\":0},{\"color\":\"#000000\",\"pin\":34,\"label\":\"GND\",\"row\":16,\"col\":1},{\"color\":\"#00fd00\",\"pin\":35,\"label\":\"GPIO 19\",\"row\":17,\"col\":0},{\"color\":\"#00fd00\",\"pin\":36,\"label\":\"GPIO 16\",\"row\":17,\"col\":1},{\"color\":\"#00fd00\",\"pin\":37,\"label\":\"GPIO 26\",\"row\":18,\"col\":0},{\"color\":\"#00fd00\",\"pin\":38,\"label\":\"GPIO 20\",\"row\":18,\"col\":1},{\"color\":\"#000000\",\"pin\":39,\"label\":\"GND\",\"row\":19,\"col\":0},{\"color\":\"#00fd00\",\"pin\":40,\"label\":\"GPIO 21\",\"row\":19,\"col\":1}],\"ledPanelBackgroundColor\":\"#008a00\"},\"title\":\"Raspberry Pi GPIO Panel\",\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"7\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.22518255793320163,\"funcBody\":\"var period = time % 1500;\\nreturn period < 500;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"11\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.7008206860666621,\"funcBody\":\"var period = time % 1500;\\nreturn period >= 500 && period < 1000;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"12\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.42600325102193426,\"funcBody\":\"var period = time % 1500;\\nreturn period >= 1000;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"13\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.48362241571415243,\"funcBody\":\"var period = time % 1500;\\nreturn period < 500;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"29\",\"color\":\"#607d8b\",\"settings\":{},\"_hash\":0.7217670147518815,\"funcBody\":\"var period = time % 1500;\\nreturn period >= 500 && period < 1000;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}}}"}', 'Raspberry Pi GPIO Panel' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'e7acbd64-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'radar_chart_js', '{"type":"latest","sizeX":7,"sizeY":5,"resources":[{"url":"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"}],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n var barData = {\n labels: [],\n datasets: []\n };\n\n var backgroundColor = tinycolor(self.ctx.data[0].dataKey.color);\n backgroundColor.setAlpha(0.2);\n var borderColor = tinycolor(self.ctx.data[0].dataKey.color);\n borderColor.setAlpha(1);\n var dataset = {\n label: self.ctx.datasources[0].name,\n data: [],\n backgroundColor: backgroundColor.toRgbString(),\n borderColor: borderColor.toRgbString(),\n pointBackgroundColor: borderColor.toRgbString(),\n pointBorderColor: borderColor.darken().toRgbString(),\n borderWidth: 1\n }\n \n barData.datasets.push(dataset);\n \n for (var i = 0; i < self.ctx.data.length; i++) {\n var dataKey = self.ctx.data[i].dataKey;\n barData.labels.push(dataKey.label);\n dataset.data.push(0);\n }\n\n var ctx = $(''#radarChart'', self.ctx.$container);\n self.ctx.chart = new Chart(ctx, {\n type: ''radar'',\n data: barData,\n options: {\n responsive: false,\n maintainAspectRatio: false\n }\n });\n \n self.onResize();\n}\n\nself.onDataUpdated = function() {\n for (var i = 0; i < self.ctx.data.length; i++) {\n var cellData = self.ctx.data[i];\n if (cellData.data.length > 0) {\n var tvPair = cellData.data[cellData.data.length - 1];\n var value = tvPair[1];\n self.ctx.chart.data.datasets[0].data[i] = parseFloat(value);\n }\n } \n self.ctx.chart.update();\n}\n\nself.onResize = function() {\n if (self.ctx.height >= 70) {\n self.ctx.chart.resize();\n }\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Radar - Chart.js\"}"}', 'Radar - Chart.js' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'ee579e40-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', 'neon_gauge_justgage', '{"type":"latest","sizeX":5,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#000000\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":32},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"neonGlowBrightness\":70,\"dashThickness\":1,\"decimals\":1,\"gaugeType\":\"arc\"},\"title\":\"Neon gauge - justGage\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'Neon gauge - justGage' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'f26ff52c-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', 'simple_gauge_justgage', '{"type":"latest","sizeX":2,"sizeY":2,"resources":[],"templateHtml":"\n","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"\nself.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#ef6c00\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Roboto\",\"style\":\"normal\",\"weight\":\"500\",\"size\":32,\"color\":\"#666666\"},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"neonGlowBrightness\":0,\"dashThickness\":0,\"decimals\":0,\"gaugeColor\":\"#eeeeee\",\"gaugeType\":\"donut\"},\"title\":\"Simple gauge - justGage\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'Simple gauge - justGage' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'f56c6418-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'maps', 'route_map', '{"type":"timeseries","sizeX":8.5,"sizeY":6,"resources":[],"templateHtml":"","templateCss":".error {\n color: red;\n}\n.tb-labels {\n color: #222;\n font: 12px/1.5 \"Helvetica Neue\", Arial, Helvetica, sans-serif;\n text-align: center;\n width: 100px;\n white-space: nowrap;\n}","controllerScript":"self.onInit = function() {\n self.ctx.map = new TbMapWidget(''google-map'', true, self.ctx);\n}\n\nself.onDataUpdated = function() {\n self.ctx.map.update();\n}\n\nself.onResize = function() {\n self.ctx.map.resize();\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"title\": \"Route Map Configuration\",\n \"type\": \"object\",\n \"properties\": {\n \"gmApiKey\": {\n \"title\": \"Google Maps API Key\",\n \"type\": \"string\"\n },\n \"gmDefaultMapType\": {\n \"title\": \"Default map type\",\n \"type\": \"string\",\n \"default\": \"roadmap\"\n },\n \"defaultZoomLevel\": {\n \"title\": \"Default map zoom level (1 - 20)\",\n \"type\": \"number\"\n },\n \"fitMapBounds\": {\n \"title\": \"Fit map bounds to cover all routes\",\n \"type\": \"boolean\",\n \"default\": true\n },\n \"routesSettings\": {\n \"title\": \"Routes\",\n \"type\": \"array\",\n \"items\": {\n \"title\": \"Route settings\",\n \"type\": \"object\",\n \"properties\": {\n \"latKeyName\": {\n \"title\": \"Latitude key name\",\n \"type\": \"string\",\n \"default\": \"lat\"\n },\n \"lngKeyName\": {\n \"title\": \"Longitude key name\",\n \"type\": \"string\",\n \"default\": \"lng\"\n },\n \"showLabel\": {\n \"title\": \"Show label\",\n \"type\": \"boolean\",\n \"default\": true\n }, \n \"label\": {\n \"title\": \"Label\",\n \"type\": \"string\"\n },\n \"tooltipPattern\": {\n \"title\": \"Pattern ( for ex. ''Text ${keyName} units.'' or ''${#} units'' )\",\n \"type\": \"string\",\n \"default\": \"Latitude: ${lat:7}
Longitude: ${lng:7}\"\n },\n \"color\": {\n \"title\": \"Color\",\n \"type\": \"string\"\n },\n \"useColorFunction\": {\n \"title\": \"Use color function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"colorFunction\": {\n \"title\": \"Color function: f(data)\",\n \"type\": \"string\"\n },\n \"markerImage\": {\n \"title\": \"Custom marker image\",\n \"type\": \"string\"\n },\n \"markerImageSize\": {\n \"title\": \"Custom marker image size (px)\",\n \"type\": \"number\",\n \"default\": 34\n },\n \"useMarkerImageFunction\": {\n \"title\": \"Use marker image function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"markerImageFunction\": {\n \"title\": \"Marker image function: f(data, images)\",\n \"type\": \"string\"\n },\n \"markerImages\": {\n \"title\": \"Marker images\",\n \"type\": \"array\",\n \"items\": {\n \"title\": \"Marker image\",\n \"type\": \"string\"\n }\n },\n \"strokeWeight\": {\n \"title\": \"Stroke weight\",\n \"type\": \"number\",\n \"default\": 2\n },\n \"strokeOpacity\": {\n \"title\": \"Stroke opacity\",\n \"type\": \"number\",\n \"default\": 1.0\n }\n }\n }\n }\n },\n \"required\": [\n \"gmApiKey\"\n ]\n },\n \"form\": [\n \"gmApiKey\",\n {\n \"key\": \"gmDefaultMapType\",\n \"type\": \"rc-select\",\n \"multiple\": false,\n \"items\": [\n {\n \"value\": \"roadmap\",\n \"label\": \"Roadmap\"\n },\n {\n \"value\": \"satellite\",\n \"label\": \"Satellite\"\n },\n {\n \"value\": \"hybrid\",\n \"label\": \"Hybrid\"\n },\n {\n \"value\": \"terrain\",\n \"label\": \"Terrain\"\n }\n ]\n }, \n \"defaultZoomLevel\",\n \"fitMapBounds\",\n {\n \"key\": \"routesSettings\",\n \"items\": [\n \"routesSettings[].latKeyName\",\n \"routesSettings[].lngKeyName\",\n \"routesSettings[].showLabel\",\n \"routesSettings[].label\",\n \"routesSettings[].tooltipPattern\",\n {\n \"key\": \"routesSettings[].color\",\n \"type\": \"color\"\n },\n \"routesSettings[].useColorFunction\",\n {\n \"key\": \"routesSettings[].colorFunction\",\n \"type\": \"javascript\"\n },\n {\n \"key\": \"routesSettings[].markerImage\",\n \"type\": \"image\"\n },\n \"routesSettings[].markerImageSize\",\n \"routesSettings[].useMarkerImageFunction\",\n {\n \"key\": \"routesSettings[].markerImageFunction\",\n \"type\": \"javascript\"\n },\n {\n \"key\": \"routesSettings[].markerImages\",\n \"items\": [\n {\n \"key\": \"routesSettings[].markerImages[]\",\n \"type\": \"image\"\n }\n ]\n },\n \"routesSettings[].strokeWeight\",\n \"routesSettings[].strokeOpacity\"\n ]\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"latitude\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.3467277073670627,\"funcBody\":\"var lats = [37.7696499,\\n37.7699074,\\n37.7699536,\\n37.7697242,\\n37.7695189,\\n37.7696889,\\n37.7697153,\\n37.7701244,\\n37.7700604,\\n37.7705491,\\n37.7715705,\\n37.771752,\\n37.7707533,\\n37.769866];\\n\\nvar i = Math.floor((time/3 % 14000) / 1000);\\n\\nreturn lats[i];\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"longitude\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.058309787276281666,\"funcBody\":\"var lons = [-122.4261215,\\n-122.4219157,\\n-122.4199623,\\n-122.4179074,\\n-122.4155876,\\n-122.4155521,\\n-122.4163203,\\n-122.4193876,\\n-122.4210496,\\n-122.422284,\\n-122.4232717,\\n-122.4235138,\\n-122.4247605,\\n-122.4258812];\\n\\nvar i = Math.floor((time/3 % 14000) / 1000);\\n\\nreturn lons[i];\"}],\"intervalSec\":60},{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Speed\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.14288960550237473,\"funcBody\":\"var value = prevValue;\\nif (time % 500 < 100) {\\n value = value + Math.random() * 40 - 20;\\n if (value < 45) {\\n \\tvalue = 45;\\n } else if (value > 130) {\\n \\tvalue = 130;\\n }\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":30000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"gmApiKey\":\"AIzaSyDoEx2kaGz3PxwbI9T7ccTSg5xjdw8Nw8Q\",\"fitMapBounds\":true,\"routesSettings\":[{\"latKeyName\":\"latitude\",\"lngKeyName\":\"longitude\",\"showLabel\":true,\"color\":\"#1976d2\",\"strokeWeight\":4,\"strokeOpacity\":0.65,\"label\":\"First route\",\"tooltipPattern\":\"Latitude: ${latitude:7}
Longitude: ${longitude:7}
Speed: ${Speed} MPH
See advanced settings for details\",\"useColorFunction\":true,\"markerImageSize\":34,\"useMarkerImageFunction\":true,\"markerImageFunction\":\"var speed = data[''Speed''];\\nvar res = {\\n url: images[0],\\n size: 55\\n};\\nif (typeof speed !== undefined) {\\n var percent = (speed - 45)/85;\\n var index = Math.floor(3 * percent);\\n res.url = images[index];\\n}\\nreturn res;\",\"markerImages\":[\"data:image/png;base64,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\",\"data:image/png;base64,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\",\"data:image/png;base64,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\"],\"colorFunction\":\"var speed = data[''Speed''];\\nif (typeof speed !== undefined) {\\n var percent = (speed - 45)/85;\\n if (percent < 0.5) {\\n percent *=2*100; \\n return tinycolor.mix(''green'', ''yellow'', amount = percent).toHexString();\\n } else {\\n percent = (percent - 0.5)*2*100;\\n return tinycolor.mix(''yellow'', ''red'', amount = percent).toHexString();\\n }\\n}\\nreturn ''green'';\"}]},\"title\":\"Route Map\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"useDashboardTimewindow\":true,\"showLegend\":false}"}', 'Route Map' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'fb474880-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'analogue_gauges', 'temperature_gauge_canvas_gauges', '{"type":"latest","sizeX":7,"sizeY":3,"resources":[],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbAnalogueLinearGauge(self.ctx, ''linearGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.getSettingsSchema = function() {\n return TbAnalogueLinearGauge.settingsSchema;\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 30 - 15;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"maxValue\":100,\"defaultColor\":\"#e64a19\",\"barStrokeWidth\":2.5,\"colorBar\":\"rgba(255, 255, 255, 0.4)\",\"colorBarEnd\":\"rgba(221, 221, 221, 0.38)\",\"showUnitTitle\":true,\"minorTicks\":2,\"valueBox\":true,\"valueInt\":3,\"colorPlate\":\"#fff\",\"colorMajorTicks\":\"#444\",\"colorMinorTicks\":\"#666\",\"colorNeedleShadowUp\":\"rgba(2,255,255,0.2)\",\"colorNeedleShadowDown\":\"rgba(188,143,143,0.45)\",\"colorValueBoxRect\":\"#888\",\"colorValueBoxRectEnd\":\"#666\",\"colorValueBoxBackground\":\"#babab2\",\"colorValueBoxShadow\":\"rgba(0,0,0,1)\",\"highlightsWidth\":10,\"animation\":true,\"animationDuration\":1500,\"animationRule\":\"linear\",\"showBorder\":false,\"majorTicksCount\":8,\"numbersFont\":{\"family\":\"Arial\",\"size\":18,\"style\":\"normal\",\"weight\":\"normal\",\"color\":\"#263238\"},\"titleFont\":{\"family\":\"Roboto\",\"size\":24,\"style\":\"normal\",\"weight\":\"normal\",\"color\":\"#78909c\"},\"unitsFont\":{\"family\":\"Roboto\",\"size\":26,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#37474f\"},\"valueFont\":{\"family\":\"Roboto\",\"size\":40,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#444\",\"shadowColor\":\"rgba(0,0,0,0.3)\"},\"minValue\":-60,\"highlights\":[{\"from\":-60,\"to\":-40,\"color\":\"#90caf9\"},{\"from\":-40,\"to\":-20,\"color\":\"rgba(144, 202, 249, 0.66)\"},{\"from\":-20,\"to\":0,\"color\":\"rgba(144, 202, 249, 0.33)\"},{\"from\":0,\"to\":20,\"color\":\"rgba(244, 67, 54, 0.2)\"},{\"from\":20,\"to\":40,\"color\":\"rgba(244, 67, 54, 0.4)\"},{\"from\":40,\"to\":60,\"color\":\"rgba(244, 67, 54, 0.6)\"},{\"from\":60,\"to\":80,\"color\":\"rgba(244, 67, 54, 0.8)\"},{\"from\":80,\"to\":100,\"color\":\"#f44336\"}],\"unitTitle\":\"Temperature\",\"units\":\"°C\",\"colorBarProgress\":\"#90caf9\",\"colorBarProgressEnd\":\"#f44336\",\"colorBarStroke\":\"#b0bec5\",\"valueDec\":1},\"title\":\"Temperature gauge - Canvas Gauges\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'Temperature gauge - Canvas Gauges' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'f8d616e4-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'maps', 'google_maps', '{"type":"latest","sizeX":8.5,"sizeY":6,"resources":[],"templateHtml":"","templateCss":".error {\n color: red;\n}\n.tb-labels {\n color: #222;\n font: 12px/1.5 \"Helvetica Neue\", Arial, Helvetica, sans-serif;\n text-align: center;\n width: 100px;\n white-space: nowrap;\n}","controllerScript":"self.onInit = function() {\n self.ctx.map = new TbMapWidget(''google-map'', false, self.ctx);\n}\n\nself.onDataUpdated = function() {\n self.ctx.map.update();\n}\n\nself.onResize = function() {\n self.ctx.map.resize();\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"title\": \"Google Map Configuration\",\n \"type\": \"object\",\n \"properties\": {\n \"gmApiKey\": {\n \"title\": \"Google Maps API Key\",\n \"type\": \"string\"\n },\n \"gmDefaultMapType\": {\n \"title\": \"Default map type\",\n \"type\": \"string\",\n \"default\": \"roadmap\"\n },\n \"defaultZoomLevel\": {\n \"title\": \"Default map zoom level (1 - 20)\",\n \"type\": \"number\"\n },\n \"fitMapBounds\": {\n \"title\": \"Fit map bounds to cover all markers\",\n \"type\": \"boolean\",\n \"default\": true\n },\n \"markersSettings\": {\n \"title\": \"Markers\",\n \"type\": \"array\",\n \"items\": {\n \"title\": \"Marker settings\",\n \"type\": \"object\",\n \"properties\": {\n \"latKeyName\": {\n \"title\": \"Latitude key name\",\n \"type\": \"string\",\n \"default\": \"lat\"\n },\n \"lngKeyName\": {\n \"title\": \"Longitude key name\",\n \"type\": \"string\",\n \"default\": \"lng\"\n }, \n \"showLabel\": {\n \"title\": \"Show label\",\n \"type\": \"boolean\",\n \"default\": true\n }, \n \"label\": {\n \"title\": \"Label\",\n \"type\": \"string\"\n },\n \"tooltipPattern\": {\n \"title\": \"Pattern ( for ex. ''Text ${keyName} units.'' or ''${#} units'' )\",\n \"type\": \"string\",\n \"default\": \"Latitude: ${lat:7}
Longitude: ${lng:7}\"\n },\n \"color\": {\n \"title\": \"Color\",\n \"type\": \"string\"\n },\n \"useColorFunction\": {\n \"title\": \"Use color function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"colorFunction\": {\n \"title\": \"Color function: f(data)\",\n \"type\": \"string\"\n },\n \"markerImage\": {\n \"title\": \"Custom marker image\",\n \"type\": \"string\"\n },\n \"markerImageSize\": {\n \"title\": \"Custom marker image size (px)\",\n \"type\": \"number\",\n \"default\": 34\n },\n \"useMarkerImageFunction\": {\n \"title\": \"Use marker image function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"markerImageFunction\": {\n \"title\": \"Marker image function: f(data, images)\",\n \"type\": \"string\"\n },\n \"markerImages\": {\n \"title\": \"Marker images\",\n \"type\": \"array\",\n \"items\": {\n \"title\": \"Marker image\",\n \"type\": \"string\"\n }\n }\n }\n }\n }\n },\n \"required\": [\n \"gmApiKey\"\n ]\n },\n \"form\": [\n \"gmApiKey\",\n {\n \"key\": \"gmDefaultMapType\",\n \"type\": \"rc-select\",\n \"multiple\": false,\n \"items\": [\n {\n \"value\": \"roadmap\",\n \"label\": \"Roadmap\"\n },\n {\n \"value\": \"satellite\",\n \"label\": \"Satellite\"\n },\n {\n \"value\": \"hybrid\",\n \"label\": \"Hybrid\"\n },\n {\n \"value\": \"terrain\",\n \"label\": \"Terrain\"\n }\n ]\n },\n \"defaultZoomLevel\",\n \"fitMapBounds\",\n {\n \"key\": \"markersSettings\",\n \"items\": [\n \"markersSettings[].latKeyName\",\n \"markersSettings[].lngKeyName\",\n \"markersSettings[].showLabel\",\n \"markersSettings[].label\",\n \"markersSettings[].tooltipPattern\",\n {\n \"key\": \"markersSettings[].color\",\n \"type\": \"color\"\n },\n \"markersSettings[].useColorFunction\",\n {\n \"key\": \"markersSettings[].colorFunction\",\n \"type\": \"javascript\"\n },\n {\n \"key\": \"markersSettings[].markerImage\",\n \"type\": \"image\"\n },\n \"markersSettings[].markerImageSize\",\n \"markersSettings[].useMarkerImageFunction\",\n {\n \"key\": \"markersSettings[].markerImageFunction\",\n \"type\": \"javascript\"\n },\n {\n \"key\": \"markersSettings[].markerImages\",\n \"items\": [\n {\n \"key\": \"markersSettings[].markerImages[]\",\n \"type\": \"image\"\n }\n ]\n }\n ]\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"latitude\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.05427416942713381,\"funcBody\":\"var value = prevValue || 15.833293;\\nif (time % 5000 < 500) {\\n value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"longitude\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.680594833308841,\"funcBody\":\"var value = prevValue || -90.454350;\\nif (time % 5000 < 500) {\\n value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"}]},{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"lat\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.05012157428742059,\"funcBody\":\"var value = prevValue || 14.450463;\\nif (time % 4000 < 500) {\\n value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"lng\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.6742359401617628,\"funcBody\":\"var value = prevValue || -84.845334;\\nif (time % 4000 < 500) {\\n value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"}]},{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"temperature\",\"color\":\"#607d8b\",\"settings\":{},\"_hash\":0.799863043034289,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"gmApiKey\":\"AIzaSyDoEx2kaGz3PxwbI9T7ccTSg5xjdw8Nw8Q\",\"markersSettings\":[{\"label\":\"First point\",\"color\":\"#1e88e5\",\"latKeyName\":\"latitude\",\"lngKeyName\":\"longitude\",\"showLabel\":true,\"tooltipPattern\":\"Latitude: ${latitude:7}
Longitude: ${longitude:7}
Temperature: ${temperature} °C
See advanced settings for details\",\"useColorFunction\":true,\"colorFunction\":\"var temperature = data[''temperature''];\\nif (typeof temperature !== undefined) {\\n var percent = (temperature + 60)/120 * 100;\\n return tinycolor.mix(''blue'', ''red'', amount = percent).toHexString();\\n}\\nreturn ''blue'';\",\"markerImages\":[],\"useMarkerImageFunction\":false},{\"label\":\"Second point\",\"color\":\"#fdd835\",\"latKeyName\":\"lat\",\"lngKeyName\":\"lng\",\"showLabel\":true,\"tooltipPattern\":\"Latitude: ${lat:7}
Longitude: ${lng:7}
Temperature: ${temperature} °C
See advanced settings for details\",\"markerImageSize\":34,\"markerImages\":[\"data:image/png;base64,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\",\"data:image/png;base64,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\",\"data:image/png;base64,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\",\"data:image/png;base64,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\"],\"useMarkerImageFunction\":true,\"markerImageFunction\":\"var res = {\\n url: images[0],\\n size: 40\\n}\\nvar temperature = data[''temperature''];\\nif (typeof temperature !== undefined) {\\n var percent = (temperature + 60)/120;\\n var index = Math.floor(4 * percent);\\n res.url = images[index];\\n}\\nreturn res;\",\"useColorFunction\":false}],\"fitMapBounds\":true,\"gmDefaultMapType\":\"roadmap\"},\"title\":\"Google Maps\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"useDashboardTimewindow\":true,\"showLegend\":false}"}', 'Google Maps' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( 'ff0a8d4c-4610-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'analogue_gauges', 'temperature_radial_gauge_canvas_gauges', '{"type":"latest","sizeX":6,"sizeY":5,"resources":[],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbAnalogueRadialGauge(self.ctx, ''radialGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.getSettingsSchema = function() {\n return TbAnalogueRadialGauge.settingsSchema;\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temperature\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"maxValue\":60,\"startAngle\":67.5,\"ticksAngle\":225,\"showBorder\":true,\"defaultColor\":\"#e65100\",\"needleCircleSize\":7,\"highlights\":[{\"from\":-60,\"to\":-50,\"color\":\"#42a5f5\"},{\"from\":-50,\"to\":-40,\"color\":\"rgba(66, 165, 245, 0.83)\"},{\"from\":-40,\"to\":-30,\"color\":\"rgba(66, 165, 245, 0.66)\"},{\"from\":-30,\"to\":-20,\"color\":\"rgba(66, 165, 245, 0.5)\"},{\"from\":-20,\"to\":-10,\"color\":\"rgba(66, 165, 245, 0.33)\"},{\"from\":-10,\"to\":0,\"color\":\"rgba(66, 165, 245, 0.16)\"},{\"from\":0,\"to\":10,\"color\":\"rgba(229, 115, 115, 0.16)\"},{\"from\":10,\"to\":20,\"color\":\"rgba(229, 115, 115, 0.33)\"},{\"from\":20,\"to\":30,\"color\":\"rgba(229, 115, 115, 0.5)\"},{\"from\":30,\"to\":40,\"color\":\"rgba(229, 115, 115, 0.66)\"},{\"from\":40,\"to\":50,\"color\":\"rgba(229, 115, 115, 0.83)\"},{\"from\":50,\"to\":60,\"color\":\"#e57373\"}],\"showUnitTitle\":true,\"colorPlate\":\"#cfd8dc\",\"colorMajorTicks\":\"#444\",\"colorMinorTicks\":\"#666\",\"minorTicks\":2,\"valueInt\":3,\"valueDec\":1,\"highlightsWidth\":15,\"valueBox\":true,\"animation\":true,\"animationDuration\":1000,\"animationRule\":\"bounce\",\"colorNeedleShadowUp\":\"rgba(2, 255, 255, 0)\",\"colorNeedleShadowDown\":\"rgba(188, 143, 143, 0.78)\",\"units\":\"°C\",\"majorTicksCount\":12,\"numbersFont\":{\"family\":\"Roboto\",\"size\":20,\"style\":\"normal\",\"weight\":\"normal\",\"color\":\"#263238\"},\"titleFont\":{\"family\":\"Roboto\",\"size\":24,\"style\":\"normal\",\"weight\":\"normal\",\"color\":\"#263238\"},\"unitsFont\":{\"family\":\"Roboto\",\"size\":28,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#616161\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"size\":30,\"style\":\"normal\",\"weight\":\"normal\",\"shadowColor\":\"rgba(0, 0, 0, 0.49)\",\"color\":\"#444\"},\"colorValueBoxRect\":\"#888\",\"colorValueBoxRectEnd\":\"#666\",\"colorValueBoxBackground\":\"#babab2\",\"colorValueBoxShadow\":\"rgba(0,0,0,1)\",\"unitTitle\":\"Temperature\",\"minValue\":-60},\"title\":\"Temperature radial gauge - Canvas Gauges\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'Temperature radial gauge - Canvas Gauges' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( '01baee42-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'cards', 'attributes_card', '{"type":"latest","sizeX":7.5,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#container {\n overflow: auto;\n}\n\n.tbDatasource-container {\n margin: 5px;\n padding: 8px;\n}\n\n.tbDatasource-title {\n font-size: 1.200rem;\n font-weight: 500;\n padding-bottom: 10px;\n}\n\n.tbDatasource-table {\n width: 100%;\n box-shadow: 0 0 10px #ccc;\n border-collapse: collapse;\n white-space: nowrap;\n font-size: 1.000rem;\n color: #757575;\n}\n\n.tbDatasource-table td {\n position: relative;\n border-top: 1px solid rgba(0, 0, 0, 0.12);\n border-bottom: 1px solid rgba(0, 0, 0, 0.12);\n padding: 0px 18px;\n box-sizing: border-box;\n}","controllerScript":"self.onInit = function() {\n \n self.ctx.datasourceTitleCells = [];\n self.ctx.valueCells = [];\n self.ctx.labelCells = [];\n \n for (var i=0; i < self.ctx.datasources.length; i++) {\n var tbDatasource = self.ctx.datasources[i];\n\n var datasourceId = ''tbDatasource'' + i;\n self.ctx.$container.append(\n \"
\"\n );\n\n var datasourceContainer = $(''#'' + datasourceId,\n self.ctx.$container);\n\n datasourceContainer.append(\n \"
\" +\n tbDatasource.name + \"
\"\n );\n \n var datasourceTitleCell = $(''.tbDatasource-title'', datasourceContainer);\n self.ctx.datasourceTitleCells.push(datasourceTitleCell);\n \n var tableId = ''table'' + i;\n datasourceContainer.append(\n \"
\"\n );\n var table = $(''#'' + tableId, self.ctx.$container);\n\n for (var a = 0; a < tbDatasource.dataKeys.length; a++) {\n var dataKey = tbDatasource.dataKeys[a];\n var labelCellId = ''labelCell'' + a;\n var cellId = ''cell'' + a;\n table.append(\"\" + dataKey.label +\n \"\");\n var labelCell = $(''#'' + labelCellId, table);\n self.ctx.labelCells.push(labelCell);\n var valueCell = $(''#'' + cellId, table);\n self.ctx.valueCells.push(valueCell);\n }\n } \n \n self.onResize();\n}\n\nself.onDataUpdated = function() {\n for (var i = 0; i < self.ctx.valueCells.length; i++) {\n var cellData = self.ctx.data[i];\n if (cellData && cellData.data && cellData.data.length > 0) {\n var tvPair = cellData.data[cellData.data.length -\n 1];\n var value = tvPair[1];\n self.ctx.valueCells[i].html(value);\n }\n } \n}\n\nself.onResize = function() {\n var datasoirceTitleFontSize = self.ctx.height/8;\n if (self.ctx.width/self.ctx.height <= 1.5) {\n datasoirceTitleFontSize = self.ctx.width/12;\n }\n datasoirceTitleFontSize = Math.min(datasoirceTitleFontSize, 20);\n for (var i = 0; i < self.ctx.datasourceTitleCells.length; i++) {\n self.ctx.datasourceTitleCells[i].css(''font-size'', datasoirceTitleFontSize+''px'');\n }\n var valueFontSize = self.ctx.height/9;\n var labelFontSize = self.ctx.height/9;\n if (self.ctx.width/self.ctx.height <= 1.5) {\n valueFontSize = self.ctx.width/15;\n labelFontSize = self.ctx.width/15;\n }\n valueFontSize = Math.min(valueFontSize, 18);\n labelFontSize = Math.min(labelFontSize, 18);\n\n for (i = 0; i < self.ctx.valueCells; i++) {\n self.ctx.valueCells[i].css(''font-size'', valueFontSize+''px'');\n self.ctx.valueCells[i].css(''height'', valueFontSize*2.5+''px'');\n self.ctx.valueCells[i].css(''padding'', ''0px '' + valueFontSize + ''px'');\n self.ctx.labelCells[i].css(''font-size'', labelFontSize+''px'');\n self.ctx.labelCells[i].css(''height'', labelFontSize*2.5+''px'');\n self.ctx.labelCells[i].css(''padding'', ''0px '' + labelFontSize + ''px'');\n } \n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Random\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Attributes card\"}"}', 'Attributes card' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( '044283a0-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', 'digital_thermometer', '{"type":"latest","sizeX":3,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < -60) {\\n\\tvalue = 60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#000000\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":60,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":1,\"levelColors\":[\"#304ffe\",\"#7e57c2\",\"#ff4081\",\"#d32f2f\"],\"refreshAnimationType\":\"<>\",\"refreshAnimationTime\":700,\"startAnimationType\":\"<>\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":18},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"dashThickness\":1.5,\"decimals\":0,\"minValue\":-60,\"units\":\"°C\",\"gaugeColor\":\"#333333\",\"neonGlowBrightness\":35,\"gaugeType\":\"donut\"},\"title\":\"Digital thermometer\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'Digital thermometer' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( '0758880a-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'gpio_widgets', 'raspberry_pi_gpio_control', '{"type":"rpc","sizeX":6,"sizeY":10.5,"resources":[],"templateHtml":"
\n
\n
\n
\n {{ cell.label }}\n
\n {{cell.pin}}\n \n \n \n \n {{cell.pin}}\n
\n {{ cell.label }}\n
\n
\n \n \n \n
\n
\n
\n {{rpcErrorText}}\n \n
","templateCss":".error {\n font-size: 14px !important;\n color: maroon;/*rgb(250,250,250);*/\n background-color: transparent;\n padding: 6px;\n}\n\n.error span {\n margin: auto;\n}\n\n.gpio-panel {\n padding-top: 10px;\n white-space: nowrap;\n}\n\n.switch-panel {\n margin: 0;\n height: 32px;\n width: 66px;\n min-width: 66px;\n}\n\n.switch-panel md-switch {\n margin: 0;\n width: 36px;\n min-width: 36px;\n}\n\n.switch-panel md-switch > div.md-container {\n margin: 0;\n}\n\n.switch-panel.col-0 md-switch {\n margin-left: 8px;\n margin-right: 4px;\n}\n\n.switch-panel.col-1 md-switch {\n margin-left: 4px;\n margin-right: 8px;\n}\n\n.gpio-row {\n height: 32px;\n}\n\n.pin {\n margin-top: auto;\n margin-bottom: auto;\n color: white;\n font-size: 12px;\n width: 16px;\n min-width: 16px;\n}\n\n.switch-panel.col-0 .pin {\n margin-left: auto;\n padding-left: 2px;\n text-align: right;\n}\n\n.switch-panel.col-1 .pin {\n margin-right: auto;\n \n text-align: left;\n}\n\n.gpio-left-label {\n margin-right: 8px;\n}\n\n.gpio-right-label {\n margin-left: 8px;\n}","controllerScript":"self.onInit = function() {\n \n var i, gpio;\n var scope = self.ctx.$scope;\n var settings = self.ctx.settings;\n scope.gpioList = [];\n for (var g = 0; g < settings.gpioList.length; g++) {\n gpio = settings.gpioList[g];\n scope.gpioList.push(\n {\n row: gpio.row,\n col: gpio.col,\n pin: gpio.pin,\n label: gpio.label,\n enabled: false\n }\n );\n }\n\n scope.requestTimeout = settings.requestTimeout || 1000;\n\n scope.switchPanelBackgroundColor = settings.switchPanelBackgroundColor || tinycolor(''green'').lighten(2).toRgbString();\n\n scope.gpioStatusRequest = {\n method: \"getGpioStatus\",\n paramsBody: \"{}\"\n };\n \n if (settings.gpioStatusRequest) {\n scope.gpioStatusRequest.method = settings.gpioStatusRequest.method || scope.gpioStatusRequest.method;\n scope.gpioStatusRequest.paramsBody = settings.gpioStatusRequest.paramsBody || scope.gpioStatusRequest.paramsBody;\n }\n \n scope.gpioStatusChangeRequest = {\n method: \"setGpioStatus\",\n paramsBody: \"{\\n \\\"pin\\\": \\\"{$pin}\\\",\\n \\\"enabled\\\": \\\"{$enabled}\\\"\\n}\"\n };\n \n if (settings.gpioStatusChangeRequest) {\n scope.gpioStatusChangeRequest.method = settings.gpioStatusChangeRequest.method || scope.gpioStatusChangeRequest.method;\n scope.gpioStatusChangeRequest.paramsBody = settings.gpioStatusChangeRequest.paramsBody || scope.gpioStatusChangeRequest.paramsBody;\n }\n \n scope.parseGpioStatusFunction = \"return body[pin] === true;\";\n \n if (settings.parseGpioStatusFunction && settings.parseGpioStatusFunction.length > 0) {\n scope.parseGpioStatusFunction = settings.parseGpioStatusFunction;\n }\n \n scope.parseGpioStatusFunction = new Function(\"body, pin\", scope.parseGpioStatusFunction);\n \n function requestGpioStatus() {\n self.ctx.controlApi.sendTwoWayCommand(scope.gpioStatusRequest.method, \n scope.gpioStatusRequest.paramsBody, \n scope.requestTimeout)\n .then(\n function success(responseBody) {\n for (var g = 0; g < scope.gpioList.length; g++) {\n var gpio = scope.gpioList[g];\n var enabled = scope.parseGpioStatusFunction.apply(this, [responseBody, gpio.pin]);\n gpio.enabled = enabled; \n }\n }\n );\n }\n \n function changeGpioStatus(gpio) {\n var pin = gpio.pin + '''';\n var enabled = !gpio.enabled;\n enabled = enabled === true ? ''true'' : ''false'';\n var paramsBody = scope.gpioStatusChangeRequest.paramsBody;\n var requestBody = JSON.parse(paramsBody.replace(\"\\\"{$pin}\\\"\", pin).replace(\"\\\"{$enabled}\\\"\", enabled));\n self.ctx.controlApi.sendTwoWayCommand(scope.gpioStatusChangeRequest.method, \n requestBody, scope.requestTimeout)\n .then(\n function success(responseBody) {\n var enabled = scope.parseGpioStatusFunction.apply(this, [responseBody, gpio.pin]);\n gpio.enabled = enabled;\n }\n );\n }\n \n scope.gpioCells = {};\n var rowCount = 0;\n for (i = 0; i < scope.gpioList.length; i++) {\n gpio = scope.gpioList[i];\n scope.gpioCells[gpio.row+''_''+gpio.col] = gpio;\n rowCount = Math.max(rowCount, gpio.row+1);\n }\n \n scope.prefferedRowHeight = 32;\n scope.rows = [];\n for (i = 0; i < rowCount; i++) {\n var row = [];\n for (var c =0; c<2;c++) {\n if (scope.gpioCells[i+''_''+c]) {\n row[c] = scope.gpioCells[i+''_''+c];\n } else {\n row[c] = null;\n }\n }\n scope.rows.push(row);\n }\n\n scope.gpioClick = function($event, gpio) {\n changeGpioStatus(gpio);\n };\n\n requestGpioStatus(); \n \n self.onResize();\n}\n\nself.onResize = function() {\n var scope = self.ctx.$scope;\n var rowCount = scope.rows.length;\n var prefferedRowHeight = (self.ctx.height - 35)/rowCount;\n prefferedRowHeight = Math.min(32, prefferedRowHeight);\n prefferedRowHeight = Math.max(12, prefferedRowHeight);\n scope.prefferedRowHeight = prefferedRowHeight;\n var ratio = prefferedRowHeight/32;\n var switches = $(''md-switch'', self.ctx.$container);\n switches.css(''height'', 30*ratio+''px'');\n switches.css(''width'', 36*ratio+''px'');\n switches.css(''min-width'', 36*ratio+''px'');\n $(''.md-container'', switches).css(''height'', 24*ratio+''px'');\n $(''.md-container'', switches).css(''width'', 36*ratio+''px'');\n var bars = $(''.md-bar'', self.ctx.$container);\n bars.css(''height'', 14*ratio+''px'');\n bars.css(''width'', 34*ratio+''px'');\n var thumbs = $(''.md-thumb'', self.ctx.$container);\n thumbs.css(''height'', 20*ratio+''px'');\n thumbs.css(''width'', 20*ratio+''px'');\n \n var leftLabels = $(''.gpio-left-label'', self.ctx.$container);\n leftLabels.css(''font-size'', 16*ratio+''px'');\n var rightLabels = $(''.gpio-right-label'', self.ctx.$container);\n rightLabels.css(''font-size'', 16*ratio+''px'');\n var pins = $(''.pin'', self.ctx.$container);\n var pinsFontSize = Math.max(9, 12*ratio);\n pins.css(''font-size'', pinsFontSize+''px''); \n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"Settings\",\n \"properties\": {\n \"gpioList\": {\n \"title\": \"Gpio switches\",\n \"type\": \"array\",\n \"minItems\" : 1,\n \"items\": {\n \"title\": \"Gpio switch\",\n \"type\": \"object\",\n \"properties\": {\n \"pin\": {\n \"title\": \"Pin\",\n \"type\": \"number\"\n },\n \"label\": {\n \"title\": \"Label\",\n \"type\": \"string\"\n },\n \"row\": {\n \"title\": \"Row\",\n \"type\": \"number\"\n },\n \"col\": {\n \"title\": \"Column\",\n \"type\": \"number\"\n }\n },\n \"required\": [\"pin\", \"label\", \"row\", \"col\"]\n }\n },\n \"requestTimeout\": {\n \"title\": \"RPC request timeout\",\n \"type\": \"number\",\n \"default\": 500\n },\n \"switchPanelBackgroundColor\": {\n \"title\": \"Switches panel background color\",\n \"type\": \"string\",\n \"default\": \"#008a00\"\n },\n \"gpioStatusRequest\": {\n \"title\": \"GPIO status request\",\n \"type\": \"object\",\n \"properties\": {\n \"method\": {\n \"title\": \"Method name\",\n \"type\": \"string\",\n \"default\": \"getGpioStatus\"\n },\n \"paramsBody\": {\n \"title\": \"Method body\",\n \"type\": \"string\",\n \"default\": \"{}\"\n }\n },\n \"required\": [\"method\", \"paramsBody\"]\n },\n \"gpioStatusChangeRequest\": {\n \"title\": \"GPIO status change request\",\n \"type\": \"object\",\n \"properties\": {\n \"method\": {\n \"title\": \"Method name\",\n \"type\": \"string\",\n \"default\": \"setGpioStatus\"\n },\n \"paramsBody\": {\n \"title\": \"Method body\",\n \"type\": \"string\",\n \"default\": \"{\\n \\\"pin\\\": \\\"{$pin}\\\",\\n \\\"enabled\\\": \\\"{$enabled}\\\"\\n}\"\n }\n },\n \"required\": [\"method\", \"paramsBody\"]\n },\n \"parseGpioStatusFunction\": {\n \"title\": \"Parse gpio status function\",\n \"type\": \"string\",\n \"default\": \"return body[pin] === true;\"\n } \n },\n \"required\": [\"gpioList\", \n \"requestTimeout\",\n \"switchPanelBackgroundColor\",\n \"gpioStatusRequest\",\n \"gpioStatusChangeRequest\",\n \"parseGpioStatusFunction\"]\n },\n \"form\": [\n \"gpioList\",\n \"requestTimeout\",\n {\n \"key\": \"switchPanelBackgroundColor\",\n \"type\": \"color\"\n },\n {\n \"key\": \"gpioStatusRequest\",\n \"items\": [\n \"gpioStatusRequest.method\",\n {\n \"key\": \"gpioStatusRequest.paramsBody\",\n \"type\": \"json\"\n }\n ]\n },\n {\n \"key\": \"gpioStatusChangeRequest\",\n \"items\": [\n \"gpioStatusChangeRequest.method\",\n {\n \"key\": \"gpioStatusChangeRequest.paramsBody\",\n \"type\": \"json\"\n }\n ]\n },\n {\n \"key\": \"parseGpioStatusFunction\",\n \"type\": \"javascript\"\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"targetDeviceAliases\":[],\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"parseGpioStatusFunction\":\"return body[pin] === true;\",\"gpioStatusChangeRequest\":{\"method\":\"setGpioStatus\",\"paramsBody\":\"{\\n \\\"pin\\\": \\\"{$pin}\\\",\\n \\\"enabled\\\": \\\"{$enabled}\\\"\\n}\"},\"requestTimeout\":500,\"switchPanelBackgroundColor\":\"#008a00\",\"gpioStatusRequest\":{\"method\":\"getGpioStatus\",\"paramsBody\":\"{}\"},\"gpioList\":[{\"pin\":7,\"label\":\"GPIO 4 (GPCLK0)\",\"row\":3,\"col\":0,\"_uniqueKey\":0},{\"pin\":11,\"label\":\"GPIO 17\",\"row\":5,\"col\":0,\"_uniqueKey\":1},{\"pin\":12,\"label\":\"GPIO 18\",\"row\":5,\"col\":1,\"_uniqueKey\":2},{\"_uniqueKey\":3,\"pin\":13,\"label\":\"GPIO 27\",\"row\":6,\"col\":0},{\"_uniqueKey\":4,\"pin\":15,\"label\":\"GPIO 22\",\"row\":7,\"col\":0},{\"_uniqueKey\":5,\"pin\":16,\"label\":\"GPIO 23\",\"row\":7,\"col\":1},{\"_uniqueKey\":6,\"pin\":18,\"label\":\"GPIO 24\",\"row\":8,\"col\":1},{\"_uniqueKey\":7,\"pin\":22,\"label\":\"GPIO 25\",\"row\":10,\"col\":1},{\"_uniqueKey\":8,\"pin\":29,\"label\":\"GPIO 5\",\"row\":14,\"col\":0},{\"_uniqueKey\":9,\"pin\":31,\"label\":\"GPIO 6\",\"row\":15,\"col\":0},{\"_uniqueKey\":10,\"pin\":32,\"label\":\"GPIO 12\",\"row\":15,\"col\":1},{\"_uniqueKey\":11,\"pin\":33,\"label\":\"GPIO 13\",\"row\":16,\"col\":0},{\"_uniqueKey\":12,\"pin\":35,\"label\":\"GPIO 19\",\"row\":17,\"col\":0},{\"_uniqueKey\":13,\"pin\":36,\"label\":\"GPIO 16\",\"row\":17,\"col\":1},{\"_uniqueKey\":14,\"pin\":37,\"label\":\"GPIO 26\",\"row\":18,\"col\":0},{\"_uniqueKey\":15,\"pin\":38,\"label\":\"GPIO 20\",\"row\":18,\"col\":1},{\"_uniqueKey\":16,\"pin\":40,\"label\":\"GPIO 21\",\"row\":19,\"col\":1}]},\"title\":\"Raspberry Pi GPIO Control\"}"}', 'Raspberry Pi GPIO Control' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( '09d408f2-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'gpio_widgets', 'basic_gpio_control', '{"type":"rpc","sizeX":4,"sizeY":2,"resources":[],"templateHtml":"
\n
\n
\n
\n {{ cell.label }}\n
\n {{cell.pin}}\n \n \n \n \n {{cell.pin}}\n
\n {{ cell.label }}\n
\n
\n \n \n \n
\n
\n
\n {{rpcErrorText}}\n \n
","templateCss":".error {\n font-size: 14px !important;\n color: maroon;/*rgb(250,250,250);*/\n background-color: transparent;\n padding: 6px;\n}\n\n.error span {\n margin: auto;\n}\n\n.gpio-panel {\n padding-top: 10px;\n white-space: nowrap;\n}\n\n.switch-panel {\n margin: 0;\n height: 32px;\n width: 66px;\n min-width: 66px;\n}\n\n.switch-panel md-switch {\n margin: 0;\n width: 36px;\n min-width: 36px;\n}\n\n.switch-panel md-switch > div.md-container {\n margin: 0;\n}\n\n.switch-panel.col-0 md-switch {\n padding-left: 8px;\n padding-right: 4px;\n}\n\n.switch-panel.col-1 md-switch {\n padding-left: 4px;\n padding-right: 8px;\n}\n\n.gpio-row {\n height: 32px;\n}\n\n.pin {\n margin-top: auto;\n margin-bottom: auto;\n color: white;\n font-size: 12px;\n width: 16px;\n min-width: 16px;\n}\n\n.switch-panel.col-0 .pin {\n margin-left: auto;\n padding-left: 2px;\n text-align: right;\n}\n\n.switch-panel.col-1 .pin {\n margin-right: auto;\n \n text-align: left;\n}\n\n.gpio-left-label {\n margin-right: 8px;\n}\n\n.gpio-right-label {\n margin-left: 8px;\n}","controllerScript":"self.onInit = function() {\n \n var i, gpio;\n var scope = self.ctx.$scope;\n var settings = self.ctx.settings;\n scope.gpioList = [];\n for (var g = 0; g < settings.gpioList.length; g++) {\n gpio = settings.gpioList[g];\n scope.gpioList.push(\n {\n row: gpio.row,\n col: gpio.col,\n pin: gpio.pin,\n label: gpio.label,\n enabled: false\n }\n );\n }\n\n scope.requestTimeout = settings.requestTimeout || 1000;\n\n scope.switchPanelBackgroundColor = settings.switchPanelBackgroundColor || tinycolor(''green'').lighten(2).toRgbString();\n\n scope.gpioStatusRequest = {\n method: \"getGpioStatus\",\n paramsBody: \"{}\"\n };\n \n if (settings.gpioStatusRequest) {\n scope.gpioStatusRequest.method = settings.gpioStatusRequest.method || scope.gpioStatusRequest.method;\n scope.gpioStatusRequest.paramsBody = settings.gpioStatusRequest.paramsBody || scope.gpioStatusRequest.paramsBody;\n }\n \n scope.gpioStatusChangeRequest = {\n method: \"setGpioStatus\",\n paramsBody: \"{\\n \\\"pin\\\": \\\"{$pin}\\\",\\n \\\"enabled\\\": \\\"{$enabled}\\\"\\n}\"\n };\n \n if (settings.gpioStatusChangeRequest) {\n scope.gpioStatusChangeRequest.method = settings.gpioStatusChangeRequest.method || scope.gpioStatusChangeRequest.method;\n scope.gpioStatusChangeRequest.paramsBody = settings.gpioStatusChangeRequest.paramsBody || scope.gpioStatusChangeRequest.paramsBody;\n }\n \n scope.parseGpioStatusFunction = \"return body[pin] === true;\";\n \n if (settings.parseGpioStatusFunction && settings.parseGpioStatusFunction.length > 0) {\n scope.parseGpioStatusFunction = settings.parseGpioStatusFunction;\n }\n \n scope.parseGpioStatusFunction = new Function(\"body, pin\", scope.parseGpioStatusFunction);\n \n function requestGpioStatus() {\n self.ctx.controlApi.sendTwoWayCommand(scope.gpioStatusRequest.method, \n scope.gpioStatusRequest.paramsBody, \n scope.requestTimeout)\n .then(\n function success(responseBody) {\n for (var g = 0; g < scope.gpioList.length; g++) {\n var gpio = scope.gpioList[g];\n var enabled = scope.parseGpioStatusFunction.apply(this, [responseBody, gpio.pin]);\n gpio.enabled = enabled; \n }\n }\n );\n }\n \n function changeGpioStatus(gpio) {\n var pin = gpio.pin + '''';\n var enabled = !gpio.enabled;\n enabled = enabled === true ? ''true'' : ''false'';\n var paramsBody = scope.gpioStatusChangeRequest.paramsBody;\n var requestBody = JSON.parse(paramsBody.replace(\"\\\"{$pin}\\\"\", pin).replace(\"\\\"{$enabled}\\\"\", enabled));\n self.ctx.controlApi.sendTwoWayCommand(scope.gpioStatusChangeRequest.method, \n requestBody, scope.requestTimeout)\n .then(\n function success(responseBody) {\n var enabled = scope.parseGpioStatusFunction.apply(this, [responseBody, gpio.pin]);\n gpio.enabled = enabled;\n }\n );\n }\n \n scope.gpioCells = {};\n var rowCount = 0;\n for (i = 0; i < scope.gpioList.length; i++) {\n gpio = scope.gpioList[i];\n scope.gpioCells[gpio.row+''_''+gpio.col] = gpio;\n rowCount = Math.max(rowCount, gpio.row+1);\n }\n \n scope.prefferedRowHeight = 32;\n scope.rows = [];\n for (i = 0; i < rowCount; i++) {\n var row = [];\n for (var c =0; c<2;c++) {\n if (scope.gpioCells[i+''_''+c]) {\n row[c] = scope.gpioCells[i+''_''+c];\n } else {\n row[c] = null;\n }\n }\n scope.rows.push(row);\n }\n\n scope.gpioClick = function($event, gpio) {\n changeGpioStatus(gpio);\n };\n\n requestGpioStatus(); \n \n self.onResize();\n}\n\nself.onResize = function() {\n var scope = self.ctx.$scope;\n var rowCount = scope.rows.length;\n var prefferedRowHeight = (self.ctx.height - 35)/rowCount;\n prefferedRowHeight = Math.min(32, prefferedRowHeight);\n prefferedRowHeight = Math.max(12, prefferedRowHeight);\n scope.prefferedRowHeight = prefferedRowHeight;\n var ratio = prefferedRowHeight/32;\n var switches = $(''md-switch'', self.ctx.$container);\n switches.css(''height'', 30*ratio+''px'');\n switches.css(''width'', 36*ratio+''px'');\n switches.css(''min-width'', 36*ratio+''px'');\n $(''.md-container'', switches).css(''height'', 24*ratio+''px'');\n $(''.md-container'', switches).css(''width'', 36*ratio+''px'');\n var bars = $(''.md-bar'', self.ctx.$container);\n bars.css(''height'', 14*ratio+''px'');\n bars.css(''width'', 34*ratio+''px'');\n var thumbs = $(''.md-thumb'', self.ctx.$container);\n thumbs.css(''height'', 20*ratio+''px'');\n thumbs.css(''width'', 20*ratio+''px'');\n \n var leftLabels = $(''.gpio-left-label'', self.ctx.$container);\n leftLabels.css(''font-size'', 16*ratio+''px'');\n var rightLabels = $(''.gpio-right-label'', self.ctx.$container);\n rightLabels.css(''font-size'', 16*ratio+''px'');\n var pins = $(''.pin'', self.ctx.$container);\n var pinsFontSize = Math.max(9, 12*ratio);\n pins.css(''font-size'', pinsFontSize+''px''); \n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"Settings\",\n \"properties\": {\n \"gpioList\": {\n \"title\": \"Gpio switches\",\n \"type\": \"array\",\n \"minItems\" : 1,\n \"items\": {\n \"title\": \"Gpio switch\",\n \"type\": \"object\",\n \"properties\": {\n \"pin\": {\n \"title\": \"Pin\",\n \"type\": \"number\"\n },\n \"label\": {\n \"title\": \"Label\",\n \"type\": \"string\"\n },\n \"row\": {\n \"title\": \"Row\",\n \"type\": \"number\"\n },\n \"col\": {\n \"title\": \"Column\",\n \"type\": \"number\"\n }\n },\n \"required\": [\"pin\", \"label\", \"row\", \"col\"]\n }\n },\n \"requestTimeout\": {\n \"title\": \"RPC request timeout\",\n \"type\": \"number\",\n \"default\": 500\n },\n \"switchPanelBackgroundColor\": {\n \"title\": \"Switches panel background color\",\n \"type\": \"string\",\n \"default\": \"#008a00\"\n },\n \"gpioStatusRequest\": {\n \"title\": \"GPIO status request\",\n \"type\": \"object\",\n \"properties\": {\n \"method\": {\n \"title\": \"Method name\",\n \"type\": \"string\",\n \"default\": \"getGpioStatus\"\n },\n \"paramsBody\": {\n \"title\": \"Method body\",\n \"type\": \"string\",\n \"default\": \"{}\"\n }\n },\n \"required\": [\"method\", \"paramsBody\"]\n },\n \"gpioStatusChangeRequest\": {\n \"title\": \"GPIO status change request\",\n \"type\": \"object\",\n \"properties\": {\n \"method\": {\n \"title\": \"Method name\",\n \"type\": \"string\",\n \"default\": \"setGpioStatus\"\n },\n \"paramsBody\": {\n \"title\": \"Method body\",\n \"type\": \"string\",\n \"default\": \"{\\n \\\"pin\\\": \\\"{$pin}\\\",\\n \\\"enabled\\\": \\\"{$enabled}\\\"\\n}\"\n }\n },\n \"required\": [\"method\", \"paramsBody\"]\n },\n \"parseGpioStatusFunction\": {\n \"title\": \"Parse gpio status function\",\n \"type\": \"string\",\n \"default\": \"return body[pin] === true;\"\n } \n },\n \"required\": [\"gpioList\", \n \"requestTimeout\",\n \"switchPanelBackgroundColor\",\n \"gpioStatusRequest\",\n \"gpioStatusChangeRequest\",\n \"parseGpioStatusFunction\"]\n },\n \"form\": [\n \"gpioList\",\n \"requestTimeout\",\n {\n \"key\": \"switchPanelBackgroundColor\",\n \"type\": \"color\"\n },\n {\n \"key\": \"gpioStatusRequest\",\n \"items\": [\n \"gpioStatusRequest.method\",\n {\n \"key\": \"gpioStatusRequest.paramsBody\",\n \"type\": \"json\"\n }\n ]\n },\n {\n \"key\": \"gpioStatusChangeRequest\",\n \"items\": [\n \"gpioStatusChangeRequest.method\",\n {\n \"key\": \"gpioStatusChangeRequest.paramsBody\",\n \"type\": \"json\"\n }\n ]\n },\n {\n \"key\": \"parseGpioStatusFunction\",\n \"type\": \"javascript\"\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"targetDeviceAliases\":[],\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"parseGpioStatusFunction\":\"return body[pin] === true;\",\"gpioStatusChangeRequest\":{\"method\":\"setGpioStatus\",\"paramsBody\":\"{\\n \\\"pin\\\": \\\"{$pin}\\\",\\n \\\"enabled\\\": \\\"{$enabled}\\\"\\n}\"},\"requestTimeout\":500,\"switchPanelBackgroundColor\":\"#b71c1c\",\"gpioStatusRequest\":{\"method\":\"getGpioStatus\",\"paramsBody\":\"{}\"},\"gpioList\":[{\"pin\":1,\"label\":\"GPIO 1\",\"row\":0,\"col\":0,\"_uniqueKey\":0},{\"pin\":2,\"label\":\"GPIO 2\",\"row\":0,\"col\":1,\"_uniqueKey\":1},{\"pin\":3,\"label\":\"GPIO 3\",\"row\":1,\"col\":0,\"_uniqueKey\":2}]},\"title\":\"Basic GPIO Control\"}"}', 'Basic GPIO Control' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( '0d10aca0-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', 'horizontal_bar_justgage', '{"type":"latest","sizeX":7,"sizeY":3,"resources":[],"templateHtml":"\n","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#999999\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Roboto\",\"style\":\"normal\",\"weight\":\"500\",\"size\":18,\"color\":\"#666666\"},\"minMaxFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#666666\"},\"neonGlowBrightness\":0,\"decimals\":0,\"dashThickness\":0,\"gaugeColor\":\"#eeeeee\",\"showTitle\":true,\"gaugeType\":\"horizontalBar\"},\"title\":\"Horizontal bar - justGage\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'Horizontal bar - justGage' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( '10500a0a-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', 'gauge_justgage', '{"type":"latest","sizeX":4,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#999999\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Roboto\",\"style\":\"normal\",\"weight\":\"500\",\"size\":36,\"color\":\"#666666\"},\"minMaxFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#666666\"},\"neonGlowBrightness\":0,\"decimals\":0,\"dashThickness\":0,\"gaugeColor\":\"#eeeeee\",\"showTitle\":true,\"gaugeType\":\"arc\"},\"title\":\"Gauge - justGage\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'Gauge - justGage' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( '13820124-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'digital_gauges', 'lcd_gauge', '{"type":"latest","sizeX":5,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#gauge {\n text-align: center;\n /* margin-left: -100px;\n margin-right: -100px;*/\n /*margin-top: -50px;*/\n \n}\n","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbCanvasDigitalGauge(self.ctx, ''digitalGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.getSettingsSchema = function() {\n return TbCanvasDigitalGauge.settingsSchema;\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Speed\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 180) {\\n\\tvalue = 180;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#babab2\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":180,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\"linear\",\"refreshAnimationTime\":700,\"startAnimationType\":\"linear\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"Roboto\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"Roboto\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":32},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"neonGlowBrightness\":0,\"dashThickness\":1.5,\"decimals\":0,\"unitTitle\":\"MPH\",\"showUnitTitle\":true,\"defaultColor\":\"#444444\",\"gaugeType\":\"arc\"},\"title\":\"LCD gauge\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'LCD gauge' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( '166c022c-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'maps', 'openstreetmap', '{"type":"latest","sizeX":8.5,"sizeY":6,"resources":[],"templateHtml":"","templateCss":".leaflet-zoom-box {\n\tz-index: 9;\n}\n\n.leaflet-pane { z-index: 4; }\n\n.leaflet-tile-pane { z-index: 2; }\n.leaflet-overlay-pane { z-index: 4; }\n.leaflet-shadow-pane { z-index: 5; }\n.leaflet-marker-pane { z-index: 6; }\n.leaflet-tooltip-pane { z-index: 7; }\n.leaflet-popup-pane { z-index: 8; }\n\n.leaflet-map-pane canvas { z-index: 1; }\n.leaflet-map-pane svg { z-index: 2; }\n\n.leaflet-control {\n\tz-index: 9;\n}\n.leaflet-top,\n.leaflet-bottom {\n\tz-index: 11;\n}\n\n.tb-marker-label {\n border: none;\n background: none;\n box-shadow: none;\n}\n\n.tb-marker-label:before {\n border: none;\n background: none;\n}\n","controllerScript":"self.onInit = function() {\n self.ctx.map = new TbMapWidget(''openstreet-map'', false, self.ctx);\n}\n\nself.onDataUpdated = function() {\n self.ctx.map.update();\n}\n\nself.onResize = function() {\n self.ctx.map.resize();\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{\n \"schema\": {\n \"title\": \"Google Map Configuration\",\n \"type\": \"object\",\n \"properties\": {\n \"defaultZoomLevel\": {\n \"title\": \"Default map zoom level (1 - 20)\",\n \"type\": \"number\"\n },\n \"fitMapBounds\": {\n \"title\": \"Fit map bounds to cover all markers\",\n \"type\": \"boolean\",\n \"default\": true\n },\n \"markersSettings\": {\n \"title\": \"Markers\",\n \"type\": \"array\",\n \"items\": {\n \"title\": \"Marker settings\",\n \"type\": \"object\",\n \"properties\": {\n \"latKeyName\": {\n \"title\": \"Latitude key name\",\n \"type\": \"string\",\n \"default\": \"lat\"\n },\n \"lngKeyName\": {\n \"title\": \"Longitude key name\",\n \"type\": \"string\",\n \"default\": \"lng\"\n }, \n \"showLabel\": {\n \"title\": \"Show label\",\n \"type\": \"boolean\",\n \"default\": true\n }, \n \"label\": {\n \"title\": \"Label\",\n \"type\": \"string\"\n },\n \"tooltipPattern\": {\n \"title\": \"Pattern ( for ex. ''Text ${keyName} units.'' or ''${#} units'' )\",\n \"type\": \"string\",\n \"default\": \"Latitude: ${lat:7}
Longitude: ${lng:7}\"\n },\n \"color\": {\n \"title\": \"Color\",\n \"type\": \"string\"\n },\n \"useColorFunction\": {\n \"title\": \"Use color function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"colorFunction\": {\n \"title\": \"Color function: f(data)\",\n \"type\": \"string\"\n },\n \"markerImage\": {\n \"title\": \"Custom marker image\",\n \"type\": \"string\"\n },\n \"markerImageSize\": {\n \"title\": \"Custom marker image size (px)\",\n \"type\": \"number\",\n \"default\": 34\n },\n \"useMarkerImageFunction\": {\n \"title\": \"Use marker image function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"markerImageFunction\": {\n \"title\": \"Marker image function: f(data, images)\",\n \"type\": \"string\"\n },\n \"markerImages\": {\n \"title\": \"Marker images\",\n \"type\": \"array\",\n \"items\": {\n \"title\": \"Marker image\",\n \"type\": \"string\"\n }\n }\n }\n }\n }\n },\n \"required\": [\n ]\n },\n \"form\": [\n \"defaultZoomLevel\",\n \"fitMapBounds\",\n {\n \"key\": \"markersSettings\",\n \"items\": [\n \"markersSettings[].latKeyName\",\n \"markersSettings[].lngKeyName\",\n \"markersSettings[].showLabel\",\n \"markersSettings[].label\",\n \"markersSettings[].tooltipPattern\",\n {\n \"key\": \"markersSettings[].color\",\n \"type\": \"color\"\n },\n \"markersSettings[].useColorFunction\",\n {\n \"key\": \"markersSettings[].colorFunction\",\n \"type\": \"javascript\"\n },\n {\n \"key\": \"markersSettings[].markerImage\",\n \"type\": \"image\"\n },\n \"markersSettings[].markerImageSize\",\n \"markersSettings[].useMarkerImageFunction\",\n {\n \"key\": \"markersSettings[].markerImageFunction\",\n \"type\": \"javascript\"\n },\n {\n \"key\": \"markersSettings[].markerImages\",\n \"items\": [\n {\n \"key\": \"markersSettings[].markerImages[]\",\n \"type\": \"image\"\n }\n ]\n }\n ]\n }\n ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"latitude\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.05427416942713381,\"funcBody\":\"var value = prevValue || 15.833293;\\nif (time % 5000 < 500) {\\n value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"longitude\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.680594833308841,\"funcBody\":\"var value = prevValue || -90.454350;\\nif (time % 5000 < 500) {\\n value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"}]},{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"lat\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.05012157428742059,\"funcBody\":\"var value = prevValue || 14.450463;\\nif (time % 4000 < 500) {\\n value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"lng\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.6742359401617628,\"funcBody\":\"var value = prevValue || -84.845334;\\nif (time % 4000 < 500) {\\n value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"}]},{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"temperature\",\"color\":\"#607d8b\",\"settings\":{},\"_hash\":0.21553274887887564,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"markersSettings\":[{\"label\":\"First point\",\"color\":\"#1e88e5\",\"latKeyName\":\"latitude\",\"lngKeyName\":\"longitude\",\"showLabel\":true,\"tooltipPattern\":\"Latitude: ${latitude:7}
Longitude: ${longitude:7}
Temperature: ${temperature} °C
See advanced settings for details\",\"useColorFunction\":true,\"colorFunction\":\"var temperature = data[''temperature''];\\nif (typeof temperature !== undefined) {\\n var percent = (temperature + 60)/120 * 100;\\n return tinycolor.mix(''blue'', ''red'', amount = percent).toHexString();\\n}\\nreturn ''blue'';\"},{\"label\":\"Second point\",\"color\":\"#fdd835\",\"latKeyName\":\"lat\",\"lngKeyName\":\"lng\",\"showLabel\":true,\"tooltipPattern\":\"Latitude: ${lat:7}
Longitude: ${lng:7}
Temperature: ${temperature} °C
See advanced settings for details\",\"markerImageSize\":34,\"useMarkerImageFunction\":true,\"markerImages\":[\"data:image/svg+xml;base64,<svg id="svg6934" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="210.87mm" width="49.966mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 177.04375 747.16249" xmlns:dc="http://purl.org/dc/elements/1.1/">
 <defs id="defs6936">
  <linearGradient id="linearGradient4707" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 -717.77 -717.77 0 708.18 2168)">
   <stop id="stop4709" stop-color="#84d7f5" offset="0"/>
   <stop id="stop4711" stop-color="#6a99cd" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient4689" gradientUnits="userSpaceOnUse" gradientTransform="matrix(456.22 0 0 -456.22 480.07 3494.3)">
   <stop id="stop4691" stop-color="#cac9c8" offset="0"/>
   <stop id="stop4693" stop-color="#f6f6f6" offset=".75269"/>
   <stop id="stop4695" stop-color="#d4d3d2" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient4669" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1345.5 0 0 -1345.5 35.427 3065.9)">
   <stop id="stop4671" stop-color="#b3b3b2" offset="0"/>
   <stop id="stop4673" stop-color="#b3b3b2" offset=".1"/>
   <stop id="stop4675" stop-color="#feffff" offset=".24731"/>
   <stop id="stop4677" stop-color="#a3a3a1" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient4591" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 -717.77 -717.77 0 708.18 2168)">
   <stop id="stop4593" stop-color="#5fc7f3" offset="0"/>
   <stop id="stop4595" stop-color="#2752a6" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient4573" gradientUnits="userSpaceOnUse" gradientTransform="matrix(456.22 0 0 -456.22 480.07 3494.3)">
   <stop id="stop4575" stop-color="#a3a3a1" offset="0"/>
   <stop id="stop4577" stop-color="#ececec" offset=".75269"/>
   <stop id="stop4579" stop-color="#b3b3b2" offset="1"/>
  </linearGradient>
  <clipPath id="clipPath6097-3" clipPathUnits="userSpaceOnUse">
   <path id="path6099-1" clip-rule="evenodd" d="m382.32 190.03c0 48.239 145.89 87.391 325.89 87.391 179.91 0 325.8-39.152 325.8-87.391 0-48.332-145.89-87.48-325.8-87.48-180 0-325.89 39.148-325.89 87.48"/>
  </clipPath>
  <clipPath id="clipPath4703-4" clipPathUnits="userSpaceOnUse">
   <path id="path4705-9" d="m585.29 1531.7c-30.465 0-55.16 24.69-55.16 55.16v528.52c28.437 31.18 66.992 53.01 110.32 60.14v-588.66c0-30.47-24.695-55.16-55.16-55.16"/>
  </clipPath>
  <clipPath id="clipPath4685-6" clipPathUnits="userSpaceOnUse">
   <path id="path4687-8" d="m530.13 2115.4v3574.2c0 30.46 24.695 55.16 55.16 55.16s55.16-24.7 55.16-55.16v-3514c-43.328-7.13-81.883-28.96-110.32-60.14"/>
  </clipPath>
  <clipPath id="clipPath4665-6" clipPathUnits="userSpaceOnUse">
   <path id="path4667-4" d="m744.9 5941.9h-73.442c-154.37 0-279.96-125.59-279.96-279.96v-4205.5c-218.11-116.2-356.07-343.2-356.07-593.65-0.004-370.96 301.79-672.75 672.75-672.75 370.95 0 672.74 301.79 672.74 672.75 0 250.48-137.96 477.48-356.07 593.7v4205.5c0 154.37-125.59 279.96-279.96 279.96m0-88.58c105.26 0 191.39-86.12 191.39-191.38v-4261.2c209.29-88.85 356.07-296.25 356.07-537.94 0-322.63-261.54-584.18-584.17-584.18s-584.18 261.55-584.18 584.18c0 241.69 146.79 449.09 356.07 537.94v4261.2c0 105.26 86.125 191.38 191.39 191.38h73.442"/>
  </clipPath>
  <clipPath id="clipPath4651-8" clipPathUnits="userSpaceOnUse">
   <path id="path4653-7" d="m708.18 955.89c-135.48 0-252.59 49.869-308.14 122.24-22.008 28.67-34.359 60.88-34.359 94.91 0 119.92 153.34 217.14 342.5 217.14 164.4 0 301.74-73.44 334.88-171.39 4.98-14.75 7.61-30.06 7.61-45.75 0-53.92-30.99-103.24-82.295-141.21-62.812-46.478-156.09-75.939-260.2-75.939"/>
  </clipPath>
  <clipPath id="clipPath4635-1" clipPathUnits="userSpaceOnUse">
   <path id="path4637-7" d="m968.38 1031.8c51.305 37.97 82.295 87.29 82.295 141.21v-0.72c-0.28-53.63-31.21-102.69-82.295-140.49m-568.34 46.3c-22.008 28.67-34.359 60.88-34.359 94.91 0-34.03 12.351-66.24 34.359-94.91m650.63 94.91c0 15.69-2.63 31-7.61 45.75 4.91-14.53 7.53-29.6 7.61-45.04v-0.71"/>
  </clipPath>
  <radialGradient id="radialGradient4639-2" gradientUnits="userSpaceOnUse" cy="0" cx="0" gradientTransform="matrix(584.18 0 0 -584.18 708.18 862.75)" r="1">
   <stop id="stop4641-7" stop-color="#5fc7f3" offset="0"/>
   <stop id="stop4643-2" stop-color="#2752a6" offset="1"/>
  </radialGradient>
  <clipPath id="clipPath4619-2" clipPathUnits="userSpaceOnUse">
   <path id="path4621-6" d="m1050.7 1172.3v0.72 0.71-0.71-0.72"/>
  </clipPath>
  <clipPath id="clipPath4603-1" clipPathUnits="userSpaceOnUse">
   <path id="path4605-5" d="m1292.4 862.75c0-322.64-261.54-584.18-584.17-584.18s-584.18 261.54-584.18 584.18c0 322.63 261.55 584.18 584.18 584.18s584.17-261.55 584.17-584.18"/>
  </clipPath>
  <clipPath id="clipPath4587-0" clipPathUnits="userSpaceOnUse">
   <path id="path4589-9" d="m480.07 1400.7v585.95c0 49.45 19 94.67 50.067 128.72v-528.52c0-30.47 24.695-55.16 55.16-55.16s55.16 24.69 55.16 55.16v588.66c10.098 1.67 20.453 2.53 31.004 2.53h73.438c105.26 0 191.39-86.12 191.39-191.39v-585.93c-70.082 29.76-147.17 46.22-228.1 46.22-80.934 0-158.03-16.46-228.11-46.22"/>
  </clipPath>
  <clipPath id="clipPath4569-7" clipPathUnits="userSpaceOnUse">
   <path id="path4571-1" d="m936.28 1986.6c0 105.27-86.121 191.39-191.39 191.39h-73.438c-10.551 0-20.906-0.86-31.004-2.53v3514c0 30.46-24.695 55.16-55.16 55.16s-55.16-24.7-55.16-55.16v-3574.2c-31.067-34.05-50.067-79.27-50.067-128.72v3675.3c0 13.46 1.411 26.62 4.09 39.31 18.262 86.57 95.504 152.07 187.3 152.07h73.438c105.26 0 191.39-86.12 191.39-191.38v-3675.3"/>
  </clipPath>
 </defs>
 <g id="layer1" transform="translate(-362.76 -188.84)">
  <g fill="#fff">
   <path id="path4183" d="m451.28 936c-48.889 0-88.522-10.632-88.522-23.75 0-7.0864 11.571-13.449 29.918-17.8 0.0356 0.0298 0.0674 0.0585 0.1025 0.0897-18.22 4.335-29.7 10.663-29.7 17.71 0 13.069 39.489 23.664 88.201 23.664s88.2-10.595 88.2-23.664c0-7.0474-11.48-13.375-29.7-17.71 0.035-0.0312 0.0675-0.06 0.1025-0.0897 18.348 4.351 29.919 10.713 29.919 17.8 0 13.118-39.632 23.75-88.522 23.75"/>
   <path id="path4185" d="m451.28 935.92c-48.712 0-88.201-10.595-88.201-23.664 0-7.0474 11.48-13.375 29.7-17.71 0.0333 0.0289 0.0699 0.0611 0.103 0.0914-18.089 4.3174-29.482 10.611-29.482 17.619 0 13.021 39.345 23.578 87.88 23.578 48.536 0 87.88-10.557 87.88-23.578 0-7.0074-11.394-13.301-29.482-17.619 0.0325-0.0302 0.07-0.0625 0.1025-0.0914 18.22 4.335 29.7 10.663 29.7 17.71 0 13.069-39.489 23.664-88.2 23.664"/>
   <path id="path4187" d="m451.28 935.83c-48.535 0-87.88-10.557-87.88-23.578 0-7.0074 11.393-13.301 29.482-17.619 0.0351 0.0297 0.0679 0.0586 0.103 0.0899-17.959 4.3026-29.265 10.562-29.265 17.529 0 12.974 39.202 23.491 87.56 23.491s87.559-10.518 87.559-23.491c0-6.9672-11.305-13.226-29.265-17.529 0.0362-0.0312 0.0675-0.0601 0.10375-0.0899 18.089 4.3174 29.482 10.611 29.482 17.619 0 13.021-39.345 23.578-87.88 23.578"/>
   <path id="path4189" d="m451.28 935.74c-48.358 0-87.56-10.518-87.56-23.491 0-6.9672 11.306-13.226 29.265-17.529 0.0337 0.0288 0.0704 0.061 0.10362 0.0897-17.83 4.2867-29.047 10.511-29.047 17.439 0 12.926 39.058 23.406 87.239 23.406 48.18 0 87.239-10.48 87.239-23.406 0-6.9278-11.219-13.152-29.049-17.439 0.0337-0.0287 0.0712-0.061 0.10375-0.0897 17.96 4.3026 29.265 10.562 29.265 17.529 0 12.974-39.201 23.491-87.559 23.491"/>
   <path id="path4191" d="m451.28 935.66c-48.181 0-87.239-10.48-87.239-23.406 0-6.9278 11.218-13.152 29.047-17.439 0.0356 0.0312 0.0683 0.0601 0.104 0.0914-17.701 4.269-28.831 10.459-28.831 17.348 0 12.879 38.914 23.32 86.918 23.32 48.003 0 86.918-10.441 86.918-23.32 0-6.8886-11.13-13.079-28.831-17.348 0.0363-0.0312 0.0688-0.0601 0.10375-0.0914 17.83 4.2866 29.049 10.511 29.049 17.439 0 12.926-39.059 23.406-87.239 23.406"/>
   <path id="path4193" d="m451.28 935.57c-48.004 0-86.918-10.441-86.918-23.32 0-6.8886 11.129-13.079 28.831-17.348 0.0356 0.0312 0.0688 0.06 0.104 0.0902-17.569 4.2526-28.614 10.41-28.614 17.257 0 12.831 38.771 23.234 86.597 23.234 47.827 0 86.597-10.403 86.597-23.234 0-6.8476-11.045-13.005-28.614-17.257 0.035-0.0303 0.0687-0.059 0.10375-0.0902 17.701 4.269 28.831 10.459 28.831 17.348 0 12.879-38.915 23.32-86.918 23.32"/>
   <path id="path4195" d="m451.28 935.49c-47.827 0-86.597-10.403-86.597-23.234 0-6.8476 11.045-13.005 28.614-17.257 0.0336 0.0299 0.0712 0.0625 0.1045 0.0914-17.441 4.2349-28.398 10.357-28.398 17.166 0 12.784 38.627 23.147 86.277 23.147 47.649 0 86.277-10.364 86.277-23.147 0-6.8086-10.958-12.931-28.399-17.166 0.0337-0.0289 0.0712-0.0615 0.105-0.0914 17.569 4.2525 28.614 10.41 28.614 17.257 0 12.831-38.77 23.234-86.597 23.234"/>
   <path id="path4197" d="m451.28 935.4c-47.65 0-86.277-10.364-86.277-23.147 0-6.8086 10.957-12.931 28.398-17.166 0.0356 0.0308 0.0693 0.0595 0.10488 0.0908-17.31 4.2187-28.182 10.307-28.182 17.075 0 12.736 38.484 23.061 85.956 23.061s85.956-10.325 85.956-23.061c0-6.7685-10.871-12.856-28.181-17.075 0.035-0.0312 0.0688-0.06 0.10375-0.0908 17.441 4.2349 28.399 10.357 28.399 17.166 0 12.784-38.628 23.147-86.277 23.147"/>
   <path id="path4199" d="m451.28 935.31c-47.472 0-85.956-10.325-85.956-23.061 0-6.7685 10.872-12.856 28.182-17.075 0.0357 0.0304 0.0699 0.0601 0.1055 0.0904-17.184 4.2021-27.967 10.256-27.967 16.985 0 12.688 38.34 22.976 85.635 22.976 47.294 0 85.636-10.288 85.636-22.976 0-6.729-10.784-12.783-27.968-16.985 0.0362-0.0303 0.07-0.06 0.10625-0.0904 17.31 4.2188 28.181 10.307 28.181 17.075 0 12.736-38.484 23.061-85.956 23.061"/>
   <path id="path4201" d="m451.28 935.23c-47.295 0-85.635-10.288-85.635-22.976 0-6.729 10.783-12.783 27.967-16.985 0.0338 0.0289 0.0718 0.0625 0.1055 0.0914-17.054 4.1845-27.751 10.204-27.751 16.894 0 12.641 38.196 22.89 85.314 22.89s85.314-10.249 85.314-22.89c0-6.689-10.698-12.709-27.751-16.894 0.0337-0.0289 0.0712-0.0625 0.105-0.0914 17.184 4.2021 27.968 10.256 27.968 16.985 0 12.688-38.341 22.976-85.636 22.976"/>
   <path id="path4203" d="m451.28 935.14c-47.118 0-85.314-10.249-85.314-22.89 0-6.689 10.697-12.709 27.751-16.894 0.0356 0.0298 0.0697 0.0595 0.106 0.0897-16.925 4.169-27.537 10.154-27.537 16.804 0 12.594 38.053 22.804 84.994 22.804 46.94 0 84.993-10.21 84.993-22.804 0-6.6499-10.611-12.635-27.536-16.804 0.0362-0.0303 0.07-0.06 0.10625-0.0897 17.054 4.1845 27.751 10.204 27.751 16.894 0 12.641-38.196 22.89-85.314 22.89"/>
   <path id="path4205" d="m451.28 935.06c-46.94 0-84.994-10.21-84.994-22.804 0-6.6499 10.611-12.635 27.537-16.804 0.0356 0.0312 0.0703 0.0601 0.10587 0.0914-16.796 4.1514-27.322 10.102-27.322 16.712 0 12.546 37.909 22.717 84.673 22.717 46.763 0 84.673-10.171 84.673-22.717 0-6.6099-10.526-12.561-27.322-16.712 0.0362-0.0312 0.0712-0.0601 0.10625-0.0914 16.925 4.169 27.536 10.154 27.536 16.804 0 12.594-38.052 22.804-84.993 22.804"/>
   <path id="path4207" d="m451.28 934.97c-46.764 0-84.673-10.171-84.673-22.717 0-6.6099 10.525-12.561 27.322-16.712 0.0361 0.0297 0.0709 0.06 0.107 0.0899-16.669 4.1352-27.108 10.053-27.108 16.622 0 12.499 37.766 22.631 84.352 22.631 46.587 0 84.352-10.133 84.352-22.631 0-6.5699-10.439-12.487-27.108-16.622 0.0362-0.0299 0.0712-0.0601 0.10625-0.0899 16.796 4.1514 27.322 10.102 27.322 16.712 0 12.546-37.91 22.717-84.673 22.717"/>
   <path id="path4209" d="m451.28 934.88c-46.586 0-84.352-10.133-84.352-22.631 0-6.5699 10.439-12.487 27.108-16.622 0.0356 0.0312 0.0708 0.0615 0.10638 0.0913-16.541 4.1176-26.894 10-26.894 16.531 0 12.451 37.622 22.545 84.031 22.545s84.03-10.094 84.03-22.545c0-6.5312-10.352-12.414-26.894-16.531 0.0362-0.0298 0.0712-0.06 0.1075-0.0913 16.669 4.1352 27.108 10.053 27.108 16.622 0 12.499-37.765 22.631-84.352 22.631"/>
   <path id="path4211" d="m451.28 934.8c-46.409 0-84.031-10.094-84.031-22.545 0-6.5312 10.353-12.414 26.894-16.531 0.0361 0.0297 0.0718 0.06 0.1075 0.0899-16.414 4.1015-26.68 9.9501-26.68 16.441 0 12.404 37.478 22.459 83.71 22.459s83.71-10.055 83.71-22.459c0-6.4912-10.266-12.34-26.68-16.441 0.035-0.0299 0.0712-0.0601 0.10625-0.0899 16.541 4.1176 26.894 10 26.894 16.531 0 12.451-37.621 22.545-84.03 22.545"/>
   <path id="path4213" d="m451.28 934.71c-46.232 0-83.71-10.055-83.71-22.459 0-6.4912 10.266-12.34 26.68-16.441 0.0361 0.0312 0.0718 0.0615 0.10787 0.0912-16.288 4.084-26.467 9.8975-26.467 16.35 0 12.356 37.335 22.373 83.39 22.373 46.054 0 83.389-10.016 83.389-22.373 0-6.4526-10.179-12.266-26.468-16.35 0.0362-0.0297 0.0725-0.06 0.10875-0.0912 16.414 4.1015 26.68 9.9501 26.68 16.441 0 12.404-37.479 22.459-83.71 22.459"/>
   <path id="path4215" d="m451.28 934.62c-46.055 0-83.39-10.016-83.39-22.373 0-6.4526 10.179-12.266 26.467-16.35 0.0361 0.0303 0.0718 0.0601 0.10788 0.0914-16.159 4.0664-26.254 9.8461-26.254 16.259 0 12.309 37.191 22.288 83.069 22.288s83.069-9.979 83.069-22.288c0-6.4126-10.096-12.192-26.255-16.259 0.0362-0.0312 0.0725-0.0611 0.1075-0.0914 16.289 4.084 26.468 9.8975 26.468 16.35 0 12.356-37.335 22.373-83.389 22.373"/>
   <path id="path4217" d="m451.28 934.54c-45.878 0-83.069-9.979-83.069-22.288 0-6.4126 10.095-12.192 26.254-16.259 0.0361 0.0303 0.0722 0.06 0.10837 0.0898-16.031 4.0489-26.042 9.7965-26.042 16.169 0 12.261 37.047 22.201 82.748 22.201 45.7 0 82.748-9.94 82.748-22.201 0-6.3725-10.011-12.12-26.042-16.169 0.0362-0.0298 0.0725-0.0595 0.10875-0.0898 16.159 4.0664 26.255 9.8461 26.255 16.259 0 12.309-37.191 22.288-83.069 22.288"/>
   <path id="path4219" d="m451.28 934.45c-45.701 0-82.748-9.94-82.748-22.201 0-6.3725 10.011-12.12 26.042-16.169 0.0361 0.0304 0.0727 0.0616 0.10888 0.0914-15.906 4.0312-25.83 9.7441-25.83 16.078 0 12.214 36.904 22.115 82.427 22.115s82.427-9.9009 82.427-22.115c0-6.3335-9.9238-12.046-25.83-16.078 0.0362-0.0298 0.0725-0.061 0.10875-0.0914 16.031 4.0489 26.042 9.7965 26.042 16.169 0 12.261-37.048 22.201-82.748 22.201"/>
   <path id="path4221" d="m451.28 934.37c-45.524 0-82.427-9.9009-82.427-22.115 0-6.3335 9.9238-12.046 25.83-16.078 0.0362 0.0303 0.0727 0.0615 0.109 0.0913-15.779 4.0138-25.618 9.6915-25.618 15.986 0 12.166 36.76 22.029 82.106 22.029s82.107-9.8628 82.107-22.029c0-6.2949-9.84-11.973-25.619-15.986 0.0362-0.0297 0.0725-0.061 0.10875-0.0913 15.906 4.0312 25.83 9.7441 25.83 16.078 0 12.214-36.904 22.115-82.427 22.115"/>
   <path id="path4223" d="m451.28 934.28c-45.346 0-82.106-9.8628-82.106-22.029 0-6.2949 9.8394-11.973 25.618-15.986 0.0361 0.0304 0.0731 0.0601 0.10937 0.0899-15.652 3.9976-25.407 9.6416-25.407 15.896 0 12.119 36.617 21.942 81.786 21.942s81.786-9.8237 81.786-21.942c0-6.2549-9.755-11.899-25.406-15.896 0.0362-0.0297 0.0725-0.0595 0.10875-0.0899 15.779 4.0138 25.619 9.6915 25.619 15.986 0 12.166-36.761 22.029-82.107 22.029"/>
   <path id="path4225" d="m451.28 934.19c-45.17 0-81.786-9.8237-81.786-21.942 0-6.2549 9.7549-11.899 25.407-15.896 0.0361 0.0303 0.0736 0.0615 0.10975 0.0914-15.526 3.9799-25.196 9.5889-25.196 15.805 0 12.071 36.473 21.856 81.465 21.856s81.466-9.7852 81.466-21.856c0-6.2162-9.67-11.825-25.196-15.805 0.0362-0.0299 0.0738-0.0611 0.11-0.0914 15.651 3.9976 25.406 9.6416 25.406 15.896 0 12.119-36.616 21.942-81.786 21.942"/>
   <path id="path4227" d="m451.28 934.11c-44.992 0-81.465-9.7852-81.465-21.856 0-6.2162 9.67-11.825 25.196-15.805 0.0362 0.0302 0.0738 0.0615 0.11038 0.0912-15.398 3.9614-24.986 9.5376-24.986 15.714 0 12.024 36.33 21.77 81.145 21.77 44.814 0 81.144-9.7461 81.144-21.77 0-6.1762-9.5875-11.752-24.986-15.714 0.0362-0.0297 0.075-0.061 0.11125-0.0912 15.526 3.9799 25.196 9.5889 25.196 15.805 0 12.071-36.474 21.856-81.466 21.856"/>
   <path id="path4229" d="m451.28 934.02c-44.815 0-81.145-9.7461-81.145-21.77 0-6.1762 9.5879-11.752 24.986-15.714 0.0361 0.0289 0.0742 0.0601 0.11037 0.0904-15.273 3.9448-24.775 9.4858-24.775 15.624 0 11.976 36.186 21.685 80.824 21.685s80.823-9.709 80.823-21.685c0-6.1378-9.5025-11.679-24.775-15.624 0.0362-0.0303 0.0738-0.0615 0.11-0.0904 15.399 3.9614 24.986 9.5376 24.986 15.714 0 12.024-36.33 21.77-81.144 21.77"/>
  </g>
  <g>
   <path id="path4231" d="m451.28 933.94c-44.638 0-80.824-9.709-80.824-21.685 0-6.1378 9.5024-11.679 24.775-15.624 0.0386 0.0308 0.0722 0.0595 0.11138 0.0907-15.146 3.9278-24.566 9.4351-24.566 15.533 0 11.929 36.042 21.599 80.503 21.599 44.46 0 80.503-9.6699 80.503-21.599 0-6.0976-9.42-11.605-24.566-15.533 0.0387-0.0312 0.0725-0.06 0.11125-0.0907 15.272 3.9448 24.775 9.4858 24.775 15.624 0 11.976-36.185 21.685-80.823 21.685" fill="#feffff"/>
   <path id="path4233" d="m451.28 933.85c-44.46 0-80.503-9.6699-80.503-21.599 0-6.0976 9.42-11.605 24.566-15.533 0.0361 0.0303 0.0746 0.0615 0.11125 0.0914-15.022 3.9086-24.356 9.3828-24.356 15.441 0 11.881 35.898 21.513 80.182 21.513 44.283 0 80.182-9.6314 80.182-21.513 0-6.0586-9.3338-11.533-24.356-15.441 0.0362-0.0299 0.075-0.0611 0.11125-0.0914 15.146 3.9278 24.566 9.4351 24.566 15.533 0 11.929-36.042 21.599-80.503 21.599" fill="#feffff"/>
   <path id="path4235" d="m451.28 933.77c-44.284 0-80.182-9.6314-80.182-21.513 0-6.0586 9.3345-11.533 24.356-15.441 0.0366 0.0287 0.0752 0.0615 0.11187 0.0902-14.896 3.8921-24.147 9.3326-24.147 15.351 0 11.834 35.755 21.426 79.861 21.426s79.86-9.5923 79.86-21.426c0-6.0185-9.2512-11.459-24.146-15.351 0.0362-0.0287 0.075-0.0615 0.11125-0.0902 15.022 3.9086 24.356 9.3828 24.356 15.441 0 11.881-35.899 21.513-80.182 21.513" fill="#fefeff"/>
   <path id="path4237" d="m451.28 933.68c-44.106 0-79.861-9.5923-79.861-21.426 0-6.0185 9.2515-11.459 24.147-15.351 0.0385 0.0312 0.0732 0.0601 0.11175 0.0909-14.77 3.8755-23.938 9.2802-23.938 15.26 0 11.786 35.611 21.34 79.541 21.34 43.929 0 79.54-9.5537 79.54-21.34 0-5.98-9.1688-11.385-23.939-15.26 0.0387-0.0308 0.0737-0.0596 0.1125-0.0909 14.895 3.8921 24.146 9.3326 24.146 15.351 0 11.834-35.755 21.426-79.86 21.426" fill="#fefefe"/>
   <path id="path4239" d="m451.28 933.59c-43.929 0-79.541-9.5537-79.541-21.34 0-5.98 9.1679-11.385 23.938-15.26 0.0366 0.0303 0.0763 0.0615 0.11288 0.0913-14.646 3.8565-23.73 9.2276-23.73 15.169 0 11.739 35.468 21.255 79.22 21.255s79.219-9.5161 79.219-21.255c0-5.9414-9.085-11.312-23.73-15.169 0.0363-0.0298 0.0763-0.061 0.1125-0.0913 14.77 3.8755 23.939 9.2802 23.939 15.26 0 11.786-35.611 21.34-79.54 21.34" fill="#fefefe"/>
   <path id="path4241" d="m451.28 933.51c-43.752 0-79.22-9.5161-79.22-21.255 0-5.9414 9.0845-11.312 23.73-15.169 0.0385 0.0312 0.0738 0.0591 0.11275 0.0904-14.522 3.8399-23.522 9.1772-23.522 15.079 0 11.691 35.324 21.169 78.899 21.169 43.574 0 78.899-9.4776 78.899-21.169 0-5.9014-9.0012-11.239-23.522-15.079 0.0387-0.0312 0.0737-0.0591 0.1125-0.0904 14.645 3.8565 23.73 9.2276 23.73 15.169 0 11.739-35.468 21.255-79.219 21.255" fill="#fdfefe"/>
   <path id="path4243" d="m451.28 933.42c-43.575 0-78.899-9.4776-78.899-21.169 0-5.9014 9.001-11.239 23.522-15.079 0.0366 0.0297 0.0761 0.0625 0.11325 0.0914-14.395 3.8208-23.315 9.125-23.315 14.987 0 11.644 35.181 21.083 78.579 21.083s78.578-9.439 78.578-21.083c0-5.8622-8.92-11.166-23.315-14.987 0.0375-0.0289 0.0763-0.0616 0.11375-0.0914 14.521 3.8399 23.522 9.1772 23.522 15.079 0 11.691-35.325 21.169-78.899 21.169" fill="#fdfefe"/>
   <path id="path4245" d="m451.28 933.33c-43.398 0-78.579-9.439-78.579-21.083 0-5.8622 8.9204-11.166 23.315-14.987 0.0386 0.0312 0.0743 0.06 0.11337 0.0907-14.272 3.8042-23.107 9.0728-23.107 14.896 0 11.596 35.037 20.996 78.257 20.996s78.257-9.3999 78.257-20.996c0-5.8238-8.835-11.092-23.108-14.896 0.0388-0.0308 0.075-0.0595 0.11375-0.0907 14.395 3.8208 23.315 9.125 23.315 14.987 0 11.644-35.18 21.083-78.578 21.083" fill="#fdfdfe"/>
   <path id="path4247" d="m451.28 933.25c-43.221 0-78.257-9.3999-78.257-20.996 0-5.8238 8.836-11.092 23.107-14.896 0.037 0.0289 0.0776 0.0615 0.11425 0.0914-14.146 3.7851-22.901 9.0214-22.901 14.805 0 11.549 34.893 20.91 77.937 20.91 43.043 0 77.937-9.3613 77.937-20.91 0-5.7838-8.755-11.02-22.901-14.805 0.0362-0.0299 0.0775-0.0625 0.11375-0.0914 14.272 3.8042 23.108 9.0728 23.108 14.896 0 11.596-35.036 20.996-78.257 20.996" fill="#fdfdfd"/>
   <path id="path4249" d="m451.28 933.16c-43.044 0-77.937-9.3613-77.937-20.91 0-5.7838 8.7549-11.02 22.901-14.805 0.039 0.0312 0.0751 0.06 0.11475 0.0902-14.025 3.7686-22.695 8.9697-22.695 14.715 0 11.501 34.75 20.824 77.616 20.824s77.616-9.3223 77.616-20.824c0-5.7451-8.67-10.946-22.695-14.715 0.04-0.0303 0.0763-0.059 0.115-0.0902 14.146 3.7851 22.901 9.0214 22.901 14.805 0 11.549-34.894 20.91-77.937 20.91" fill="#fdfdfd"/>
   <path id="path4251" d="m451.28 933.08c-42.866 0-77.616-9.3223-77.616-20.824 0-5.7451 8.6704-10.946 22.695-14.715 0.0366 0.0299 0.0776 0.0625 0.11475 0.0914-13.9 3.75-22.489 8.9175-22.489 14.624 0 11.454 34.606 20.737 77.295 20.737s77.296-9.2837 77.296-20.737c0-5.706-8.5888-10.874-22.49-14.624 0.0375-0.0289 0.0788-0.0615 0.115-0.0914 14.025 3.7686 22.695 8.9697 22.695 14.715 0 11.501-34.75 20.824-77.616 20.824" fill="#fcfdfd"/>
   <path id="path4253" d="m451.28 932.99c-42.689 0-77.295-9.2837-77.295-20.737 0-5.706 8.5888-10.874 22.489-14.624 0.039 0.0312 0.0761 0.0595 0.11513 0.0907-13.777 3.7315-22.283 8.8652-22.283 14.533 0 11.406 34.462 20.652 76.974 20.652s76.974-9.2461 76.974-20.652c0-5.6675-8.5062-10.801-22.284-14.533 0.0387-0.0312 0.0762-0.0595 0.115-0.0907 13.901 3.75 22.49 8.9175 22.49 14.624 0 11.454-34.606 20.737-77.296 20.737" fill="#fcfdfd"/>
   <path id="path4255" d="m451.28 932.9c-42.512 0-76.974-9.2461-76.974-20.652 0-5.6675 8.5064-10.801 22.283-14.533 0.0391 0.0312 0.0768 0.0601 0.11575 0.0914-13.651 3.7139-22.079 8.8139-22.079 14.441 0 11.359 34.319 20.566 76.654 20.566 42.334 0 76.653-9.2075 76.653-20.566 0-5.6275-8.4262-10.728-22.078-14.441 0.0387-0.0312 0.0763-0.0601 0.115-0.0914 13.778 3.7315 22.284 8.8652 22.284 14.533 0 11.406-34.462 20.652-76.974 20.652" fill="#fcfcfd"/>
   <path id="path4257" d="m451.28 932.82c-42.335 0-76.654-9.2075-76.654-20.566 0-5.6275 8.4272-10.728 22.079-14.441 0.0371 0.0287 0.0791 0.0625 0.11625 0.0912-13.529 3.6954-21.874 8.7612-21.874 14.35 0 11.311 34.175 20.48 76.333 20.48 42.157 0 76.333-9.1689 76.333-20.48 0-5.5889-8.345-10.655-21.874-14.35 0.0363-0.0287 0.0788-0.0625 0.11625-0.0912 13.651 3.7139 22.078 8.8139 22.078 14.441 0 11.359-34.319 20.566-76.653 20.566" fill="#fcfcfc"/>
   <path id="path4259" d="m451.28 932.73c-42.158 0-76.333-9.1689-76.333-20.48 0-5.5889 8.3448-10.655 21.874-14.35 0.039 0.0303 0.0771 0.0601 0.11625 0.0914-13.405 3.6762-21.67 8.709-21.67 14.259 0 11.264 34.032 20.394 76.012 20.394s76.012-9.1299 76.012-20.394c0-5.5498-8.265-10.582-21.669-14.259 0.0387-0.0312 0.0762-0.0611 0.11625-0.0914 13.529 3.6954 21.874 8.7612 21.874 14.35 0 11.311-34.176 20.48-76.333 20.48" fill="#fbfcfc"/>
   <path id="path4261" d="m451.28 932.65c-41.98 0-76.012-9.1299-76.012-20.394 0-5.5498 8.2646-10.582 21.67-14.259 0.0395 0.0298 0.0776 0.06 0.11712 0.0898-13.284 3.6602-21.466 8.6578-21.466 14.169 0 11.216 33.888 20.308 75.691 20.308s75.692-9.0914 75.692-20.308c0-5.5112-8.1825-10.509-21.466-14.169 0.0387-0.0298 0.0775-0.06 0.1175-0.0898 13.404 3.6762 21.669 8.709 21.669 14.259 0 11.264-34.031 20.394-76.012 20.394" fill="#fbfcfc"/>
   <path id="path4263" d="m451.28 932.56c-41.803 0-75.691-9.0914-75.691-20.308 0-5.5112 8.1821-10.509 21.466-14.169 0.0396 0.0312 0.0781 0.0616 0.11775 0.0914-13.161 3.6411-21.263 8.605-21.263 14.078 0 11.169 33.745 20.221 75.371 20.221s75.37-9.0522 75.37-20.221c0-5.4726-8.1012-10.436-21.262-14.078 0.0387-0.0298 0.0775-0.0601 0.1175-0.0914 13.284 3.6602 21.466 8.6578 21.466 14.169 0 11.216-33.889 20.308-75.692 20.308" fill="#fbfbfb"/>
   <path id="path4265" d="m451.28 932.47c-41.626 0-75.371-9.0522-75.371-20.221 0-5.4726 8.1015-10.436 21.263-14.078 0.039 0.0312 0.0781 0.0615 0.11763 0.0913-13.039 3.6226-21.06 8.5528-21.06 13.986 0 11.12 33.601 20.136 75.05 20.136s75.049-9.0161 75.049-20.136c0-5.4336-8.02-10.364-21.059-13.986 0.0388-0.0297 0.0775-0.06 0.1175-0.0913 13.161 3.6411 21.262 8.605 21.262 14.078 0 11.169-33.745 20.221-75.37 20.221" fill="#fbfbfb"/>
   <path id="path4267" d="m451.28 932.39c-41.449 0-75.05-9.0161-75.05-20.136 0-5.4336 8.021-10.364 21.06-13.986 0.039 0.0304 0.0786 0.0616 0.11812 0.0914-12.917 3.604-20.857 8.5-20.857 13.895 0 11.072 33.457 20.05 74.729 20.05s74.729-8.9776 74.729-20.05c0-5.395-7.94-10.291-20.858-13.895 0.04-0.0298 0.0787-0.061 0.11875-0.0914 13.039 3.6226 21.059 8.5528 21.059 13.986 0 11.12-33.6 20.136-75.049 20.136" fill="#fafbfb"/>
   <path id="path4269" d="m451.28 932.3c-41.272 0-74.729-8.9776-74.729-20.05 0-5.395 7.9399-10.291 20.857-13.895 0.0396 0.0297 0.0791 0.0615 0.11863 0.0912-12.793 3.585-20.655 8.4488-20.655 13.804 0 11.025 33.314 19.964 74.408 19.964s74.408-8.939 74.408-19.964c0-5.3565-7.8588-10.219-20.655-13.804 0.04-0.0298 0.0787-0.0615 0.11875-0.0912 12.918 3.604 20.858 8.5 20.858 13.895 0 11.072-33.458 20.05-74.729 20.05" fill="#fafbfb"/>
   <path id="path4271" d="m451.28 932.22c-41.095 0-74.408-8.939-74.408-19.964 0-5.355 7.8619-10.219 20.655-13.804 0.0396 0.0299 0.0791 0.0611 0.11925 0.0914-12.673 3.5659-20.453 8.396-20.453 13.712 0 10.978 33.17 19.877 74.087 19.877s74.088-8.8999 74.088-19.877c0-5.3164-7.7812-10.146-20.454-13.712 0.04-0.0302 0.08-0.0615 0.11875-0.0914 12.796 3.585 20.655 8.4472 20.655 13.804 0 11.025-33.314 19.964-74.408 19.964" fill="#fafafa"/>
   <path id="path4273" d="m451.28 932.13c-40.918 0-74.087-8.8999-74.087-19.877 0-5.3164 7.7802-10.146 20.453-13.712 0.0395 0.0297 0.0795 0.061 0.11962 0.0913-12.55 3.5474-20.252 8.3438-20.252 13.621 0 10.93 33.026 19.791 73.767 19.791 40.74 0 73.767-8.8609 73.767-19.791 0-5.2774-7.7025-10.074-20.252-13.621 0.04-0.0303 0.08-0.0615 0.12-0.0913 12.672 3.5659 20.454 8.396 20.454 13.712 0 10.978-33.171 19.877-74.088 19.877" fill="#fafafa"/>
   <path id="path4275" d="m451.28 932.04c-40.74 0-73.767-8.8609-73.767-19.791 0-5.2774 7.7016-10.074 20.252-13.621 0.0395 0.0299 0.08 0.0611 0.11963 0.0914-12.431 3.5282-20.051 8.291-20.051 13.53 0 10.882 32.883 19.705 73.446 19.705s73.446-8.8227 73.446-19.705c0-5.2388-7.62-10.002-20.051-13.53 0.04-0.0303 0.08-0.0615 0.12-0.0914 12.55 3.5474 20.252 8.3438 20.252 13.621 0 10.93-33.026 19.791-73.767 19.791" fill="#f9fafa"/>
   <path id="path4277" d="m451.28 931.96c-40.563 0-73.446-8.8227-73.446-19.705 0-5.2388 7.6201-10.002 20.051-13.53 0.04 0.0298 0.0805 0.061 0.1205 0.0907-12.31 3.5102-19.851 8.2388-19.851 13.439 0 10.835 32.739 19.619 73.126 19.619 40.386 0 73.126-8.7836 73.126-19.619 0-5.2002-7.5412-9.9288-19.851-13.439 0.04-0.0297 0.0813-0.061 0.12-0.0907 12.431 3.5282 20.051 8.291 20.051 13.53 0 10.882-32.882 19.705-73.446 19.705" fill="#f9f9f9"/>
   <path id="path4279" d="m451.28 931.87c-40.386 0-73.126-8.7836-73.126-19.619 0-5.2002 7.5405-9.9288 19.851-13.439 0.0401 0.0303 0.0811 0.0615 0.12062 0.0914-12.187 3.4911-19.651 8.1865-19.651 13.348 0 10.788 32.596 19.534 72.805 19.534 40.208 0 72.804-8.7461 72.804-19.534 0-5.1611-7.4638-9.8565-19.651-13.348 0.04-0.0299 0.0812-0.0611 0.12125-0.0914 12.31 3.5102 19.851 8.2388 19.851 13.439 0 10.835-32.74 19.619-73.126 19.619" fill="#f9f9f9"/>
   <path id="path4281" d="m451.28 931.79c-40.209 0-72.805-8.7461-72.805-19.534 0-5.1611 7.4639-9.8565 19.651-13.348 0.042 0.0312 0.0796 0.059 0.12163 0.0912-12.068 3.4726-19.452 8.1339-19.452 13.256 0 10.74 32.452 19.448 72.484 19.448s72.484-8.7075 72.484-19.448c0-5.1225-7.385-9.7838-19.452-13.256 0.0425-0.0322 0.08-0.06 0.12125-0.0912 12.188 3.4911 19.651 8.1865 19.651 13.348 0 10.788-32.596 19.534-72.804 19.534" fill="#f8f9f9"/>
   <path id="path4283" d="m451.28 931.7c-40.032 0-72.484-8.7075-72.484-19.448 0-5.1225 7.3837-9.7838 19.452-13.256 0.04 0.0303 0.0815 0.0615 0.12162 0.0914-11.949 3.4536-19.252 8.08-19.252 13.165 0 10.692 32.309 19.361 72.163 19.361s72.163-8.669 72.163-19.361c0-5.085-7.3038-9.7114-19.252-13.165 0.04-0.0299 0.0812-0.0611 0.12125-0.0914 12.068 3.4726 19.452 8.1339 19.452 13.256 0 10.74-32.452 19.448-72.484 19.448" fill="#f8f8f8"/>
   <path id="path4285" d="m451.28 931.61c-39.854 0-72.163-8.669-72.163-19.361 0-5.085 7.3038-9.7114 19.252-13.165 0.04 0.0288 0.0825 0.0615 0.1225 0.0913-11.828 3.4351-19.054 8.0274-19.054 13.074 0 10.645 32.165 19.275 71.842 19.275s71.842-8.6299 71.842-19.275c0-5.0464-7.2262-9.6386-19.054-13.074 0.04-0.0298 0.0825-0.0625 0.1225-0.0913 11.949 3.4536 19.252 8.08 19.252 13.165 0 10.692-32.309 19.361-72.163 19.361" fill="#f8f8f8"/>
   <path id="path4287" d="m451.28 931.53c-39.677 0-71.842-8.6299-71.842-19.275 0-5.0464 7.226-9.6386 19.054-13.074 0.042 0.0312 0.0801 0.0586 0.12263 0.0914-11.708 3.416-18.856 7.975-18.856 12.982 0 10.598 32.022 19.189 71.522 19.189s71.522-8.5913 71.522-19.189c0-5.0074-7.1488-9.5664-18.856-12.982 0.0425-0.0327 0.08-0.0601 0.1225-0.0914 11.828 3.4351 19.054 8.0274 19.054 13.074 0 10.645-32.165 19.275-71.842 19.275" fill="#f7f8f8"/>
   <path id="path4289" d="m451.28 931.44c-39.5 0-71.522-8.5913-71.522-19.189 0-5.0074 7.1484-9.5664 18.856-12.982 0.04 0.0288 0.083 0.061 0.123 0.0913-11.588 3.3975-18.658 7.9224-18.658 12.891 0 10.55 31.878 19.103 71.201 19.103s71.2-8.5528 71.2-19.103c0-4.9688-7.07-9.4936-18.659-12.891 0.04-0.0303 0.0838-0.0625 0.12375-0.0913 11.708 3.416 18.856 7.975 18.856 12.982 0 10.598-32.021 19.189-71.522 19.189" fill="#f7f7f7"/>
   <path id="path4291" d="m451.28 931.35c-39.323 0-71.201-8.5528-71.201-19.103 0-4.9688 7.0699-9.4936 18.658-12.891 0.0425 0.0312 0.081 0.0601 0.1235 0.0914-11.47 3.3784-18.461 7.8696-18.461 12.8 0 10.502 31.734 19.016 70.88 19.016s70.879-8.5136 70.879-19.016c0-4.9301-6.9912-9.4214-18.461-12.8 0.0425-0.0312 0.0813-0.0601 0.12375-0.0914 11.589 3.3975 18.659 7.9224 18.659 12.891 0 10.55-31.878 19.103-71.2 19.103" fill="#f6f7f7"/>
   <path id="path4293" d="m451.28 931.27c-39.146 0-70.88-8.5136-70.88-19.016 0-4.9301 6.9911-9.4214 18.461-12.8 0.0405 0.0282 0.084 0.061 0.124 0.0907-11.349 3.3589-18.264 7.8179-18.264 12.709 0 10.455 31.59 18.931 70.559 18.931s70.559-8.476 70.559-18.931c0-4.8911-6.9162-9.3501-18.265-12.709 0.04-0.0297 0.0838-0.0625 0.12375-0.0907 11.47 3.3784 18.461 7.8696 18.461 12.8 0 10.502-31.734 19.016-70.879 19.016" fill="#f6f6f7"/>
   <path id="path4295" d="m451.28 931.18c-38.969 0-70.559-8.476-70.559-18.931 0-4.8911 6.915-9.3501 18.264-12.709 0.0425 0.0312 0.0826 0.0601 0.125 0.0914-11.232 3.3402-18.068 7.7651-18.068 12.618 0 10.408 31.447 18.845 70.238 18.845 38.792 0 70.238-8.4375 70.238-18.845 0-4.8525-6.8362-9.2774-18.069-12.618 0.0438-0.0312 0.0825-0.0601 0.125-0.0914 11.349 3.3589 18.265 7.8179 18.265 12.709 0 10.455-31.59 18.931-70.559 18.931" fill="#f6f6f6"/>
   <path id="path4297" d="m451.28 931.1c-38.792 0-70.238-8.4375-70.238-18.845 0-4.8525 6.8364-9.2774 18.068-12.618 0.0401 0.0287 0.0845 0.0615 0.125 0.0912-11.113 3.3213-17.872 7.7114-17.872 12.526 0 10.36 31.303 18.759 69.918 18.759 38.614 0 69.918-8.3989 69.918-18.759 0-4.815-6.76-9.2051-17.874-12.526 0.0412-0.0297 0.085-0.0625 0.125-0.0912 11.232 3.3402 18.069 7.7651 18.069 12.618 0 10.408-31.446 18.845-70.238 18.845" fill="#f5f6f6"/>
   <path id="path4299" d="m451.28 931.01c-38.614 0-69.918-8.3989-69.918-18.759 0-4.815 6.7592-9.2051 17.872-12.526 0.0425 0.0312 0.083 0.0601 0.1255 0.0914-10.995 3.3026-17.677 7.6586-17.677 12.435 0 10.312 31.159 18.672 69.597 18.672 38.437 0 69.597-8.3599 69.597-18.672 0-4.7764-6.6825-9.1324-17.678-12.435 0.0425-0.0312 0.0825-0.0601 0.125-0.0914 11.114 3.3213 17.874 7.7114 17.874 12.526 0 10.36-31.304 18.759-69.918 18.759" fill="#f5f5f5"/>
   <path id="path4301" d="m451.28 930.92c-38.438 0-69.597-8.3599-69.597-18.672 0-4.7764 6.6826-9.1324 17.677-12.435 0.0425 0.0312 0.0835 0.06 0.126 0.0913-10.877 3.2828-17.482 7.6065-17.482 12.344 0 10.265 31.016 18.586 69.276 18.586s69.276-8.3213 69.276-18.586c0-4.7372-6.605-9.061-17.482-12.344 0.0425-0.0312 0.0838-0.06 0.12625-0.0913 10.995 3.3026 17.678 7.6586 17.678 12.435 0 10.312-31.16 18.672-69.597 18.672" fill="#f5f5f5"/>
   <path id="path4303" d="m451.28 930.84c-38.26 0-69.276-8.3213-69.276-18.586 0-4.7372 6.6055-9.061 17.482-12.344 0.043 0.0312 0.084 0.061 0.1265 0.0912-10.758 3.2638-17.289 7.5538-17.289 12.252 0 10.217 30.873 18.5 68.956 18.5s68.956-8.2828 68.956-18.5c0-4.6988-6.5312-8.9888-17.289-12.252 0.0425-0.0303 0.0838-0.06 0.12625-0.0912 10.878 3.2828 17.482 7.6065 17.482 12.344 0 10.265-31.015 18.586-69.276 18.586" fill="#f4f4f4"/>
   <path id="path4305" d="m451.28 930.75c-38.083 0-68.956-8.2828-68.956-18.5 0-4.6988 6.5308-8.9888 17.289-12.252 0.0405 0.0299 0.0864 0.0625 0.12687 0.0914-10.642 3.2436-17.095 7.5-17.095 12.161 0 10.17 30.729 18.415 68.635 18.415s68.634-8.2452 68.634-18.415c0-4.6611-6.4525-8.9175-17.095-12.161 0.0412-0.0289 0.0875-0.0615 0.1275-0.0914 10.758 3.2638 17.289 7.5538 17.289 12.252 0 10.217-30.872 18.5-68.956 18.5" fill="#f4f4f4"/>
   <path id="path4307" d="m451.28 930.67c-37.906 0-68.635-8.2452-68.635-18.415 0-4.6611 6.4531-8.9175 17.095-12.161 0.043 0.0312 0.085 0.061 0.128 0.0922-10.524 3.2237-16.902 7.4464-16.902 12.069 0 10.122 30.586 18.329 68.314 18.329s68.314-8.2061 68.314-18.329c0-4.6225-6.3775-8.8452-16.902-12.069 0.0437-0.0312 0.085-0.061 0.1275-0.0922 10.642 3.2436 17.095 7.5 17.095 12.161 0 10.17-30.729 18.415-68.634 18.415" fill="#f3f3f3"/>
   <path id="path4309" d="m451.28 930.58c-37.728 0-68.314-8.2061-68.314-18.329 0-4.6225 6.3775-8.8452 16.902-12.069 0.043 0.0303 0.085 0.0601 0.12788 0.0914-10.407 3.205-16.709 7.3935-16.709 11.978 0 10.075 30.442 18.243 67.993 18.243 37.552 0 67.993-8.1674 67.993-18.243 0-4.584-6.3012-8.7725-16.709-11.978 0.0425-0.0312 0.085-0.0611 0.1275-0.0914 10.525 3.2236 16.902 7.4464 16.902 12.069 0 10.122-30.586 18.329-68.314 18.329" fill="#f3f3f2"/>
   <path id="path4311" d="m451.28 930.5c-37.552 0-67.993-8.1674-67.993-18.243 0-4.584 6.3019-8.7725 16.709-11.978 0.043 0.0298 0.0855 0.0615 0.1285 0.0913-10.289 3.1851-16.517 7.3414-16.517 11.886 0 10.027 30.298 18.156 67.672 18.156s67.672-8.1289 67.672-18.156c0-4.5464-6.225-8.7011-16.516-11.886 0.0425-0.0298 0.085-0.0615 0.12875-0.0913 10.408 3.205 16.709 7.3935 16.709 11.978 0 10.075-30.441 18.243-67.993 18.243" fill="#f2f2f2"/>
   <path id="path4313" d="m451.28 930.41c-37.374 0-67.672-8.1289-67.672-18.156 0-4.5449 6.228-8.7011 16.517-11.886 0.0429 0.0298 0.0859 0.061 0.12937 0.0914-10.174 3.165-16.325 7.2875-16.325 11.795 0 9.98 30.154 18.07 67.352 18.07 37.197 0 67.352-8.0898 67.352-18.07 0-4.5074-6.1525-8.6299-16.325-11.795 0.0425-0.0304 0.0862-0.0616 0.12875-0.0914 10.291 3.1851 16.516 7.3399 16.516 11.886 0 10.027-30.298 18.156-67.672 18.156" fill="#f2f1f1"/>
   <path id="path4315" d="m451.28 930.32c-37.197 0-67.352-8.0898-67.352-18.07 0-4.5074 6.1514-8.6299 16.325-11.795 0.043 0.0312 0.0864 0.061 0.12938 0.0923-10.056 3.145-16.134 7.2339-16.134 11.703 0 9.9326 30.011 17.984 67.031 17.984s67.03-8.0513 67.03-17.984c0-4.4688-6.0775-8.5576-16.134-11.703 0.0425-0.0312 0.0863-0.061 0.13-0.0923 10.172 3.165 16.325 7.2875 16.325 11.795 0 9.98-30.155 18.07-67.352 18.07" fill="#f1f1f1"/>
   <path id="path4317" d="m451.28 930.24c-37.02 0-67.031-8.0513-67.031-17.984 0-4.4688 6.0776-8.5576 16.134-11.703 0.043 0.0303 0.0869 0.0615 0.12987 0.0913-9.9399 3.125-15.943 7.1802-15.943 11.611 0 9.8848 29.867 17.897 66.71 17.897s66.71-8.0127 66.71-17.897c0-4.4311-6.0038-8.4864-15.944-11.611 0.0438-0.0297 0.0875-0.061 0.13-0.0913 10.056 3.145 16.134 7.2339 16.134 11.703 0 9.9326-30.01 17.984-67.03 17.984" fill="#f0f0f0"/>
   <path id="path4319" d="m451.28 930.15c-36.843 0-66.71-8.0127-66.71-17.897 0-4.4311 6.003-8.4864 15.943-11.611 0.0435 0.0304 0.0874 0.0616 0.13088 0.0914-9.8252 3.1064-15.753 7.1274-15.753 11.52 0 9.8374 29.723 17.812 66.389 17.812s66.389-7.9751 66.389-17.812c0-4.3926-5.9288-8.4136-15.754-11.52 0.0437-0.0298 0.0888-0.061 0.13125-0.0914 9.94 3.125 15.944 7.1802 15.944 11.611 0 9.8848-29.868 17.897-66.71 17.897" fill="#f0f0ef"/>
   <path id="path4321" d="m451.28 930.06c-36.666 0-66.389-7.9751-66.389-17.812 0-4.3926 5.9276-8.4136 15.753-11.52 0.0454 0.0312 0.0855 0.06 0.13137 0.0912-9.7105 3.0865-15.564 7.0738-15.564 11.429 0 9.79 29.58 17.726 66.068 17.726s66.068-7.9361 66.068-17.726c0-4.355-5.8525-8.3422-15.564-11.429 0.0462-0.0312 0.0863-0.06 0.13125-0.0912 9.825 3.1064 15.754 7.1274 15.754 11.52 0 9.8374-29.724 17.812-66.389 17.812" fill="#efefef"/>
   <path id="path4323" d="m451.28 929.98c-36.489 0-66.068-7.9361-66.068-17.726 0-4.355 5.853-8.3422 15.564-11.429 0.0429 0.0299 0.0884 0.0625 0.13138 0.0924-9.5942 3.0649-15.375 7.02-15.375 11.336 0 9.7426 29.437 17.64 65.748 17.64 36.312 0 65.748-7.8975 65.748-17.64 0-4.3164-5.78-8.2715-15.375-11.336 0.0437-0.0299 0.0887-0.0625 0.13125-0.0924 9.7112 3.0865 15.564 7.0738 15.564 11.429 0 9.79-29.58 17.726-66.068 17.726" fill="#eee"/>
   <path id="path4325" d="m451.28 929.89c-36.312 0-65.748-7.8975-65.748-17.64 0-4.3164 5.7804-8.2715 15.375-11.336 0.0434 0.0302 0.0888 0.0615 0.13225 0.0912-9.4814 3.0464-15.186 6.9664-15.186 11.245 0 9.6949 29.292 17.554 65.427 17.554 36.134 0 65.427-7.8588 65.427-17.554 0-4.2788-5.7038-8.1988-15.186-11.245 0.0438-0.0297 0.0888-0.061 0.1325-0.0912 9.595 3.0649 15.375 7.02 15.375 11.336 0 9.7426-29.436 17.64-65.748 17.64" fill="#eeeeed"/>
   <path id="path4327" d="m451.28 929.81c-36.134 0-65.427-7.8588-65.427-17.554 0-4.2788 5.7041-8.1988 15.186-11.245 0.0454 0.0312 0.0869 0.0601 0.13287 0.0914-9.3672 3.0262-14.998 6.9135-14.998 11.154 0 9.6475 29.148 17.467 65.106 17.467 35.957 0 65.106-7.8198 65.106-17.467 0-4.2402-5.63-8.1275-14.998-11.154 0.0463-0.0312 0.0875-0.0601 0.1325-0.0914 9.4825 3.0464 15.186 6.9664 15.186 11.245 0 9.6949-29.292 17.554-65.427 17.554" fill="#ededec"/>
   <path id="path4329" d="m451.28 929.72c-35.958 0-65.106-7.8198-65.106-17.467 0-4.2402 5.6304-8.1275 14.998-11.154 0.0434 0.0303 0.0897 0.0625 0.13325 0.0923-9.251 3.0054-14.81 6.8589-14.81 11.062 0 9.6001 29.006 17.381 64.786 17.381s64.786-7.7812 64.786-17.381c0-4.2026-5.56-8.0561-14.811-11.062 0.0437-0.0298 0.09-0.062 0.13375-0.0923 9.3675 3.0262 14.998 6.9135 14.998 11.154 0 9.6475-29.148 17.467-65.106 17.467" fill="#ededec"/>
   <path id="path4331" d="m451.28 929.63c-35.78 0-64.786-7.7812-64.786-17.381 0-4.2026 5.5595-8.0561 14.81-11.062 0.0459 0.0317 0.0884 0.06 0.13375 0.0912-9.1381 2.9854-14.624 6.8066-14.624 10.97 0 9.5528 28.862 17.295 64.465 17.295 35.602 0 64.464-7.7422 64.464-17.295 0-4.1636-5.485-7.9849-14.624-10.97 0.0462-0.0312 0.0887-0.0595 0.13375-0.0912 9.2512 3.0054 14.811 6.8589 14.811 11.062 0 9.6001-29.006 17.381-64.786 17.381" fill="#ececeb"/>
   <path id="path4333" d="m451.28 929.55c-35.603 0-64.465-7.7422-64.465-17.295 0-4.1636 5.4854-7.9849 14.624-10.97 0.044 0.0303 0.0914 0.0625 0.13475 0.0928-9.0244 2.9639-14.438 6.751-14.438 10.878 0 9.5049 28.718 17.21 64.144 17.21s64.143-7.7051 64.143-17.21c0-4.1265-5.4125-7.9136-14.436-10.878 0.0438-0.0303 0.09-0.0625 0.13375-0.0928 9.1388 2.9854 14.624 6.8066 14.624 10.97 0 9.5528-28.862 17.295-64.464 17.295" fill="#ecebea"/>
   <path id="path4335" d="m451.28 929.46c-35.426 0-64.144-7.7051-64.144-17.21 0-4.1265 5.4131-7.9136 14.438-10.878 0.046 0.0312 0.0889 0.0601 0.13488 0.0914-8.9111 2.9439-14.252 6.6972-14.252 10.786 0 9.4575 28.575 17.124 63.823 17.124s63.823-7.666 63.823-17.124c0-4.0889-5.34-7.8422-14.251-10.786 0.045-0.0312 0.0888-0.0601 0.135-0.0914 9.0238 2.9639 14.436 6.751 14.436 10.878 0 9.5049-28.717 17.21-64.143 17.21" fill="#ebebea"/>
   <path id="path4337" d="m451.28 929.38c-35.248 0-63.823-7.666-63.823-17.124 0-4.0889 5.3404-7.8422 14.252-10.786 0.0439 0.0297 0.0922 0.0625 0.13575 0.0912-8.7989 2.9249-14.066 6.6451-14.066 10.695 0 9.4101 28.431 17.038 63.502 17.038s63.502-7.6275 63.502-17.038c0-4.0498-5.2675-7.77-14.066-10.695 0.0437-0.0287 0.0925-0.0615 0.13625-0.0912 8.9112 2.9439 14.251 6.6972 14.251 10.786 0 9.4575-28.574 17.124-63.823 17.124" fill="#eaeae9"/>
   <path id="path4339" d="m451.28 929.29c-35.071 0-63.502-7.6275-63.502-17.038 0-4.0498 5.2676-7.77 14.066-10.695 0.0464 0.0312 0.0903 0.0611 0.13612 0.0924-8.685 2.9038-13.882 6.5898-13.882 10.602 0 9.3622 28.288 16.951 63.182 16.951s63.182-7.5889 63.182-16.951c0-4.0128-5.1975-7.6988-13.882-10.602 0.0463-0.0312 0.09-0.0611 0.13625-0.0924 8.7988 2.9249 14.066 6.6451 14.066 10.695 0 9.4101-28.43 17.038-63.502 17.038" fill="#eaeae8"/>
   <path id="path4341" d="m451.28 929.2c-34.894 0-63.182-7.5889-63.182-16.951 0-4.0128 5.1968-7.6988 13.882-10.602 0.0464 0.0312 0.0909 0.061 0.13675 0.0913-8.5722 2.8838-13.698 6.5376-13.698 10.511 0 9.315 28.144 16.865 62.861 16.865s62.86-7.5498 62.86-16.865c0-3.9736-5.125-7.6275-13.698-10.511 0.0462-0.0303 0.09-0.06 0.13625-0.0913 8.685 2.9038 13.882 6.5898 13.882 10.602 0 9.3622-28.288 16.951-63.182 16.951" fill="#e9e9e8"/>
   <path id="path4343" d="m451.28 929.12c-34.717 0-62.861-7.5498-62.861-16.865 0-3.9736 5.1255-7.6275 13.698-10.511 0.0464 0.0312 0.0914 0.061 0.13775 0.0923-8.461 2.8629-13.515 6.483-13.515 10.419 0 9.2676 28 16.779 62.54 16.779s62.539-7.5112 62.539-16.779c0-3.936-5.0538-7.5561-13.514-10.419 0.0462-0.0312 0.0912-0.061 0.1375-0.0923 8.5725 2.8838 13.698 6.5376 13.698 10.511 0 9.315-28.144 16.865-62.86 16.865" fill="#e9e8e7"/>
   <path id="path4345" d="m451.28 929.03c-34.54 0-62.54-7.5112-62.54-16.779 0-3.936 5.0538-7.5561 13.515-10.419 0.0459 0.0312 0.0917 0.0616 0.13763 0.0929-8.3496 2.8413-13.332 6.4273-13.332 10.326 0 9.2202 27.856 16.694 62.219 16.694 34.362 0 62.219-7.4736 62.219-16.694 0-3.8989-4.9825-7.4849-13.332-10.326 0.0463-0.0312 0.0925-0.0616 0.13875-0.0929 8.46 2.8629 13.514 6.483 13.514 10.419 0 9.2676-27.999 16.779-62.539 16.779" fill="#e8e8e6"/>
   <path id="path4347" d="m451.28 928.95c-34.363 0-62.219-7.4736-62.219-16.694 0-3.8989 4.9819-7.4849 13.332-10.326 0.0464 0.0298 0.0924 0.06 0.13875 0.0913-8.2374 2.8199-13.15 6.3735-13.15 10.235 0 9.1724 27.713 16.607 61.898 16.607 34.186 0 61.898-7.4351 61.898-16.607 0-3.8614-4.9112-7.415-13.149-10.235 0.0462-0.0312 0.0913-0.0615 0.1375-0.0913 8.35 2.8413 13.332 6.4273 13.332 10.326 0 9.2202-27.857 16.694-62.219 16.694" fill="#e7e7e6"/>
   <path id="path4349" d="m451.28 928.86c-34.186 0-61.898-7.4351-61.898-16.607 0-3.8614 4.9121-7.415 13.15-10.235 0.0464 0.0312 0.0928 0.061 0.13912 0.0922-8.128 2.7989-12.968 6.3189-12.968 10.143 0 9.1235 27.569 16.521 61.578 16.521 34.008 0 61.578-7.398 61.578-16.521 0-3.8238-4.84-7.3438-12.969-10.143 0.0463-0.0312 0.0937-0.061 0.14-0.0922 8.2375 2.8199 13.149 6.3735 13.149 10.235 0 9.1724-27.712 16.607-61.898 16.607" fill="#e7e6e5"/>
   <path id="path4351" d="m451.28 928.77c-34.009 0-61.578-7.398-61.578-16.521 0-3.8238 4.8397-7.3438 12.968-10.143 0.0464 0.0304 0.0933 0.0616 0.13963 0.0914-8.0156 2.7788-12.787 6.2661-12.787 10.051 0 9.0776 27.426 16.435 61.257 16.435s61.257-7.3574 61.257-16.435c0-3.7851-4.7712-7.2725-12.788-10.051 0.0475-0.0298 0.0937-0.061 0.14-0.0914 8.1288 2.7989 12.969 6.3189 12.969 10.143 0 9.1235-27.57 16.521-61.578 16.521" fill="#e6e6e4"/>
   <path id="path4353" d="m451.28 928.69c-33.832 0-61.257-7.3574-61.257-16.435 0-3.7851 4.7715-7.2725 12.787-10.051 0.0464 0.0312 0.0942 0.0625 0.14062 0.0922-7.9062 2.7579-12.606 6.2115-12.606 9.959 0 9.0288 27.282 16.349 60.936 16.349s60.936-7.3199 60.936-16.349c0-3.7475-4.7-7.2011-12.606-9.959 0.0463-0.0297 0.0937-0.061 0.14-0.0922 8.0162 2.7788 12.788 6.2661 12.788 10.051 0 9.0776-27.426 16.435-61.257 16.435" fill="#e5e5e3"/>
   <path id="path4355" d="m451.28 928.6c-33.654 0-60.936-7.3199-60.936-16.349 0-3.7475 4.7001-7.2011 12.606-9.959 0.0464 0.0303 0.0947 0.0615 0.14113 0.0928-7.7954 2.7364-12.427 6.1562-12.427 9.8662 0 8.9815 27.138 16.263 60.615 16.263s60.616-7.2812 60.616-16.263c0-3.71-4.6312-7.1299-12.428-9.8662 0.0462-0.0312 0.095-0.0625 0.14125-0.0928 7.9062 2.7579 12.606 6.2115 12.606 9.959 0 9.0288-27.282 16.349-60.936 16.349" fill="#e4e4e3"/>
   <path id="path4357" d="m451.28 928.52c-33.477 0-60.615-7.2812-60.615-16.263 0-3.71 4.6314-7.1299 12.427-9.8662 0.0469 0.0299 0.0953 0.0611 0.14162 0.0914-7.686 2.7162-12.248 6.1025-12.248 9.7749 0 8.9336 26.995 16.176 60.295 16.176s60.294-7.2426 60.294-16.176c0-3.6724-4.5612-7.0586-12.248-9.7749 0.0463-0.0302 0.095-0.0615 0.14125-0.0914 7.7962 2.7364 12.428 6.1562 12.428 9.8662 0 8.9815-27.138 16.263-60.616 16.263" fill="#e4e3e2"/>
   <path id="path4359" d="m451.28 928.43c-33.3 0-60.295-7.2426-60.295-16.176 0-3.6724 4.5621-7.0586 12.248-9.7749 0.0488 0.0323 0.0933 0.061 0.1425 0.0922-7.5776 2.6939-12.07 6.0479-12.07 9.6826 0 8.8862 26.851 16.091 59.974 16.091 33.122 0 59.974-7.2051 59.974-16.091 0-3.6348-4.4925-6.9888-12.07-9.6826 0.0487-0.0312 0.0937-0.06 0.1425-0.0922 7.6862 2.7162 12.248 6.1025 12.248 9.7749 0 8.9336-26.994 16.176-60.294 16.176" fill="#e3e3e1"/>
   <path id="path4361" d="m451.28 928.34c-33.123 0-59.974-7.2051-59.974-16.091 0-3.6348 4.4921-6.9888 12.07-9.6826 0.0465 0.0303 0.0962 0.0625 0.14313 0.0928-7.4678 2.6724-11.892 5.9922-11.892 9.5899 0 8.8389 26.708 16.005 59.653 16.005s59.653-7.166 59.653-16.005c0-3.5976-4.4238-6.9175-11.891-9.5899 0.0463-0.0303 0.0962-0.0625 0.1425-0.0928 7.5775 2.6939 12.07 6.0479 12.07 9.6826 0 8.8862-26.852 16.091-59.974 16.091" fill="#e2e2e0"/>
   <path id="path4363" d="m451.28 928.26c-32.945 0-59.653-7.166-59.653-16.005 0-3.5976 4.4244-6.9175 11.892-9.5899 0.0489 0.0312 0.0942 0.0601 0.1435 0.0909-7.3589 2.6528-11.715 5.939-11.715 9.499 0 8.791 26.564 15.919 59.332 15.919s59.332-7.128 59.332-15.919c0-3.56-4.355-6.8462-11.714-9.499 0.0488-0.0308 0.0937-0.0596 0.14375-0.0909 7.4675 2.6724 11.891 5.9922 11.891 9.5899 0 8.8389-26.708 16.005-59.653 16.005" fill="#e2e1df"/>
   <path id="path4365" d="m451.28 928.17c-32.769 0-59.332-7.128-59.332-15.919 0-3.56 4.3559-6.8462 11.715-9.499 0.0469 0.0303 0.0972 0.063 0.14412 0.0928-7.2505 2.6299-11.538 5.8838-11.538 9.4062 0 8.7436 26.42 15.833 59.012 15.833 32.591 0 59.012-7.0889 59.012-15.833 0-3.5225-4.2875-6.7764-11.539-9.4062 0.0475-0.0298 0.0975-0.0625 0.145-0.0928 7.3588 2.6528 11.714 5.939 11.714 9.499 0 8.791-26.564 15.919-59.332 15.919" fill="#e1e0df"/>
   <path id="path4367" d="m451.28 928.08c-32.591 0-59.012-7.0889-59.012-15.833 0-3.5225 4.2876-6.7764 11.538-9.4062 0.0492 0.0312 0.0956 0.061 0.145 0.0922-7.1421 2.6089-11.362 5.8291-11.362 9.314 0 8.6962 26.277 15.746 58.691 15.746s58.69-7.0498 58.69-15.746c0-3.4849-4.22-6.7051-11.362-9.314 0.05-0.0312 0.0962-0.061 0.145-0.0922 7.2512 2.6299 11.539 5.8838 11.539 9.4062 0 8.7436-26.42 15.833-59.012 15.833" fill="#e0e0de"/>
   <path id="path4369" d="m451.28 928c-32.414 0-58.691-7.0498-58.691-15.746 0-3.4849 4.2202-6.7051 11.362-9.314 0.0469 0.0303 0.0991 0.0625 0.146 0.0928-7.0366 2.586-11.188 5.7735-11.188 9.2212 0 8.6489 26.133 15.66 58.37 15.66s58.37-7.0113 58.37-15.66c0-3.4478-4.1512-6.6352-11.188-9.2212 0.0462-0.0303 0.0987-0.0625 0.145-0.0928 7.1425 2.6089 11.362 5.8291 11.362 9.314 0 8.6962-26.276 15.746-58.69 15.746" fill="#e0dfdd"/>
   <path id="path4371" d="m451.28 927.91c-32.237 0-58.37-7.0113-58.37-15.66 0-3.4478 4.1509-6.6352 11.188-9.2212 0.0492 0.0312 0.0966 0.0611 0.146 0.0924-6.9272 2.5649-11.013 5.7188-11.013 9.1289 0 8.6011 25.989 15.575 58.049 15.575s58.049-6.9741 58.049-15.575c0-3.4101-4.085-6.564-11.012-9.1289 0.0487-0.0312 0.0962-0.0611 0.14625-0.0924 7.0362 2.586 11.188 5.7735 11.188 9.2212 0 8.6489-26.134 15.66-58.37 15.66" fill="#dfdedc"/>
   <path id="path4373" d="m451.28 927.83c-32.06 0-58.049-6.9741-58.049-15.575 0-3.4101 4.0855-6.564 11.013-9.1289 0.0497 0.0312 0.0976 0.0615 0.147 0.0928-6.8219 2.5424-10.839 5.6636-10.839 9.0361 0 8.5538 25.846 15.489 57.728 15.489s57.728-6.935 57.728-15.489c0-3.3725-4.0162-6.4936-10.839-9.0361 0.05-0.0312 0.0975-0.0615 0.1475-0.0928 6.9275 2.5649 11.012 5.7188 11.012 9.1289 0 8.6011-25.99 15.575-58.049 15.575" fill="#dedddb"/>
   <path id="path4375" d="m451.28 927.74c-31.883 0-57.728-6.935-57.728-15.489 0-3.3725 4.017-6.4936 10.839-9.0361 0.0492 0.0312 0.0986 0.061 0.14788 0.0922-6.7152 2.5215-10.666 5.6089-10.666 8.9439 0 8.5064 25.702 15.402 57.408 15.402s57.408-6.896 57.408-15.402c0-3.335-3.9512-6.4224-10.666-8.9439 0.0488-0.0312 0.0975-0.061 0.1475-0.0922 6.8225 2.5425 10.839 5.6636 10.839 9.0361 0 8.5538-25.846 15.489-57.728 15.489" fill="#dddcda"/>
   <path id="path4377" d="m451.28 927.65c-31.706 0-57.408-6.896-57.408-15.402 0-3.335 3.9508-6.4224 10.666-8.9439 0.0499 0.0303 0.0986 0.0615 0.1485 0.0928-6.6094 2.4986-10.494 5.5538-10.494 8.8511 0 8.459 25.559 15.316 57.087 15.316s57.087-6.8574 57.087-15.316c0-3.2974-3.8838-6.3525-10.494-8.8511 0.05-0.0312 0.0987-0.0625 0.14875-0.0928 6.715 2.5215 10.666 5.6089 10.666 8.9439 0 8.5064-25.702 15.402-57.408 15.402" fill="#dddcda"/>
   <path id="path4379" d="m451.28 927.57c-31.528 0-57.087-6.8574-57.087-15.316 0-3.2974 3.8848-6.3525 10.494-8.8511 0.0497 0.0299 0.0996 0.0611 0.14887 0.0924-6.5029 2.4775-10.322 5.499-10.322 8.7588 0 8.4111 25.415 15.23 56.766 15.23s56.767-6.8188 56.767-15.23c0-3.2598-3.82-6.2812-10.322-8.7588 0.0487-0.0312 0.0987-0.0625 0.14875-0.0924 6.61 2.4986 10.494 5.5538 10.494 8.8511 0 8.459-25.558 15.316-57.087 15.316" fill="#dcdbd9"/>
   <path id="path4381" d="m451.28 927.48c-31.351 0-56.766-6.8188-56.766-15.23 0-3.2598 3.8189-6.2812 10.322-8.7588 0.0499 0.0303 0.10063 0.061 0.14988 0.0923-6.3974 2.4551-10.151 5.4439-10.151 8.6665 0 8.3638 25.271 15.144 56.445 15.144s56.446-6.7798 56.446-15.144c0-3.2226-3.7538-6.2114-10.151-8.6665 0.05-0.0312 0.1-0.062 0.15-0.0923 6.5025 2.4775 10.322 5.499 10.322 8.7588 0 8.4111-25.416 15.23-56.767 15.23" fill="#dbdad8"/>
   <path id="path4383" d="m451.28 927.4c-31.174 0-56.445-6.7798-56.445-15.144 0-3.2226 3.7535-6.2114 10.151-8.6665 0.0499 0.0303 0.10112 0.0615 0.15087 0.0928-6.2934 2.4326-9.9814 5.3877-9.9814 8.5737 0 8.3164 25.128 15.058 56.125 15.058 30.996 0 56.124-6.7412 56.124-15.058 0-3.186-3.6875-6.1411-9.9812-8.5738 0.05-0.0312 0.10125-0.0625 0.15125-0.0928 6.3975 2.4551 10.151 5.4439 10.151 8.6665 0 8.3638-25.272 15.144-56.446 15.144" fill="#dad9d7"/>
   <path id="path4385" d="m451.28 927.31c-30.997 0-56.125-6.7412-56.125-15.058 0-3.186 3.688-6.1411 9.9814-8.5738 0.0499 0.0298 0.10163 0.061 0.15138 0.0923-6.1885 2.4116-9.812 5.3326-9.812 8.4815 0 8.2685 24.984 14.973 55.804 14.973 30.819 0 55.804-6.7042 55.804-14.973 0-3.1489-3.6238-6.0699-9.8125-8.4815 0.05-0.0312 0.1025-0.0625 0.15125-0.0923 6.2938 2.4326 9.9812 5.3878 9.9812 8.5738 0 8.3164-25.128 15.058-56.124 15.058" fill="#d9d8d6"/>
   <path id="path4387" d="m451.28 927.23c-30.82 0-55.804-6.7042-55.804-14.973 0-3.1489 3.6235-6.0699 9.812-8.4815 0.0523 0.0312 0.0996 0.0616 0.15187 0.0929-6.0845 2.3886-9.643 5.2773-9.643 8.3886 0 8.2212 24.841 14.886 55.483 14.886s55.483-6.665 55.483-14.886c0-3.1114-3.5588-6-9.6425-8.3886 0.0512-0.0312 0.0987-0.0616 0.15125-0.0929 6.1888 2.4116 9.8125 5.3326 9.8125 8.4815 0 8.2685-24.985 14.973-55.804 14.973" fill="#d8d7d6"/>
   <path id="path4389" d="m451.28 927.14c-30.643 0-55.483-6.665-55.483-14.886 0-3.1114 3.5585-6 9.643-8.3886 0.0503 0.0298 0.103 0.0625 0.15288 0.0923-5.9815 2.3663-9.4751 5.2211-9.4751 8.2964 0 8.1739 24.697 14.8 55.163 14.8 30.465 0 55.162-6.6259 55.162-14.8 0-3.0752-3.4925-5.9301-9.475-8.2964 0.05-0.0298 0.10375-0.0625 0.15375-0.0923 6.0838 2.3886 9.6425 5.2773 9.6425 8.3886 0 8.2212-24.84 14.886-55.483 14.886" fill="#d7d6d5"/>
   <path id="path4391" d="m451.28 927.05c-30.465 0-55.163-6.6259-55.163-14.8 0-3.0752 3.4936-5.9301 9.4751-8.2964 0.0528 0.0312 0.1015 0.0615 0.15375 0.0928-5.8779 2.3438-9.3081 5.166-9.3081 8.2036 0 8.1265 24.553 14.714 54.842 14.714 30.288 0 54.842-6.5874 54.842-14.714 0-3.0376-3.43-5.8599-9.3088-8.2036 0.0525-0.0312 0.10125-0.0615 0.15375-0.0928 5.9825 2.3663 9.475 5.2211 9.475 8.2964 0 8.1739-24.696 14.8-55.162 14.8" fill="#d6d6d4"/>
   <path id="path4393" d="m451.28 926.97c-30.289 0-54.842-6.5874-54.842-14.714 0-3.0376 3.4302-5.8599 9.3081-8.2036 0.0504 0.0297 0.104 0.0625 0.15437 0.0922-5.7754 2.3227-9.1416 5.1114-9.1416 8.1114 0 8.0786 24.41 14.627 54.521 14.627s54.52-6.5488 54.52-14.627c0-3-3.3662-5.7886-9.1412-8.1114 0.05-0.0297 0.10375-0.0625 0.15375-0.0922 5.8788 2.3438 9.3088 5.166 9.3088 8.2036 0 8.1265-24.554 14.714-54.842 14.714" fill="#d5d5d3"/>
   <path id="path4395" d="m451.28 926.88c-30.111 0-54.521-6.5488-54.521-14.627 0-3 3.3662-5.7886 9.1416-8.1114 0.0528 0.0328 0.103 0.0625 0.15525 0.0937-5.6724 2.2989-8.9761 5.0552-8.9761 8.0176 0 8.0312 24.266 14.541 54.2 14.541s54.2-6.5098 54.2-14.541c0-2.9624-3.3038-5.7188-8.9762-8.0176 0.0525-0.0312 0.1025-0.061 0.155-0.0937 5.775 2.3227 9.1412 5.1114 9.1412 8.1114 0 8.0786-24.41 14.627-54.52 14.627" fill="#d4d4d2"/>
   <path id="path4397" d="m451.28 926.79c-29.934 0-54.2-6.5098-54.2-14.541 0-2.9624 3.3038-5.7188 8.9761-8.0176 0.0528 0.0312 0.1035 0.0616 0.15625 0.0929-5.5709 2.2759-8.8115 4.9985-8.8115 7.9248 0 7.9839 24.122 14.455 53.879 14.455s53.879-6.4712 53.879-14.455c0-2.9262-3.2412-5.6489-8.8112-7.9248 0.0525-0.0312 0.10375-0.0616 0.15625-0.0929 5.6725 2.2989 8.9762 5.0552 8.9762 8.0176 0 8.0312-24.267 14.541-54.2 14.541" fill="#d4d3d1"/>
   <path id="path4399" d="m451.28 926.71c-29.757 0-53.879-6.4712-53.879-14.455 0-2.9262 3.2406-5.6489 8.8115-7.9248 0.0528 0.0312 0.104 0.061 0.15675 0.0923-5.4702 2.2539-8.6475 4.9439-8.6475 7.8325 0 7.936 23.979 14.37 53.559 14.37s53.558-6.4341 53.558-14.37c0-2.8886-3.1775-5.5786-8.6475-7.8325 0.0538-0.0312 0.105-0.061 0.1575-0.0923 5.57 2.2759 8.8112 4.9985 8.8112 7.9248 0 7.9839-24.122 14.455-53.879 14.455" fill="#d3d2d0"/>
   <path id="path4401" d="m451.28 926.62c-29.58 0-53.559-6.4341-53.559-14.37 0-2.8886 3.1772-5.5786 8.6475-7.8325 0.0503 0.0297 0.10688 0.064 0.15763 0.0937-5.3686 2.23-8.4844 4.8862-8.4844 7.7388 0 7.8886 23.836 14.284 53.238 14.284s53.238-6.3951 53.238-14.284c0-2.8525-3.1162-5.5088-8.485-7.7388 0.0512-0.0298 0.1075-0.064 0.1575-0.0937 5.47 2.2539 8.6475 4.9439 8.6475 7.8325 0 7.936-23.978 14.37-53.558 14.37" fill="#d2d1cf"/>
   <path id="path4403" d="m451.28 926.54c-29.402 0-53.238-6.3951-53.238-14.284 0-2.8525 3.1158-5.5088 8.4844-7.7388 0.0528 0.0312 0.1055 0.0625 0.15825 0.0922-5.2685 2.2075-8.3218 4.8315-8.3218 7.6465 0 7.8412 23.691 14.197 52.917 14.197 29.225 0 52.917-6.356 52.917-14.197 0-2.815-3.0538-5.439-8.3212-7.6465 0.0525-0.0312 0.105-0.061 0.1575-0.0922 5.3688 2.23 8.485 4.8862 8.485 7.7388 0 7.8886-23.836 14.284-53.238 14.284" fill="#d1d0cf"/>
   <path id="path4405" d="m451.28 926.45c-29.226 0-52.917-6.356-52.917-14.197 0-2.815 3.0532-5.439 8.3218-7.6465 0.0551 0.0328 0.104 0.0615 0.15925 0.0937-5.168 2.1841-8.1608 4.774-8.1608 7.5528 0 7.794 23.549 14.111 52.597 14.111s52.597-6.3173 52.597-14.111c0-2.7788-2.9925-5.3686-8.1612-7.5528 0.055-0.0322 0.10375-0.061 0.16-0.0937 5.2675 2.2075 8.3212 4.8315 8.3212 7.6465 0 7.8412-23.692 14.197-52.917 14.197" fill="#d0cfcd"/>
   <path id="path4407" d="m451.28 926.36c-29.048 0-52.597-6.3173-52.597-14.111 0-2.7788 2.9928-5.3686 8.1608-7.5528 0.0531 0.0303 0.10737 0.0625 0.16012 0.0928-5.0684 2.1611-7.9995 4.7188-7.9995 7.46 0 7.7461 23.404 14.025 52.275 14.025s52.276-6.2788 52.276-14.025c0-2.7412-2.9312-5.2989-8-7.46 0.0525-0.0303 0.1075-0.0625 0.16-0.0928 5.1688 2.1841 8.1612 4.774 8.1612 7.5528 0 7.794-23.549 14.111-52.597 14.111" fill="#cfcecc"/>
   <path id="path4409" d="m451.28 926.28c-28.871 0-52.275-6.2788-52.275-14.025 0-2.7412 2.9311-5.2989 7.9995-7.46 0.0532 0.0312 0.10838 0.0625 0.16113 0.0937-4.9688 2.1372-7.8404 4.6611-7.8404 7.3662 0 7.6988 23.261 13.94 51.955 13.94s51.954-6.2412 51.954-13.94c0-2.7051-2.8712-5.229-7.84-7.3662 0.0538-0.0312 0.10875-0.0625 0.16125-0.0937 5.0688 2.1611 8 4.7188 8 7.46 0 7.7461-23.404 14.025-52.276 14.025" fill="#cecdcb"/>
   <path id="path4411" d="m451.28 926.19c-28.694 0-51.955-6.2412-51.955-13.94 0-2.7051 2.8716-5.229 7.8404-7.3662 0.0532 0.0299 0.10887 0.0625 0.16213 0.0924-4.8706 2.1138-7.6816 4.6064-7.6816 7.2739 0 7.6514 23.118 13.854 51.634 13.854 28.517 0 51.634-6.2021 51.634-13.854 0-2.6675-2.8112-5.1601-7.6812-7.2739 0.0525-0.0299 0.10875-0.0625 0.16125-0.0924 4.9688 2.1372 7.84 4.6611 7.84 7.3662 0 7.6988-23.26 13.94-51.954 13.94" fill="#cdccca"/>
   <path id="path4413" d="m451.28 926.11c-28.517 0-51.634-6.2021-51.634-13.854 0-2.6675 2.811-5.1601 7.6816-7.2739 0.0551 0.0326 0.10687 0.0615 0.16249 0.0937-4.7729 2.0902-7.5229 4.5487-7.5229 7.1801 0 7.6035 22.974 13.768 51.313 13.768s51.313-6.1641 51.313-13.768c0-2.6314-2.75-5.0899-7.5238-7.1801 0.0563-0.0323 0.1075-0.0611 0.16375-0.0937 4.87 2.1138 7.6812 4.6064 7.6812 7.2739 0 7.6514-23.118 13.854-51.634 13.854" fill="#cccbc9"/>
   <path id="path4415" d="m451.28 926.02c-28.339 0-51.313-6.1641-51.313-13.768 0-2.6314 2.75-5.0899 7.5229-7.1801 0.0532 0.0302 0.11038 0.0625 0.16363 0.0927-4.6752 2.0674-7.3662 4.4921-7.3662 7.0874 0 7.5561 22.83 13.681 50.993 13.681s50.993-6.125 50.993-13.681c0-2.5952-2.6912-5.02-7.3662-7.0874 0.0525-0.0302 0.11-0.0625 0.1625-0.0927 4.7738 2.0902 7.5238 4.5487 7.5238 7.1801 0 7.6035-22.974 13.768-51.313 13.768" fill="#cbc9c8"/>
   <path id="path4417" d="m451.28 925.93c-28.163 0-50.993-6.125-50.993-13.681 0-2.5952 2.691-5.02 7.3662-7.0874 0.0556 0.0323 0.10887 0.0625 0.1645 0.0937-4.5771 2.0434-7.2099 4.436-7.2099 6.9936 0 7.5088 22.686 13.595 50.672 13.595 27.985 0 50.672-6.0865 50.672-13.595 0-2.5576-2.6325-4.9502-7.21-6.9936 0.055-0.0312 0.10875-0.0615 0.165-0.0937 4.675 2.0674 7.3662 4.4921 7.3662 7.0874 0 7.5561-22.83 13.681-50.993 13.681" fill="#cac8c7"/>
   <path id="path4419" d="m451.28 925.85c-27.985 0-50.672-6.0865-50.672-13.595 0-2.5576 2.6328-4.9502 7.2099-6.9936 0.0563 0.0312 0.10987 0.0625 0.16562 0.0937-4.4805 2.02-7.0548 4.3784-7.0548 6.8999 0 7.4614 22.543 13.509 50.351 13.509s50.35-6.0474 50.35-13.509c0-2.5215-2.5738-4.8799-7.055-6.8999 0.0563-0.0312 0.11-0.0625 0.16625-0.0937 4.5775 2.0434 7.21 4.436 7.21 6.9936 0 7.5088-22.686 13.595-50.672 13.595" fill="#c9c7c6"/>
   <path id="path4421" d="m451.28 925.76c-27.808 0-50.351-6.0474-50.351-13.509 0-2.5215 2.5742-4.8799 7.0548-6.8999 0.0561 0.0312 0.11075 0.0625 0.1665 0.0937-4.3852 1.9946-6.9004 4.3222-6.9004 6.8061 0 7.4136 22.399 13.422 50.03 13.422s50.03-6.0087 50.03-13.422c0-2.4839-2.515-4.8115-6.9012-6.8061 0.0563-0.0312 0.11125-0.0625 0.16625-0.0937 4.4812 2.02 7.055 4.3784 7.055 6.8999 0 7.4614-22.542 13.509-50.35 13.509" fill="#c8c6c5"/>
   <path id="path4423" d="m451.28 925.67c-27.631 0-50.03-6.0087-50.03-13.422 0-2.4839 2.5151-4.8115 6.9004-6.8061 0.0561 0.0312 0.11125 0.0625 0.1675 0.0937-4.2901 1.9711-6.7471 4.2646-6.7471 6.7124 0 7.3662 22.256 13.337 49.71 13.337s49.709-5.9712 49.709-13.337c0-2.4478-2.4575-4.7412-6.7475-6.7124 0.0563-0.0312 0.1125-0.0625 0.1675-0.0937 4.3862 1.9946 6.9012 4.3222 6.9012 6.8061 0 7.4136-22.4 13.422-50.03 13.422" fill="#c7c5c3"/>
   <path id="path4425" d="m451.28 925.59c-27.454 0-49.71-5.9712-49.71-13.337 0-2.4478 2.457-4.7412 6.7471-6.7124 0.0561 0.0312 0.11225 0.0625 0.16838 0.0922-4.1942 1.9488-6.5948 4.209-6.5948 6.6201 0 7.3189 22.112 13.251 49.389 13.251 27.276 0 49.389-5.9326 49.389-13.251 0-2.4111-2.4012-4.6714-6.595-6.6201 0.0563-0.0297 0.1125-0.061 0.1675-0.0922 4.29 1.9711 6.7475 4.2646 6.7475 6.7124 0 7.3662-22.256 13.337-49.709 13.337" fill="#c6c4c2"/>
   <path id="path4427" d="m451.28 925.5c-27.277 0-49.389-5.9326-49.389-13.251 0-2.4111 2.4005-4.6714 6.5948-6.6201 0.0561 0.0312 0.11325 0.064 0.1695 0.0937-4.1001 1.9239-6.4434 4.1514-6.4434 6.5264 0 7.271 21.968 13.165 49.068 13.165 27.099 0 49.068-5.894 49.068-13.165 0-2.375-2.3438-4.6025-6.4438-6.5264 0.0562-0.0297 0.11375-0.0625 0.17-0.0937 4.1938 1.9488 6.595 4.209 6.595 6.6201 0 7.3189-22.113 13.251-49.389 13.251" fill="#c4c3c1"/>
   <path id="path4429" d="m451.28 925.42c-27.1 0-49.068-5.894-49.068-13.165 0-2.375 2.3432-4.6025 6.4434-6.5264 0.0561 0.0312 0.11375 0.064 0.16987 0.0937-4.0054 1.8999-6.2925 4.0953-6.2925 6.4326 0 7.2236 21.825 13.079 48.747 13.079s48.747-5.855 48.747-13.079c0-2.3374-2.2875-4.5328-6.2925-6.4326 0.0563-0.0297 0.11375-0.0625 0.17-0.0937 4.1 1.9239 6.4438 4.1514 6.4438 6.5264 0 7.271-21.969 13.165-49.068 13.165" fill="#c3c2c0"/>
   <path id="path4431" d="m451.28 925.33c-26.922 0-48.747-5.855-48.747-13.079 0-2.3374 2.2871-4.5328 6.2925-6.4326 0.0566 0.0312 0.11525 0.064 0.17138 0.0937-3.9126 1.875-6.1435 4.0376-6.1435 6.3389 0 7.1762 21.682 12.993 48.427 12.993s48.427-5.8164 48.427-12.993c0-2.3012-2.2312-4.4639-6.1438-6.3389 0.0563-0.0297 0.115-0.0625 0.17125-0.0937 4.005 1.8999 6.2925 4.0953 6.2925 6.4326 0 7.2236-21.824 13.079-48.747 13.079" fill="#c2c1bf"/>
   <path id="path4433" d="m451.28 925.25c-26.745 0-48.427-5.8164-48.427-12.993 0-2.3012 2.2309-4.4639 6.1435-6.3389 0.0591 0.0328 0.11375 0.0625 0.17287 0.0953-3.8208 1.8501-5.9956 3.9785-5.9956 6.2436 0 7.1289 21.538 12.906 48.106 12.906s48.106-5.7774 48.106-12.906c0-2.2651-2.1738-4.3935-5.995-6.2436 0.0588-0.0328 0.11375-0.0625 0.1725-0.0953 3.9125 1.875 6.1438 4.0376 6.1438 6.3389 0 7.1762-21.682 12.993-48.427 12.993" fill="#c1c0be"/>
   <path id="path4435" d="m451.28 925.16c-26.568 0-48.106-5.7774-48.106-12.906 0-2.2651 2.1749-4.3935 5.9956-6.2436 0.0561 0.0297 0.11675 0.0625 0.17338 0.0937-3.7281 1.8246-5.8478 3.9214-5.8478 6.1499 0 7.081 21.394 12.82 47.785 12.82s47.784-5.7388 47.784-12.82c0-2.2285-2.12-4.3252-5.8475-6.1499 0.0562-0.0312 0.1175-0.064 0.17375-0.0937 3.8212 1.8501 5.995 3.9785 5.995 6.2436 0 7.1289-21.538 12.906-48.106 12.906" fill="#c0bfbd"/>
   <path id="path4437" d="m451.28 925.07c-26.391 0-47.785-5.7388-47.785-12.82 0-2.2285 2.1196-4.3252 5.8478-6.1499 0.0585 0.0312 0.11525 0.0625 0.17425 0.0937-3.6362 1.8012-5.7016 3.8638-5.7016 6.0561 0 7.0328 21.251 12.735 47.464 12.735 26.214 0 47.464-5.7021 47.464-12.735 0-2.1924-2.0662-4.2549-5.7012-6.0561 0.0588-0.0312 0.115-0.0625 0.17375-0.0937 3.7275 1.8246 5.8475 3.9214 5.8475 6.1499 0 7.081-21.394 12.82-47.784 12.82" fill="#bfbebc"/>
   <path id="path4439" d="m451.28 924.99c-26.213 0-47.464-5.7021-47.464-12.735 0-2.1924 2.0654-4.2549 5.7016-6.0561 0.0591 0.0312 0.11675 0.0625 0.17537 0.0937-3.546 1.7759-5.5562 3.8061-5.5562 5.9624 0 6.9849 21.107 12.649 47.144 12.649s47.143-5.664 47.143-12.649c0-2.1562-2.01-4.1865-5.5562-5.9624 0.0588-0.0312 0.11625-0.0625 0.17625-0.0937 3.635 1.8012 5.7012 3.8638 5.7012 6.0561 0 7.0328-21.25 12.735-47.464 12.735" fill="#bebdbb"/>
   <path id="path4441" d="m451.28 924.9c-26.037 0-47.144-5.664-47.144-12.649 0-2.1562 2.0102-4.1865 5.5562-5.9624 0.059 0.0312 0.11763 0.0625 0.17675 0.0937-3.4556 1.7524-5.4121 3.7485-5.4121 5.8686 0 6.9375 20.963 12.562 46.823 12.562 25.859 0 46.823-5.625 46.823-12.562 0-2.1201-1.9575-4.1162-5.4125-5.8686 0.0588-0.0312 0.1175-0.0625 0.17625-0.0937 3.5462 1.7759 5.5562 3.8061 5.5562 5.9624 0 6.9849-21.106 12.649-47.143 12.649" fill="#bdbcba"/>
   <path id="path4443" d="m451.28 924.81c-25.859 0-46.823-5.625-46.823-12.562 0-2.1201 1.9565-4.1162 5.4121-5.8686 0.059 0.0323 0.11863 0.0635 0.17775 0.0948-3.3658 1.7265-5.2691 3.6899-5.2691 5.7739 0 6.8901 20.82 12.476 46.502 12.476s46.502-5.586 46.502-12.476c0-2.084-1.9038-4.0474-5.2688-5.7739 0.0588-0.0312 0.11875-0.0625 0.1775-0.0948 3.455 1.7524 5.4125 3.7485 5.4125 5.8686 0 6.9375-20.964 12.562-46.823 12.562" fill="#bcbbb9"/>
   <path id="path4445" d="m451.28 924.73c-25.682 0-46.502-5.586-46.502-12.476 0-2.084 1.9034-4.0474 5.2691-5.7739 0.0595 0.0312 0.11963 0.0625 0.17913 0.0937-3.2774 1.7011-5.1274 3.6328-5.1274 5.6801 0 6.8422 20.676 12.39 46.181 12.39s46.18-5.5479 46.18-12.39c0-2.0474-1.85-3.979-5.1275-5.6801 0.06-0.0312 0.12-0.0625 0.18-0.0937 3.365 1.7265 5.2688 3.6899 5.2688 5.7739 0 6.8901-20.82 12.476-46.502 12.476" fill="#bbbab8"/>
   <path id="path4447" d="m451.28 924.64c-25.505 0-46.181-5.5479-46.181-12.39 0-2.0474 1.85-3.979 5.1274-5.6801 0.0591 0.0312 0.12062 0.0639 0.17975 0.0951-3.189 1.6762-4.9864 3.5738-4.9864 5.585 0 6.7949 20.532 12.304 45.86 12.304s45.86-5.5088 45.86-12.304c0-2.0112-1.7975-3.9088-4.9862-5.585 0.0588-0.0312 0.12-0.0639 0.17875-0.0951 3.2775 1.7011 5.1275 3.6328 5.1275 5.6801 0 6.8422-20.676 12.39-46.18 12.39" fill="#bab9b7"/>
   <path id="path4449" d="m451.28 924.56c-25.328 0-45.86-5.5088-45.86-12.304 0-2.0112 1.7974-3.9088 4.9864-5.585 0.062 0.0327 0.11962 0.0625 0.18112 0.0937-3.1006 1.6514-4.8468 3.5161-4.8468 5.4912 0 6.7475 20.389 12.219 45.54 12.219s45.539-5.4712 45.539-12.219c0-1.9751-1.7462-3.8399-4.8462-5.4912 0.0613-0.0312 0.11875-0.061 0.18125-0.0937 3.1888 1.6762 4.9862 3.5738 4.9862 5.585 0 6.7949-20.532 12.304-45.86 12.304" fill="#b9b8b6"/>
   <path id="path4451" d="m451.28 924.47c-25.151 0-45.54-5.4712-45.54-12.219 0-1.9751 1.7461-3.8399 4.8468-5.4912 0.0595 0.0312 0.123 0.0635 0.18263 0.0952-3.0132 1.6245-4.7085 3.457-4.7085 5.396 0 6.7002 20.245 12.132 45.219 12.132s45.218-5.4321 45.218-12.132c0-1.939-1.695-3.7715-4.7075-5.396 0.0588-0.0317 0.1225-0.064 0.1825-0.0952 3.1 1.6514 4.8462 3.5161 4.8462 5.4912 0 6.7475-20.388 12.219-45.539 12.219" fill="#b7b7b5"/>
   <path id="path4453" d="m451.28 924.38c-24.974 0-45.219-5.4321-45.219-12.132 0-1.939 1.6952-3.7715 4.7085-5.396 0.062 0.0323 0.1215 0.062 0.18362 0.0948-2.9272 1.5986-4.5714 3.3989-4.5714 5.3012 0 6.6524 20.102 12.046 44.898 12.046s44.898-5.394 44.898-12.046c0-1.9024-1.645-3.7026-4.5712-5.3012 0.0613-0.0328 0.12125-0.0625 0.18375-0.0948 3.0125 1.6245 4.7075 3.457 4.7075 5.396 0 6.7002-20.244 12.132-45.218 12.132" fill="#b6b6b4"/>
   <path id="path4455" d="m451.28 924.3c-24.796 0-44.898-5.394-44.898-12.046 0-1.9024 1.6441-3.7026 4.5714-5.3012 0.062 0.0312 0.1225 0.0625 0.185 0.0937-2.8428 1.5751-4.4355 3.3412-4.4355 5.2075 0 6.605 19.958 11.96 44.577 11.96s44.577-5.355 44.577-11.96c0-1.8662-1.5925-3.6324-4.435-5.2075 0.0625-0.0312 0.1225-0.0625 0.185-0.0937 2.9262 1.5986 4.5712 3.3989 4.5712 5.3012 0 6.6524-20.102 12.046-44.898 12.046" fill="#b5b4b3"/>
   <path id="path4457" d="m451.28 924.21c-24.619 0-44.577-5.355-44.577-11.96 0-1.8662 1.5928-3.6324 4.4355-5.2075 0.0596 0.0312 0.126 0.0649 0.186 0.0952-2.7572 1.5482-4.3012 3.2821-4.3012 5.1122 0 6.5576 19.814 11.874 44.257 11.874 24.442 0 44.257-5.3159 44.257-11.874 0-1.8301-1.5438-3.564-4.3012-5.1122 0.06-0.0304 0.12625-0.064 0.18625-0.0952 2.8425 1.5751 4.435 3.3412 4.435 5.2075 0 6.605-19.958 11.96-44.577 11.96" fill="#b4b3b2"/>
   <path id="path4459" d="m451.28 924.13c-24.442 0-44.257-5.3159-44.257-11.874 0-1.8301 1.544-3.564 4.3012-5.1122 0.0645 0.0336 0.12263 0.0625 0.187 0.0946-2.6728 1.5225-4.1674 3.2236-4.1674 5.0176 0 6.5098 19.671 11.788 43.936 11.788s43.936-5.2778 43.936-11.788c0-1.794-1.4938-3.4951-4.1675-5.0176 0.065-0.0321 0.1225-0.061 0.1875-0.0946 2.7575 1.5482 4.3012 3.2821 4.3012 5.1122 0 6.5576-19.814 11.874-44.257 11.874" fill="#b3b2b1"/>
   <path id="path4461" d="m451.28 924.04c-24.265 0-43.936-5.2778-43.936-11.788 0-1.794 1.4946-3.4951 4.1674-5.0176 0.0625 0.0312 0.1265 0.064 0.189 0.0953-2.5904 1.4961-4.0351 3.1636-4.0351 4.9224 0 6.4624 19.527 11.701 43.615 11.701s43.614-5.2388 43.614-11.701c0-1.7588-1.445-3.4262-4.035-4.9224 0.0625-0.0312 0.12625-0.064 0.18875-0.0953 2.6738 1.5225 4.1675 3.2236 4.1675 5.0176 0 6.5098-19.67 11.788-43.936 11.788" fill="#b1b1b0"/>
   <path id="path4463" d="m451.28 923.95c-24.088 0-43.615-5.2388-43.615-11.701 0-1.7588 1.4448-3.4262 4.0351-4.9224 0.062 0.0312 0.1275 0.0635 0.19 0.0947-2.5074 1.4702-3.9049 3.105-3.9049 4.8276 0 6.415 19.384 11.616 43.294 11.616 23.911 0 43.294-5.2012 43.294-11.616 0-1.7226-1.3975-3.3574-3.905-4.8276 0.0625-0.0312 0.1275-0.0635 0.19-0.0947 2.59 1.4961 4.035 3.1636 4.035 4.9224 0 6.4624-19.526 11.701-43.614 11.701" fill="#b0b0af"/>
   <path id="path4465" d="m451.28 923.87c-23.911 0-43.294-5.2012-43.294-11.616 0-1.7226 1.3975-3.3574 3.9049-4.8276 0.0649 0.0327 0.12588 0.0625 0.19088 0.0952-2.4248 1.4438-3.7749 3.0459-3.7749 4.7324 0 6.3676 19.24 11.53 42.974 11.53 23.733 0 42.973-5.1622 42.973-11.53 0-1.6865-1.35-3.2886-3.775-4.7324 0.065-0.0327 0.12625-0.0625 0.19125-0.0952 2.5075 1.4702 3.905 3.105 3.905 4.8276 0 6.415-19.384 11.616-43.294 11.616" fill="#afafad"/>
   <path id="path4467" d="m451.28 923.78c-23.733 0-42.974-5.1622-42.974-11.53 0-1.6865 1.3501-3.2886 3.7749-4.7324 0.063 0.0312 0.13037 0.0649 0.19287 0.0961-2.3442 1.416-3.647 2.9864-3.647 4.6362 0 6.3199 19.096 11.444 42.653 11.444 23.556 0 42.653-5.124 42.653-11.444 0-1.6499-1.3025-3.2202-3.6475-4.6362 0.0625-0.0312 0.13-0.0649 0.1925-0.0961 2.425 1.4438 3.775 3.0459 3.775 4.7324 0 6.3676-19.24 11.53-42.973 11.53" fill="#aeaeac"/>
   <path id="path4469" d="m451.28 923.7c-23.557 0-42.653-5.124-42.653-11.444 0-1.6499 1.3028-3.2202 3.647-4.6362 0.0654 0.0312 0.12888 0.0625 0.19438 0.0947-2.2648 1.3916-3.5205 2.9262-3.5205 4.5415 0 6.2725 18.953 11.357 42.332 11.357s42.332-5.0849 42.332-11.357c0-1.6152-1.2562-3.1499-3.52-4.5415 0.065-0.0322 0.12875-0.0635 0.19375-0.0947 2.345 1.416 3.6475 2.9864 3.6475 4.6362 0 6.3199-19.097 11.444-42.653 11.444" fill="#adacab"/>
   <path id="path4471" d="m451.28 923.61c-23.379 0-42.332-5.0849-42.332-11.357 0-1.6152 1.2558-3.1499 3.5205-4.5415 0.0649 0.0317 0.12987 0.064 0.19525 0.0952-2.185 1.3652-3.395 2.8676-3.395 4.4462 0 6.2251 18.809 11.271 42.011 11.271s42.01-5.0464 42.01-11.271c0-1.5786-1.2088-3.081-3.395-4.4462 0.0662-0.0312 0.13125-0.0635 0.19625-0.0952 2.2638 1.3916 3.52 2.9262 3.52 4.5415 0 6.2725-18.952 11.357-42.332 11.357" fill="#acabaa"/>
   <path id="path4473" d="m451.28 923.52c-23.202 0-42.011-5.0464-42.011-11.271 0-1.5786 1.21-3.081 3.395-4.4462 0.0655 0.0326 0.13137 0.0639 0.19675 0.0961-2.1064 1.3374-3.271 2.8076-3.271 4.3501 0 6.1772 18.666 11.185 41.69 11.185 23.025 0 41.69-5.0078 41.69-11.185 0-1.5425-1.165-3.0128-3.2712-4.3501 0.065-0.0322 0.13125-0.0635 0.19625-0.0961 2.1862 1.3652 3.395 2.8676 3.395 4.4462 0 6.2251-18.809 11.271-42.01 11.271" fill="#aaaaa9"/>
   <path id="path4475" d="m451.28 923.44c-23.025 0-41.69-5.0078-41.69-11.185 0-1.5425 1.1646-3.0128 3.271-4.3501 0.0655 0.0312 0.13337 0.064 0.19875 0.0953-2.0292 1.311-3.1489 2.7475-3.1489 4.2549 0 6.1299 18.522 11.099 41.37 11.099s41.369-4.9688 41.369-11.099c0-1.5074-1.12-2.9439-3.1488-4.2549 0.0662-0.0312 0.13375-0.064 0.19875-0.0953 2.1062 1.3374 3.2712 2.8076 3.2712 4.3501 0 6.1772-18.666 11.185-41.69 11.185" fill="#a9a9a8"/>
   <path id="path4477" d="m451.28 923.35c-22.848 0-41.37-4.9688-41.37-11.099 0-1.5074 1.1196-2.9439 3.1489-4.2549 0.0679 0.0322 0.13187 0.0635 0.19975 0.0961-1.9521 1.2822-3.0279 2.6875-3.0279 4.1588 0 6.0825 18.378 11.014 41.049 11.014 22.67 0 41.049-4.9311 41.049-11.014 0-1.4712-1.0762-2.8765-3.0288-4.1588 0.0687-0.0326 0.1325-0.0639 0.2-0.0961 2.0288 1.311 3.1488 2.7475 3.1488 4.2549 0 6.1299-18.522 11.099-41.369 11.099" fill="#a8a8a7"/>
   <path id="path4479" d="m451.28 923.27c-22.671 0-41.049-4.9311-41.049-11.014 0-1.4712 1.0758-2.8765 3.0279-4.1588 0.0659 0.0312 0.13275 0.0625 0.19825 0.0937-1.876 1.2564-2.9092 2.626-2.9092 4.0611 0 6.0415 18.236 10.935 40.736 10.935 22.488 0 40.725-4.8935 40.725-10.935 0-1.4351-1.0325-2.8048-2.9088-4.0601 0.0662-0.0312 0.135-0.0635 0.2-0.0947 1.9525 1.2822 3.0288 2.6875 3.0288 4.1588 0 6.0825-18.379 11.014-41.049 11.014" fill="#a7a6a5"/>
   <path id="path4481" d="m458 912.25c0 0.9975-3.0118 1.8051-6.727 1.8051-3.7154 0-6.7271-0.80762-6.7271-1.8051 0-0.99612 3.0118-1.8051 6.7271-1.8051 3.7152 0 6.727 0.809 6.727 1.8051" fill="#100f0d"/>
  </g>
  <g id="g4565" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g4567" clip-path="url(#clipPath4569-7)">
    <path id="path4581" d="m936.28 1986.6c0 105.27-86.121 191.39-191.39 191.39h-73.438c-10.551 0-20.906-0.86-31.004-2.53v3514c0 30.46-24.695 55.16-55.16 55.16s-55.16-24.7-55.16-55.16v-3574.2c-31.067-34.05-50.067-79.27-50.067-128.72v3675.3c0 13.46 1.411 26.62 4.09 39.31 18.262 86.57 95.504 152.07 187.3 152.07h73.438c105.26 0 191.39-86.12 191.39-191.38v-3675.3" fill="url(#linearGradient4573)"/>
   </g>
  </g>
  <g id="g4583" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g4585" clip-path="url(#clipPath4587-0)">
    <path id="path4597" d="m480.07 1400.7v585.95c0 49.45 19 94.67 50.067 128.72v-528.52c0-30.47 24.695-55.16 55.16-55.16s55.16 24.69 55.16 55.16v588.66c10.098 1.67 20.453 2.53 31.004 2.53h73.438c105.26 0 191.39-86.12 191.39-191.39v-585.93c-70.082 29.76-147.17 46.22-228.1 46.22-80.934 0-158.03-16.46-228.11-46.22" fill="url(#linearGradient4591)"/>
   </g>
  </g>
  <g id="g4599" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g4601" clip-path="url(#clipPath4603-1)">
    <path id="path4613" d="m1292.4 862.75c0-322.64-261.54-584.18-584.17-584.18s-584.18 261.54-584.18 584.18c0 322.63 261.55 584.18 584.18 584.18s584.17-261.55 584.17-584.18" fill="url(#radialGradient4639-2)"/>
   </g>
  </g>
  <g id="g4615" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g4617" clip-path="url(#clipPath4619-2)">
    <path id="path4629" d="m1050.7 1172.3v1.43-0.71-0.72" fill="url(#radialGradient4639-2)"/>
   </g>
  </g>
  <g id="g4631" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g4633" clip-path="url(#clipPath4635-1)">
    <path id="path4645" d="m968.38 1031.8c51.305 37.97 82.295 87.29 82.295 141.21v-0.72c-0.28-53.63-31.21-102.69-82.295-140.49m-568.34 46.3c-22.008 28.67-34.359 60.88-34.359 94.91 0-34.03 12.351-66.24 34.359-94.91m650.63 94.91c0 15.69-2.63 31-7.61 45.75 4.91-14.53 7.53-29.6 7.61-45.04v-0.71" fill="url(#radialGradient4639-2)"/>
   </g>
  </g>
  <g id="g4647" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g4649" clip-path="url(#clipPath4651-8)">
    <g id="g4655" transform="matrix(696.2,0,0,453.2,359.9,945.9)">
     <image id="image4657" xlink:href="data:image/png;base64,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" transform="matrix(1,0,0,-1,0,1)" height="1" width="1" preserveAspectRatio="none"/>
    </g>
   </g>
  </g>
  <path id="path4659" d="m455.87 188.84h-9.1802c-21.737 0-39.423 17.685-39.423 39.422v523.07c-27.34 15.644-44.509 44.775-44.509 76.826 0 48.811 39.711 88.522 88.522 88.522 48.81 0 88.522-39.712 88.522-88.522 0-32.052-17.169-61.182-44.509-76.826v-523.07c0-21.738-17.685-39.422-39.423-39.422m0 15.5c13.158 0 23.923 10.765 23.923 23.922v532.65c26.161 11.106 44.509 37.031 44.509 67.242 0 40.33-32.692 73.022-73.022 73.022-40.329 0-73.022-32.692-73.022-73.022 0-30.211 18.349-56.136 44.509-67.242v-532.65c0-13.158 10.766-23.922 23.923-23.922h9.1802" fill="#100f0d"/>
  <g id="g4661" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g4663" clip-path="url(#clipPath4665-6)">
    <path id="path4679" d="m744.9 5941.9h-73.442c-154.37 0-279.96-125.59-279.96-279.96v-4205.5c-218.11-116.2-356.07-343.2-356.07-593.65-0.004-370.96 301.79-672.75 672.75-672.75 370.95 0 672.74 301.79 672.74 672.75 0 250.48-137.96 477.48-356.07 593.7v4205.5c0 154.37-125.59 279.96-279.96 279.96m0-88.58c105.26 0 191.39-86.12 191.39-191.38v-4261.2c209.29-88.85 356.07-296.25 356.07-537.94 0-322.63-261.54-584.18-584.17-584.18s-584.18 261.55-584.18 584.18c0 241.69 146.79 449.09 356.07 537.94v4261.2c0 105.26 86.125 191.38 191.39 191.38h73.442" fill="url(#linearGradient4669)"/>
   </g>
  </g>
  <g id="g4681" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g4683" clip-path="url(#clipPath4685-6)">
    <path id="path4697" d="m530.13 2115.4v3574.2c0 30.46 24.695 55.16 55.16 55.16s55.16-24.7 55.16-55.16v-3514c-43.328-7.13-81.883-28.96-110.32-60.14" fill="url(#linearGradient4689)"/>
   </g>
  </g>
  <g id="g4699" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g4701" clip-path="url(#clipPath4703-4)">
    <path id="path4713" d="m585.29 1531.7c-30.465 0-55.16 24.69-55.16 55.16v528.52c28.437 31.18 66.992 53.01 110.32 60.14v-588.66c0-30.47-24.695-55.16-55.16-55.16" fill="url(#linearGradient4707)"/>
   </g>
  </g>
  <g id="g6093" transform="matrix(.125 0 0 -.125 362.76 936)">
   <g id="g6095" clip-path="url(#clipPath6097-3)">
    <g id="g6101" transform="matrix(658.2,0,0,184.2,378.9,98.9)">
     <image id="image6103" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAARIAAABMCAYAAAChxDgQAAAABHNCSVQICAgIfAhkiAAAGQJJREFUeJztnfuvdkdVx78z8/ysgsVSSlt7oyU0habSVNAabVKTkrQJjVhM0XIppNimCDXIxaYRBIkVJY00llgEmt5LacGaYNQEjUYiUQlGEv0PvKD+/sz4w8yavWbtNbNnP+fynPN2vsmb9zx7rnufM5/zXWvP3sd47wOGuuXDyblcwfvuulfc+kx3XWNdx9jbrr6++/gt3eO2x+s716XvTlj4/q25pr391sq0sWp1tZ87ra5+zHfUCe3PYq5BXGkzQLJOpxUkXf0dpO0RX5cBkpMNEjvrcWhoaGilBkiGhoYOrM3Lf+SHAAD//T//t+epDA0NnTa99rLLAAAbOjCAMjQ01CsCCGkjKwygDA0N1XT5Za9Rj89AQhpAGRoaItUAQqqChDSAMjT00tVll17SVW8RJKQBlKGhl456AULqBglpAGVo6MzVay65eKd2q0FCGkAZGjpztCtASDuDhDSAMjR0enXpxRcdSj8HBglpAGVo6PTosABCOjSQkAZQhoZOri656MIj6ffQQUIioAADKkND+9ZRAYR0ZCDhGi5laOj4dfGFFxzbWMcCEtIAytDQ0es4AUI6VpCQRtgzNHS4uujHz9/r+HsBCddwKUNDu2vfACGZP3vxG+Htt96673kUOslQGa9arLQdr1pcXbbrqxYvvOC8lbM7Wj3+xBMw3/j6CyGEgBACfvkdt+17ToVOIlAGSCptB0hWl60FyUkDyJe/8iiMMfHf1194PoOE/r3z9l/Z9xxnOilQGSCptB0gWV3WA5ILzn/1TvM5Sn3xT740AcQYAIB5/mvPZZAAcaHQ5zve/a59zreqfUJlgKTSdoBkdVkNJCcRHgDwhT9+JMPDEkAIKF977qshhFAABIgnFLyHDwF3vu+9+5x/U8cNlQGSStsBktVlfKzzzzt3p3GPQw/90cOwxsBYOzkQBhRjDMxzX302eBHa0AnG4x7BR9Dc/avv3+f5LOo4oDJAUmk7QLK67Lxzz9lprOPSg3/4+QQQA2PiH5zgQClg8uyzzwQJEQIIgAyREAK89/DB44P33LPP8+vSUUFlgKTSdoCkq+ykwwMAPvu5z8EaC5uAkcOYBBQNJuaZZ54OGkSCL3MmBJEc/viAez/0wX2eb7cOEyoDJJW2AyTVsle/6pU79XnceuD3PgtY7jQiTABMzqMGk6effipoEKEFU4PINgDeeyAEfOTDv77P81+tg4BlgKTSdoAkf31awEH69Gd+FzAG1lo4g91g8tRTT4a1ToRDBIh/B9RvY53f/NhH9nU9dtYasAyQVNq+xEFy7jln79RuX/rEb386gsElSMAcDCZPPvF4mNyHV3MiKkRigwIiIcQ/LRy8x/33fXwPl+fgWoLKAEml7UsMJKcNHKT7f+uTceGD3XlZAZNqzoRA0gMRAIUbqUGE+gCAT9x/3x4u1+GKw2WApNL2DAfJaQUH6WP33V+AQIMJBwmARZgUIHn88ceChAiAxZBGQgTADCTeT+Xee3zmU5/cz1U8ZP3nD/5331MAMECi1lsq7wDJaYcG6cMf/Xhe+CYBonQUbZhIkACowkQFyUFCGg0iQAKTj+0e+J1PHf9VPWLtAy4DJEq9pXIxz1ed/YodZ3Ryde9vfDQCAYC1pgqTwwhxMkgee+zRsPYuzS5uhCBC7Xyq++DvP7CHS308Omq4DJAo9Rpl5/zYWYczmROou3/tXlgOiuQuWiAB1rsSSxvTBEyK95FIiPRKg0iv7vrAhzJ0HnrwD7rbnQad9bIfVo+flNDoTNWZDAyuO+/+QIbDknhkYK2FBzJMFuUDQhrCw2eYcDVfbMTdyFqFHaBy5133YOs9Hv78g+sHPEWqAQYYkOnVK18isND03vffDdcDDwTE5ee7YFM2TmuXXMmCut+QtgYI87YxrOnVHXfeFV2KD3jkCw/tPO5pVAsypDMdNmef9fJ9T+HE6V133Alj+92H3/qc81irgJBzLL3a+6sWl3T7u9+XbdmXHnl4z7M5GeqBjdR//NcPjmAmyxpQ2F233f4eOPbE7XFoVwCdeJBw3Xb7e3K49PhXvrjv6ZwqveJHX7bvKQx16O3veOf6METoIODZ1cV0g8Rau3N4Y62B91gV3shxZfL31ttuh99uEULA0088utO8hoZOgn7h1tvSHROXjxljuvIgNe0KBGC6/btGVZAQ1YIF3MqEK4fOWgA5a7HNmeXp2Z+W3vq2X4pfBI+tD3j+2Sf7Jzs0dMy6+ZZfBAA4awDlDghXvmXLbuP2St7+XSt++3dJGSTWmHhLyFrAAz70LX5jTHx4z1pY7+HRt6cgjuPzmN776FcW2tKF9d7DOge/3Wb4kG5669uyi/nT55/tOo+hoaPUW26+pbhVSxBxed+H676V66wFxL6QHmkb0nqlPcDHtTHGAnb5N38kU1zAJkTrRJvLeiYPeHjf1066Eos4rgQGHyOWAc56bP0Ep7fcfEve4+K9xzdffKE536Ghw9ANN94Ea8tH7WkRLzkR+nle40Zam9Faqm1GW5Lc2ToLbfLC93HzCRDDG1RAk09OuJJabgOYYNLrSow1M5hIV8Iqz2BC84K1uOHGm6ZXSXqPv/jmi4sXbWioR9ffcGNa+LYNkSTNjUiISGluhENEU2t7fE1LrxOQ2sSQJroS6/WnW40xOVeiuZLZJFiYxHMl5Ep40rUGEwkMsPIaTLJjWYAJzdgifvPpxU5b7/Gtv/rzxuUdGpr0s9f/fAEKAH0QqYQ0HCIk7kZqEOFa2hovtbQ1XpP29O/GZBfBYAKWK0HpKmohDoDsSug3Ps9nACVMZIgj4TODSVr+S85k4xxCCGqYQzCxzsVQBxEmeQdf+uHYeo+Q3NTffOsvO3+shs5k/dR1PxcXXc5x2BIUdvpt3Qpn6E5MjxNZggip5/maXLfysJ58hQBp6WE90qZsVIcJUIY4tDhrMLEpL9EDkzz5BWcCQM2ZZKey2aRdfVs1ZwIA3hiEEAp3QpeDyhyAbZrPT//M9bHP4CP4EPD3f/vXfT99Q6dW177pOlhn83MlBBEOEADVUCaXCYjw27w1iBgr29edSC9EWk/8yrxIzxO/JOpzY4wpFj6QSNiACd0O7oEJgGaYQ/e7WzkT5xwQQjUBCwDbBAEZ6gAWMD7fGubuxKUL4cnVILoT4xxMclZb7wHv4YyDNRY+eFz7putyeOaTe/mHb//dQX5uh/aoN177ZgBpUcLsDBCqryVVa6FMUWbt3IXETps5kZ5wpgcirbyIDKPkO1s32SLxEAdYdCYOiO6kARNjLQIwS8DSpCM34isGtASsS2GK6k4sYLyJ71ER7oS+oTN34hCBwqAjgWISGIDoUDhQDOKYBBS/9XDWIViLN1775twuvpbB4x+/8+2dfrCHjkZXXX0NrJl+4xMI8rs7EkBoTfQAhOr15kJyHytdCIAZRDhAeNvabd7F1wUAXU5Ee4v8BJI4E+Yi6mEOLdJaAhbAlP9Q7uYAyHd0NHditgaWXmkABiBj4IxR3Qld6MDLWLhj0i7YGlCMczAhFA7FJYh49s3IUPEmQiSFPQYGsC49cRnLf+Kan8xQ4ecMAN/9p++sXwlDXbryDVcXC7AHHkDpPqguz4EAWHYgsWE3QGL1eS5E9t3rQvg4mgvhbWVi1fBxGzkR7e/abCjJSR0EM+UQNJhQSCFDHTBAIAQ11InrN4ZQve4khxts0RfhjjEINoU0Eijpf36MgFKEPKyeNyYDBUDTpQDogoqFQ/DTexx88Ljq6msKsNC1CN7jX773z82F8lLX6654PYAJCgCKRZTBYE0BgLXw4GNo7oPat0KYPHYPQGKHq3Ih+RyUNruGMsV4DCISoFOb5EhsOoHi1i8PdayHg8mvY5ShDpyBoxdEN9xJEO6kCF2YO4mbe01+oxqFO3SRl4DirEPwoXAoNBYdA5CgMgEFYLkW+mYQVNKdngwV5+J5Cqdi4RAsA0QKgTSwOOeyY3GpPziHK99wdWzL4FJ8Tn1//1+/hzNNl7/2imIBAihgAGBWLh0HlXFw5HpK2EJ9SnjENo0Eaqxc3LJdyoHEJgcDCD/ekwuha1C7vdvKh7T+ul4ezxhsrLV5kdMyJpHdDz5BhrkT5xxssPmNasDkTpyzxasZyWFMIVE80aAAZVroJVDM1kxzFA6lCHmoPcuh0Em3XAoQ55Ch4iy2PixCBXQe6bcQ7UkBUAULgHwHCJgDY/rbQjpA6PMVV15VvIKQP9PEb9lrzzrRsX//t+/PynbVJZdenhcLl3ZLUZbx7dotYMS6c2gAqDoOqitdB7WVYYtaR4EH9V9zH7ncTklUOtYKYXg/SwDJ7QVAprnNb+3u8ndrqIy7EA6UMkcCwNECZe9jzbkT4+BNgKGXRdM3Ma75+IpGE9vJcMe5yWGsAQqFPNyhRIhJ8KRxElAAZJdifAKJLx0JQYWDZgaV2DBDJTuREJKj8PApbONAoLtH+Z223LGQa1LgAmARMEWbCjxkGe+H63VXvP5AL60iaQCRz3L0AIW/xq8HGLwNhwaALnDE9vOcB3295DxynxV4aOXcfeT60lns6EByf50A4X33/sFwGqPIkfDB+cucc5BBx2lhp3DHOGSg5MUpgMLDHaAPKLPwJS1Ym8IW+iEil0JA4edAn7lLAVCHinNxE1oaK48LpFcVWDgXHYZ0K+D1E1jIsRQgcC4nsjlcAOTnh4IVzkMAhs6brmU+VnwtYKI8fNkLDgkm+UunJtWViGdL+F4EzY0Ay8DgbWWYwvuqOQ6qWwNH7lfAY+YsZD/i2Rh+B4bmUXMfdN7yqd3DBAhdy947MrlvAQ9etnGblGNgP6zZ8iewyGSsSfZ9LVB4yENAAVgOxcbbxZSUlW4jXkz2ObkUBxdzKWG6FcxfRL1J4Rs4NBSoAFP4Q1/X3IoGFqpHe1IkMDw7F55noQ1KS4DhdWJ/LKxRYMNVg8dhvYm+9iSp6lTYUx78vRmFG6nAQo61FhpF3U5wUBsOhtLh6HU0eMTz7Hcf/HPrVm6+rjs4kHgt+gECNrZz8TyjIzEsx8C2rc+Awo93ACXf4eEhDwBnbPF3crhLyYuJuxQ2F+4+yKXQRSSXAkCFCiDCHwYVh+Qs/ORKAORkLQAEcXxyLAwswJS4Fa6F4JKdC8pnm2QoY70OEL7485ibORS0ByZ7Xw+hPUMFlAu/Je1N49LRSPjwF/nIxQ/Uk69xvN2gUdRtgIPqSdcx9V2GLbwP6TziWP3woPOquo80biuJKvtcCxDeHwcIHc/JVppML1B4yENAmeVQKCyRSdnkUggoQNulAMhQkW6D5m8tA0d62TR3KjQGdxhVtxI6wRLKMkfjLMCF2pJkMrVIoIoEqyzfyDIFHjXXob2Soeh4pWpv9NLcioSKVSDCjxe7KluQyYt/HTTKtnZe1gAHHZM5D2qvhS28rOZa+BO6a9zHNAer9DklUelaSrfR40D4sRjaGAuPkB0DXRwJlAwOBhQYkxd1oM5DusuTgAJMoYMNU66EXMoGaUEeMlSoH5lTcZggorkVDSxgbYC0bwZYDRf+uVjEAjLUDx+DHwPmcJBPbWuhjGxTY8VSDkULVzRpAJFt5dOrWtgi29VgEY/NgVF8VqBBnzk0ZN214Ihjs1vQyr6PWf0KPIq+WLuDuA/epnA+FYgQQGbuBLSPxJppjwgDCoGDA4XDJLsV5lJyu+xS4qDcpeQLH6YNaUUuBeiCCmhfCOZQoXbxAghwkCOgO0CYgwVQHEs8CAAz1wLocKG6QAyLePmG1ZGQ4e1iYx7KzGFDUuGhOBTg8HIjUrVciXQgQPsuDn9vhwYKXl++65T3rQGjKFegkeuzRUN1+KKfHWu4DupHg0+P86C+euFB51ZzH3wOWuiSrwMDSFEPJaRyaGMcLf4EFJQuxNE3WYQ9M5cCNF1K/JxChrRw10IFmEAAYLqjBOS/+qeBhcKNfMz6KlioDT8fOlaDC5S2EjC8joQMr8dBA0ywkcd5P9MAc0hsvQ4UqRp4pDQwaCqAkBvPYaMBAtAhAdQcSisJ2waMBg36bJVjcW6l46A6NXAA4lYzO17LeQDogsfUt377tmw7Bwf/7Nx0TWZ1GEB4uyJHEhd/yEABMAt7uEsBkKHCy2tQoWTjElSAevgDYLrzs7FACE23AtTBwjfjAREssazMsdTgAnbcCJDUAMP7cH5+jNctAJGeGdLqa3CJ12Nb1OHqBcZatQDDoVCr33YpdVAAc1jwej3AANCEBjB3G7xOy3HEtnNwUJ8z1xEnI9xD23nQ/DV45LKKAwGwGL5MY83rbJx1+W/9FqFLXuiTSwGQoUI/iDz0ASaHIkMfoA4V2Fi2lFOBTUBJeQh6N0ovWDTHQnOmcTTXEssm50J9y7Z0jvy4UQABtohboNlA2ReykFiV8GnV1dS7x6Q3TwLocNESszXHAUyQkGWaG5Gw4G3WACOW16FBx2WfMlSh/2XfS64j9jnfdUrXQwtb5u13h0dub+vtCXAb62zcSp4X+9xhkEsBUORScnkIRZJSQoW+1qACCq1CANKuT2/SohduhS/aXcECIIdcNkw7Llpw4Z/XAob3IfsGKqCJH/KXMnRp5UYIHa2XeR/GTtaWWpAxSqjTciGADglZT4OLVcqXgKHVrYUo8Xwmt0Hl6hgCXL3goLGWEqZ5ngpMavDQymTuoxb+lA890j4SO13Qw4YKUA9/6Gtf9N/nVhxcFSzR6psCLPGkfZ5TCy6xHGk8HQK9gNHG4vV5X3wcXsdhvvhVh1FxHc3bvEt9NtSfJ6mARWnfCnUKcCxABJjDItZtOwytbClEUceSbiN2lNusBQeN33Id8niP86A5a/DgX/P5GlaX6sxyJBpU8v6PDqjAxIWzlFPh/VnRd160dDuXyr3PYAkMLJpjAaZFTU5IupZ4EWifh+JclLCItAQYfiwv0I2AhgIbPn7RNrdp3/bV2vHMxFG7EVLTlSgAmb3EeMGl8I1xLVDwtj2wAHSXUdRdCQ36n+c4pmNTqBKP1cExa9MAiEyY8joybCnKVFDp8OB1N/TbIucvFKhYWATPF7ruVKYFH4HiQ79b4XV6wQJger8JwOASwSJdC7AeLkDFUVQcDM2JzztfzyTpZuTXLeDw+XDVdqIedm5EqntPScW9aDtlORjiGLr7kP22QAGsgwWfGwcG73stNPgcZIKU5rQrOAA9ZMlfKwnTVp81ePB6/Jw2ecMO/cZHGyqAHv5QPapbhC9LbiV+ANAGCx0rXIC1MdcRphwLuZZYZx1cYps0JwEY59iC64AMv9ujgYaudT6+4D5kuYRPrV3Z57rw5SCySj5kKmsnW7XPLYhokABQIGkNLPh4LWDEw3VocKfB51nLceR2ClDWgmM+hzpAZM6DX7NqOMXAt7GWHhjzYt/HfA8FLWzj2Ds96MG3hRCodBEJBgpYlhwLwFxAxbVQnR64FG0XABPr9EMGqIQsLJzksIn1Sy3tYOXzltr1Kd+16s2V1NxLT6gjN7ppgJBf18If6SyAOiz41z0uIx5fBw3+WasjQxWtHgcHzaXXdfC58zqqK5rlaeK8WI7EZhiH4MXdlCmEiOVs8dNOWBYCUZ1dwcLbyM1fW3FXhMNllvhU4FK0neU5dMAUfQrIlG6J/bCy3/wqbNL55C8FQjh0+PiU76gt/hYSjmo3a021Xa65XDumQKU3PwJZTzoKIIOC91s6mxIWvHwNMLT/e6EBoJrjyO0qjkPrtxcc8/q1u0N21nZjbJxUdAEpJDH0WsJYmdxKkfRE262sAQusAAHPsaBc/IYvLOZaeB3NufD/ewFT1BWQKcvm+Q845PNVHc3USf5yyygwg05sDCktXwJUciaVhX1QRwKscCWVp4dlXiR1WrYV868BQs6nFxSxXIdFWbYeGK3/l6ABYJbjoLJWCNQKV7T2S65jNi8zHdvQe0PjwvUZKiZMIUvNrRwmWIr/rZIb8RMEmnCJXwA4OGDUutX8Rh00xdwgAMGAYyEXtZ21TR1DkwRR0eSY3QiplYwtQFA0WnYlGhy0Met5FL6wrFJevz18GMBo1l9wG/T/HGB1x1Fv0+860uRmoAJSjiQY+s1pMlSAEizIa5ReT0if9TAotp+HGzIUivXLO0JFfeojJXBrcAFwaIDRyjIU2OsTtfr8/It2mGAT8zYilBGwaCZeHbUp4cCX09xlHJ0bAfodSaue9g6TxdvAEjAKIGS92hPGeqhTB0kvMGp1tbzGUv+a25if97LjmJfXwTG1Z3UKV2SxMayTYJAW7PR060HAojkWgMEhfc2Tt9K10Lj8M3cugOYaDgYYbSynHJNfa7CZJVMrwCna57q83BXnJlXbT6KNe5xaAowEQW6nuhLhPGYQaQNCfm0X6iwd63UYALqgUQ+V+qAh+2nfVj4YOFhVAMBms3HFwvY+xIomsWIHsMT/2YKhxGSRB2nAxZQLljsXOl6Fi3AvRdkCYIqXNfOF1wBN0b4CDPmZA4eX1RKpGgRaidMlqEz9Hm64Ixd6TTV4AFATtK2wRvtcA4T83A2KWFCtp4Uk8Vz6XcxSXmOpbSt/I78vhwEOK/I0/w95cGz/aFfF6gAAAABJRU5ErkJggg==" transform="matrix(1,0,0,-1,0,1)" height="1" width="1" preserveAspectRatio="none"/>
    </g>
   </g>
  </g>
 </g>
</svg>
\",\"data:image/svg+xml;base64,<svg id="svg6934" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="210.87mm" width="49.966mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 177.04375 747.16249" xmlns:dc="http://purl.org/dc/elements/1.1/">
 <defs id="defs6936">
  <linearGradient id="linearGradient5139" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1e-7 -2613.7 -2613.7 -1e-7 2652.4 3942.8)">
   <stop id="stop5141" stop-color="#c7e44b" offset="0"/>
   <stop id="stop5143" stop-color="#60ba65" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient5121" gradientUnits="userSpaceOnUse" gradientTransform="matrix(456.22 0 0 -456.22 2424.3 3494.3)">
   <stop id="stop5123" stop-color="#cac9c8" offset="0"/>
   <stop id="stop5125" stop-color="#f6f6f6" offset=".75269"/>
   <stop id="stop5127" stop-color="#d4d3d2" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient5101" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1345.5 0 0 -1345.5 1979.6 3065.9)">
   <stop id="stop5103" stop-color="#b3b3b2" offset="0"/>
   <stop id="stop5105" stop-color="#b3b3b2" offset=".1"/>
   <stop id="stop5107" stop-color="#feffff" offset=".24731"/>
   <stop id="stop5109" stop-color="#a3a3a1" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient5023" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1e-7 -2613.7 -2613.7 -1e-7 2652.4 3942.8)">
   <stop id="stop5025" stop-color="#a6d71c" offset="0"/>
   <stop id="stop5027" stop-color="#26803a" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient5005" gradientUnits="userSpaceOnUse" gradientTransform="matrix(456.22 0 0 -456.22 2424.3 3494.3)">
   <stop id="stop5007" stop-color="#a3a3a1" offset="0"/>
   <stop id="stop5009" stop-color="#ececec" offset=".75269"/>
   <stop id="stop5011" stop-color="#b3b3b2" offset="1"/>
  </linearGradient>
  <clipPath id="clipPath6109-9" clipPathUnits="userSpaceOnUse">
   <path id="path6111-4" clip-rule="evenodd" d="m2198.2 190.03c0 67.231 203.31 121.77 454.14 121.77s454.14-54.539 454.14-121.77c0-67.32-203.31-121.86-454.14-121.86s-454.14 54.543-454.14 121.86"/>
  </clipPath>
  <clipPath id="clipPath5135-7" clipPathUnits="userSpaceOnUse">
   <path id="path5137-8" d="m2529.5 1531.7c-30.46 0-55.16 24.69-55.16 55.16v2278.8c28.44 31.18 67 53 110.33 60.14v-2338.9c0-30.47-24.7-55.16-55.17-55.16"/>
  </clipPath>
  <clipPath id="clipPath5117-0" clipPathUnits="userSpaceOnUse">
   <path id="path5119-3" d="m2474.3 3865.6v1823.9c0 30.46 24.7 55.16 55.16 55.16 30.47 0 55.17-24.7 55.17-55.16v-1763.8c-43.33-7.14-81.89-28.96-110.33-60.14"/>
  </clipPath>
  <clipPath id="clipPath5097-6" clipPathUnits="userSpaceOnUse">
   <path id="path5099-3" d="m2689.1 5941.9h-73.44c-154.37 0-279.96-125.59-279.96-279.96v-4205.5c-218.11-116.22-356.07-343.22-356.07-593.7 0-370.96 301.79-672.75 672.75-672.75 370.95 0 672.74 301.79 672.74 672.75 0 250.48-137.95 477.48-356.07 593.7v4205.5c0 154.37-125.59 279.96-279.95 279.96m0-88.58c105.26 0 191.38-86.12 191.38-191.38v-4261.2c209.29-88.85 356.07-296.25 356.07-537.94 0-322.63-261.54-584.18-584.17-584.18-322.64 0-584.18 261.55-584.18 584.18 0 241.69 146.79 449.09 356.07 537.94v4261.2c0 105.26 86.12 191.38 191.39 191.38h73.44"/>
  </clipPath>
  <clipPath id="clipPath5083-5" clipPathUnits="userSpaceOnUse">
   <path id="path5085-5" d="m2652.4 955.89c-189.16 0-342.5 97.219-342.5 217.15 0 119.92 153.34 217.14 342.5 217.14 139.65 0 259.77-52.99 313.09-128.99 18.9-26.94 29.4-56.76 29.4-88.15 0-66.67-47.4-126.33-121.99-166.16-59.58-31.81-136.51-50.989-220.5-50.989"/>
  </clipPath>
  <clipPath id="clipPath5067-4" clipPathUnits="userSpaceOnUse">
   <path id="path5069-7" d="m2872.9 1006.9c74.59 39.83 121.99 99.49 121.99 166.16v-1.02c-0.48-66.26-47.76-125.51-121.99-165.14m121.99 166.16c0 31.39-10.5 61.21-29.4 88.15 18.7-26.65 29.18-56.13 29.4-87.14v-1.01"/>
  </clipPath>
  <radialGradient id="radialGradient5071-6" gradientUnits="userSpaceOnUse" cy="0" cx="0" gradientTransform="matrix(584.18 0 0 -584.18 2652.4 862.75)" r="1">
   <stop id="stop5073-5" stop-color="#a6d71c" offset="0"/>
   <stop id="stop5075-6" stop-color="#26803a" offset="1"/>
  </radialGradient>
  <clipPath id="clipPath5051-9" clipPathUnits="userSpaceOnUse">
   <path id="path5053-3" d="m2994.9 1172v1.02 1.01-1.01-1.02"/>
  </clipPath>
  <clipPath id="clipPath5035-2" clipPathUnits="userSpaceOnUse">
   <path id="path5037-5" d="m3236.5 862.75c0-322.64-261.54-584.18-584.17-584.18-322.64 0-584.18 261.54-584.18 584.18 0 322.63 261.54 584.18 584.18 584.18 322.63 0 584.17-261.55 584.17-584.18"/>
  </clipPath>
  <clipPath id="clipPath5019-4" clipPathUnits="userSpaceOnUse">
   <path id="path5021-3" d="m2880.5 1400.7c-70.08 29.76-147.17 46.22-228.1 46.22-80.94 0-158.03-16.46-228.11-46.22v2336.2c0 49.44 19 94.66 50.06 128.72v-2278.8c0-30.47 24.7-55.16 55.16-55.16 30.47 0 55.17 24.69 55.17 55.16v2338.9c10.09 1.66 20.45 2.52 31 2.52h73.44c105.26 0 191.38-86.12 191.38-191.38v-2336.2"/>
  </clipPath>
  <clipPath id="clipPath5001-8" clipPathUnits="userSpaceOnUse">
   <path id="path5003-6" d="m2880.5 3736.9c0 105.26-86.12 191.38-191.38 191.38h-73.44c-10.55 0-20.91-0.86-31-2.52v1763.8c0 30.46-24.7 55.16-55.17 55.16-30.46 0-55.16-24.7-55.16-55.16v-1823.9c-31.06-34.06-50.06-79.28-50.06-128.72v1925c0 105.26 86.12 191.38 191.39 191.38h73.44c105.26 0 191.38-86.12 191.38-191.38v-1925"/>
  </clipPath>
 </defs>
 <g id="layer1" transform="translate(-257.06 -200.97)">
  <g fill="#fff">
   <path id="path4715" d="m345.58 948.14c-48.89 0-88.522-10.632-88.522-23.75 0-7.0864 11.571-13.449 29.919-17.8 0.035 0.0298 0.0675 0.0585 0.1025 0.0897-18.22 4.335-29.7 10.663-29.7 17.71 0 13.069 39.489 23.664 88.201 23.664 48.711 0 88.201-10.595 88.201-23.664 0-7.0474-11.481-13.375-29.701-17.71 0.035-0.0312 0.067-0.06 0.1025-0.0897 18.348 4.351 29.919 10.713 29.919 17.8 0 13.118-39.632 23.75-88.521 23.75"/>
   <path id="path4717" d="m345.58 948.05c-48.712 0-88.201-10.595-88.201-23.664 0-7.0474 11.48-13.375 29.7-17.71 0.0337 0.0289 0.07 0.0611 0.1025 0.0914-18.089 4.3174-29.482 10.611-29.482 17.619 0 13.021 39.346 23.578 87.881 23.578s87.88-10.557 87.88-23.578c0-7.0074-11.394-13.301-29.482-17.619 0.033-0.0302 0.07-0.0625 0.1025-0.0914 18.22 4.335 29.701 10.663 29.701 17.71 0 13.069-39.49 23.664-88.201 23.664"/>
   <path id="path4719" d="m345.58 947.96c-48.535 0-87.881-10.557-87.881-23.578 0-7.0074 11.394-13.301 29.482-17.619 0.0362 0.0297 0.0687 0.0586 0.10375 0.0899-17.96 4.3026-29.265 10.562-29.265 17.529 0 12.974 39.201 23.491 87.56 23.491 48.358 0 87.559-10.518 87.559-23.491 0-6.9672-11.305-13.226-29.265-17.529 0.036-0.0312 0.069-0.0601 0.1038-0.0899 18.089 4.3174 29.482 10.611 29.482 17.619 0 13.021-39.345 23.578-87.88 23.578"/>
   <path id="path4721" d="m345.58 947.88c-48.359 0-87.56-10.518-87.56-23.491 0-6.9672 11.305-13.226 29.265-17.529 0.0325 0.0288 0.07 0.061 0.10375 0.0897-17.83 4.2866-29.048 10.511-29.048 17.439 0 12.926 39.058 23.406 87.239 23.406 48.18 0 87.239-10.48 87.239-23.406 0-6.9278-11.219-13.152-29.048-17.439 0.033-0.0287 0.07-0.061 0.1025-0.0897 17.96 4.3026 29.265 10.562 29.265 17.529 0 12.974-39.201 23.491-87.559 23.491"/>
   <path id="path4723" d="m345.58 947.79c-48.181 0-87.239-10.48-87.239-23.406 0-6.9278 11.218-13.152 29.048-17.439 0.035 0.0312 0.0675 0.0601 0.10375 0.0914-17.701 4.269-28.831 10.459-28.831 17.348 0 12.879 38.915 23.32 86.919 23.32 48.003 0 86.918-10.441 86.918-23.32 0-6.8886-11.13-13.079-28.831-17.348 0.036-0.0312 0.069-0.0601 0.105-0.0914 17.829 4.2866 29.048 10.511 29.048 17.439 0 12.926-39.059 23.406-87.239 23.406"/>
   <path id="path4725" d="m345.58 947.71c-48.004 0-86.919-10.441-86.919-23.32 0-6.8886 11.13-13.079 28.831-17.348 0.035 0.0312 0.0687 0.06 0.10375 0.0902-17.569 4.2526-28.614 10.41-28.614 17.257 0 12.831 38.77 23.234 86.598 23.234 47.826 0 86.598-10.403 86.598-23.234 0-6.8476-11.046-13.005-28.615-17.257 0.035-0.0303 0.069-0.059 0.1037-0.0902 17.701 4.269 28.831 10.459 28.831 17.348 0 12.879-38.915 23.32-86.918 23.32"/>
   <path id="path4727" d="m345.58 947.62c-47.828 0-86.598-10.403-86.598-23.234 0-6.8476 11.045-13.005 28.614-17.257 0.0337 0.0299 0.0712 0.0625 0.105 0.0914-17.441 4.2349-28.399 10.357-28.399 17.166 0 12.784 38.628 23.147 86.278 23.147 47.649 0 86.276-10.364 86.276-23.147 0-6.8086-10.958-12.931-28.399-17.166 0.034-0.0289 0.071-0.0615 0.105-0.0914 17.569 4.2525 28.615 10.41 28.615 17.257 0 12.831-38.771 23.234-86.598 23.234"/>
   <path id="path4729" d="m345.58 947.53c-47.65 0-86.278-10.364-86.278-23.147 0-6.8086 10.958-12.931 28.399-17.166 0.035 0.0308 0.0687 0.0595 0.105 0.0908-17.311 4.2187-28.182 10.307-28.182 17.075 0 12.736 38.484 23.061 85.956 23.061 47.471 0 85.955-10.325 85.955-23.061 0-6.7685-10.868-12.856-28.181-17.075 0.035-0.0312 0.069-0.06 0.1038-0.0908 17.441 4.2349 28.399 10.357 28.399 17.166 0 12.784-38.628 23.147-86.276 23.147"/>
   <path id="path4731" d="m345.58 947.45c-47.472 0-85.956-10.325-85.956-23.061 0-6.7685 10.871-12.856 28.182-17.075 0.035 0.0304 0.0687 0.0601 0.105 0.0904-17.184 4.2021-27.966 10.256-27.966 16.985 0 12.688 38.34 22.976 85.635 22.976s85.635-10.288 85.635-22.976c0-6.729-10.784-12.783-27.968-16.985 0.036-0.0303 0.07-0.06 0.1062-0.0904 17.314 4.2188 28.181 10.307 28.181 17.075 0 12.736-38.484 23.061-85.955 23.061"/>
   <path id="path4733" d="m345.58 947.36c-47.295 0-85.635-10.288-85.635-22.976 0-6.729 10.782-12.783 27.966-16.985 0.0337 0.0289 0.0712 0.0625 0.105 0.0914-17.054 4.1845-27.751 10.204-27.751 16.893 0 12.641 38.196 22.89 85.315 22.89 47.118 0 85.314-10.249 85.314-22.89 0-6.689-10.698-12.709-27.751-16.894 0.034-0.0289 0.072-0.0625 0.105-0.0914 17.184 4.2021 27.968 10.256 27.968 16.985 0 12.688-38.34 22.976-85.635 22.976"/>
   <path id="path4735" d="m345.58 947.28c-47.119 0-85.315-10.249-85.315-22.89 0-6.689 10.698-12.709 27.751-16.894 0.0362 0.0298 0.07 0.0595 0.10625 0.0897-16.925 4.169-27.536 10.154-27.536 16.804 0 12.594 38.052 22.804 84.994 22.804 46.94 0 84.994-10.21 84.994-22.804 0-6.6499-10.612-12.635-27.538-16.804 0.036-0.0303 0.07-0.06 0.1063-0.0897 17.054 4.1845 27.751 10.204 27.751 16.894 0 12.641-38.196 22.89-85.314 22.89"/>
   <path id="path4737" d="m345.58 947.19c-46.941 0-84.994-10.21-84.994-22.804 0-6.6499 10.611-12.635 27.536-16.804 0.035 0.0312 0.07 0.0601 0.10625 0.0914-16.796 4.1514-27.322 10.102-27.322 16.712 0 12.546 37.91 22.717 84.674 22.717 46.763 0 84.673-10.171 84.673-22.717 0-6.6099-10.526-12.561-27.322-16.712 0.036-0.0312 0.071-0.0601 0.1062-0.0914 16.925 4.169 27.538 10.154 27.538 16.804 0 12.594-38.054 22.804-84.994 22.804"/>
   <path id="path4739" d="m345.58 947.1c-46.764 0-84.674-10.171-84.674-22.717 0-6.6099 10.526-12.561 27.322-16.712 0.0362 0.0297 0.07 0.06 0.10625 0.0899-16.669 4.1352-27.108 10.053-27.108 16.622 0 12.499 37.766 22.631 84.352 22.631s84.351-10.133 84.351-22.631c0-6.5699-10.439-12.487-27.108-16.622 0.036-0.0299 0.071-0.0601 0.1063-0.0899 16.796 4.1514 27.322 10.102 27.322 16.712 0 12.546-37.91 22.717-84.673 22.717"/>
   <path id="path4741" d="m345.58 947.02c-46.586 0-84.352-10.133-84.352-22.631 0-6.5699 10.439-12.487 27.108-16.622 0.0362 0.0312 0.0712 0.0615 0.1075 0.0913-16.541 4.1176-26.894 10-26.894 16.531 0 12.451 37.621 22.545 84.031 22.545 46.409 0 84.031-10.094 84.031-22.545 0-6.5312-10.354-12.414-26.895-16.531 0.036-0.0298 0.071-0.06 0.1075-0.0913 16.669 4.1352 27.108 10.053 27.108 16.622 0 12.499-37.765 22.631-84.351 22.631"/>
   <path id="path4743" d="m345.58 946.93c-46.41 0-84.031-10.094-84.031-22.545 0-6.5312 10.352-12.414 26.894-16.531 0.035 0.0297 0.0712 0.06 0.1075 0.0899-16.415 4.1015-26.681 9.9501-26.681 16.441 0 12.404 37.479 22.459 83.711 22.459 46.231 0 83.71-10.055 83.71-22.459 0-6.4912-10.266-12.34-26.68-16.441 0.035-0.0299 0.071-0.0601 0.1062-0.0899 16.541 4.1176 26.895 10 26.895 16.531 0 12.451-37.622 22.545-84.031 22.545"/>
   <path id="path4745" d="m345.58 946.84c-46.232 0-83.711-10.055-83.711-22.459 0-6.4912 10.266-12.34 26.681-16.441 0.035 0.0312 0.0712 0.0615 0.1075 0.0912-16.289 4.084-26.468 9.8975-26.468 16.35 0 12.356 37.335 22.373 83.39 22.373s83.389-10.016 83.389-22.373c0-6.4526-10.179-12.266-26.466-16.35 0.035-0.0297 0.071-0.06 0.1075-0.0912 16.414 4.1015 26.68 9.9501 26.68 16.441 0 12.404-37.479 22.459-83.71 22.459"/>
   <path id="path4747" d="m345.58 946.76c-46.055 0-83.39-10.016-83.39-22.373 0-6.4526 10.179-12.266 26.468-16.35 0.035 0.0303 0.0712 0.0601 0.1075 0.0914-16.159 4.0664-26.254 9.8461-26.254 16.259 0 12.309 37.19 22.288 83.069 22.288 45.878 0 83.069-9.979 83.069-22.288 0-6.4126-10.096-12.192-26.255-16.259 0.036-0.0312 0.072-0.0611 0.1088-0.0914 16.288 4.084 26.466 9.8975 26.466 16.35 0 12.356-37.334 22.373-83.389 22.373"/>
   <path id="path4749" d="m345.58 946.67c-45.879 0-83.069-9.979-83.069-22.288 0-6.4126 10.095-12.192 26.254-16.259 0.0362 0.0303 0.0725 0.06 0.10875 0.0898-16.031 4.0489-26.042 9.7965-26.042 16.169 0 12.261 37.048 22.201 82.749 22.201 45.7 0 82.748-9.94 82.748-22.201 0-6.3725-10.011-12.12-26.042-16.169 0.036-0.0298 0.072-0.0595 0.1087-0.0898 16.159 4.0664 26.255 9.8461 26.255 16.259 0 12.309-37.191 22.288-83.069 22.288"/>
   <path id="path4751" d="m345.58 946.59c-45.701 0-82.749-9.94-82.749-22.201 0-6.3725 10.011-12.12 26.042-16.169 0.0363 0.0304 0.0725 0.0616 0.10875 0.0914-15.906 4.0312-25.83 9.7441-25.83 16.078 0 12.214 36.904 22.115 82.428 22.115 45.523 0 82.426-9.9009 82.426-22.115 0-6.3335-9.9237-12.046-25.83-16.078 0.036-0.0298 0.074-0.061 0.1088-0.0914 16.031 4.0489 26.042 9.7965 26.042 16.169 0 12.261-37.048 22.201-82.748 22.201"/>
   <path id="path4753" d="m345.58 946.5c-45.524 0-82.428-9.9009-82.428-22.115 0-6.3335 9.9238-12.046 25.83-16.078 0.0362 0.0303 0.0725 0.0615 0.10875 0.0913-15.779 4.0137-25.619 9.6914-25.619 15.986 0 12.166 36.761 22.029 82.108 22.029 45.346 0 82.106-9.8628 82.106-22.029 0-6.2949-9.84-11.973-25.619-15.986 0.036-0.0297 0.072-0.061 0.1087-0.0913 15.906 4.0312 25.83 9.7441 25.83 16.078 0 12.214-36.904 22.115-82.426 22.115"/>
   <path id="path4755" d="m345.58 946.41c-45.346 0-82.108-9.8628-82.108-22.029 0-6.2949 9.84-11.973 25.619-15.986 0.0363 0.0304 0.0738 0.0601 0.11 0.0899-15.652 3.9976-25.408 9.6416-25.408 15.896 0 12.119 36.616 21.942 81.786 21.942 45.169 0 81.785-9.8237 81.785-21.942 0-6.2549-9.7538-11.899-25.406-15.896 0.036-0.0297 0.072-0.0595 0.1088-0.0899 15.779 4.0138 25.619 9.6915 25.619 15.986 0 12.166-36.76 22.029-82.106 22.029"/>
   <path id="path4757" d="m345.58 946.33c-45.17 0-81.786-9.8237-81.786-21.942 0-6.2549 9.755-11.899 25.408-15.896 0.0362 0.0303 0.0725 0.0615 0.10875 0.0914-15.526 3.9799-25.195 9.5889-25.195 15.805 0 12.071 36.472 21.856 81.465 21.856 44.991 0 81.465-9.7852 81.465-21.856 0-6.2162-9.67-11.825-25.196-15.805 0.036-0.0299 0.074-0.0611 0.11-0.0914 15.652 3.9976 25.406 9.6416 25.406 15.896 0 12.119-36.616 21.942-81.785 21.942"/>
   <path id="path4759" d="m345.58 946.24c-44.992 0-81.465-9.7852-81.465-21.856 0-6.2162 9.6688-11.825 25.195-15.805 0.0363 0.0302 0.075 0.0615 0.11125 0.0912-15.399 3.9614-24.986 9.5377-24.986 15.714 0 12.024 36.33 21.77 81.145 21.77 44.814 0 81.144-9.7461 81.144-21.77 0-6.1762-9.5875-11.752-24.986-15.714 0.038-0.0297 0.075-0.061 0.1112-0.0912 15.526 3.9799 25.196 9.5889 25.196 15.805 0 12.071-36.474 21.856-81.465 21.856"/>
   <path id="path4761" d="m345.58 946.16c-44.815 0-81.145-9.7461-81.145-21.77 0-6.1762 9.5875-11.752 24.986-15.714 0.0362 0.0289 0.0737 0.0601 0.11 0.0904-15.272 3.9448-24.775 9.4858-24.775 15.624 0 11.976 36.186 21.685 80.824 21.685s80.823-9.709 80.823-21.685c0-6.1378-9.5025-11.679-24.775-15.624 0.036-0.0303 0.074-0.0615 0.11-0.0904 15.399 3.9614 24.986 9.5376 24.986 15.714 0 12.024-36.33 21.77-81.144 21.77"/>
  </g>
  <g>
   <path id="path4763" d="m345.58 946.07c-44.638 0-80.824-9.709-80.824-21.685 0-6.1378 9.5025-11.679 24.775-15.624 0.0388 0.0308 0.0725 0.0595 0.11125 0.0907-15.146 3.9278-24.566 9.4351-24.566 15.533 0 11.929 36.042 21.599 80.504 21.599 44.46 0 80.503-9.6699 80.503-21.599 0-6.0976-9.42-11.605-24.566-15.533 0.039-0.0312 0.072-0.06 0.1113-0.0907 15.272 3.9448 24.775 9.4858 24.775 15.624 0 11.976-36.185 21.685-80.823 21.685" fill="#feffff"/>
   <path id="path4765" d="m345.58 945.98c-44.461 0-80.504-9.6699-80.504-21.599 0-6.0976 9.42-11.605 24.566-15.533 0.0362 0.0303 0.075 0.0615 0.11125 0.0914-15.022 3.9086-24.356 9.3827-24.356 15.441 0 11.881 35.899 21.513 80.182 21.513s80.181-9.6314 80.181-21.513c0-6.0586-9.3337-11.533-24.356-15.441 0.036-0.0299 0.075-0.0611 0.1112-0.0914 15.146 3.9278 24.566 9.4351 24.566 15.533 0 11.929-36.042 21.599-80.503 21.599" fill="#feffff"/>
   <path id="path4767" d="m345.58 945.9c-44.284 0-80.182-9.6314-80.182-21.513 0-6.0586 9.3338-11.533 24.356-15.441 0.0362 0.0287 0.075 0.0615 0.11125 0.0902-14.895 3.8921-24.146 9.3326-24.146 15.351 0 11.834 35.755 21.426 79.861 21.426s79.861-9.5923 79.861-21.426c0-6.0185-9.2512-11.459-24.148-15.351 0.036-0.0287 0.075-0.0615 0.1113-0.0902 15.022 3.9086 24.356 9.3828 24.356 15.441 0 11.881-35.899 21.513-80.181 21.513" fill="#fefeff"/>
   <path id="path4769" d="m345.58 945.81c-44.106 0-79.861-9.5923-79.861-21.426 0-6.0185 9.2512-11.459 24.146-15.351 0.0387 0.0312 0.0738 0.0601 0.1125 0.0909-14.77 3.8755-23.939 9.2802-23.939 15.26 0 11.786 35.611 21.34 79.541 21.34 43.929 0 79.54-9.5537 79.54-21.34 0-5.98-9.1675-11.385-23.939-15.26 0.039-0.0308 0.074-0.0596 0.1125-0.0909 14.896 3.8921 24.148 9.3326 24.148 15.351 0 11.834-35.755 21.426-79.861 21.426" fill="#fefefe"/>
   <path id="path4771" d="m345.58 945.73c-43.93 0-79.541-9.5537-79.541-21.34 0-5.98 9.1688-11.385 23.939-15.26 0.0362 0.0303 0.0762 0.0615 0.1125 0.0913-14.645 3.8565-23.73 9.2276-23.73 15.169 0 11.739 35.468 21.255 79.22 21.255 43.751 0 79.219-9.5161 79.219-21.255 0-5.9414-9.0837-11.312-23.73-15.169 0.036-0.0298 0.076-0.061 0.1125-0.0913 14.771 3.8755 23.939 9.2802 23.939 15.26 0 11.786-35.611 21.34-79.54 21.34" fill="#fefefe"/>
   <path id="path4773" d="m345.58 945.64c-43.752 0-79.22-9.5161-79.22-21.255 0-5.9414 9.085-11.312 23.73-15.169 0.0388 0.0312 0.0738 0.0591 0.1125 0.0904-14.521 3.8399-23.522 9.1772-23.522 15.079 0 11.691 35.325 21.169 78.9 21.169 43.574 0 78.899-9.4776 78.899-21.169 0-5.9014-9.0012-11.239-23.522-15.079 0.039-0.0312 0.074-0.0591 0.1125-0.0904 14.646 3.8565 23.73 9.2276 23.73 15.169 0 11.739-35.468 21.255-79.219 21.255" fill="#fdfefe"/>
   <path id="path4775" d="m345.58 945.55c-43.575 0-78.9-9.4776-78.9-21.169 0-5.9014 9.0012-11.239 23.522-15.079 0.0375 0.0297 0.0775 0.0625 0.11375 0.0914-14.395 3.8208-23.315 9.125-23.315 14.987 0 11.644 35.181 21.083 78.579 21.083s78.578-9.439 78.578-21.083c0-5.8622-8.92-11.166-23.315-14.987 0.038-0.0289 0.076-0.0616 0.1137-0.0914 14.521 3.8399 23.522 9.1772 23.522 15.079 0 11.691-35.325 21.169-78.899 21.169" fill="#fdfefe"/>
   <path id="path4777" d="m345.58 945.47c-43.398 0-78.579-9.439-78.579-21.083 0-5.8622 8.92-11.166 23.315-14.987 0.0387 0.0312 0.075 0.06 0.11375 0.0907-14.271 3.8042-23.108 9.0728-23.108 14.896 0 11.596 35.036 20.996 78.258 20.996 43.22 0 78.258-9.3999 78.258-20.996 0-5.8238-8.8363-11.092-23.109-14.896 0.039-0.0308 0.075-0.0595 0.1138-0.0907 14.395 3.8208 23.315 9.125 23.315 14.987 0 11.644-35.18 21.083-78.578 21.083" fill="#fdfdfe"/>
   <path id="path4779" d="m345.58 945.38c-43.221 0-78.258-9.3999-78.258-20.996 0-5.8238 8.8362-11.092 23.108-14.896 0.0362 0.0289 0.0775 0.0615 0.11375 0.0914-14.146 3.7851-22.901 9.0214-22.901 14.805 0 11.549 34.894 20.91 77.938 20.91 43.043 0 77.936-9.3613 77.936-20.91 0-5.7838-8.755-11.02-22.901-14.805 0.036-0.0299 0.078-0.0625 0.1137-0.0914 14.272 3.8042 23.109 9.0728 23.109 14.896 0 11.596-35.038 20.996-78.258 20.996" fill="#fdfdfd"/>
   <path id="path4781" d="m345.58 945.3c-43.044 0-77.938-9.3613-77.938-20.91 0-5.7838 8.755-11.02 22.901-14.805 0.0387 0.0312 0.0762 0.06 0.115 0.0902-14.025 3.7686-22.695 8.9697-22.695 14.715 0 11.501 34.75 20.824 77.616 20.824 42.865 0 77.615-9.3223 77.615-20.824 0-5.7451-8.67-10.946-22.695-14.715 0.04-0.0303 0.076-0.059 0.115-0.0902 14.146 3.7851 22.901 9.0214 22.901 14.805 0 11.549-34.894 20.91-77.936 20.91" fill="#fdfdfd"/>
   <path id="path4783" d="m345.58 945.21c-42.866 0-77.616-9.3223-77.616-20.824 0-5.7451 8.67-10.946 22.695-14.715 0.0362 0.0299 0.0775 0.0625 0.115 0.0914-13.901 3.75-22.49 8.9175-22.49 14.624 0 11.454 34.608 20.737 77.296 20.737 42.689 0 77.295-9.2837 77.295-20.737 0-5.706-8.5888-10.874-22.49-14.624 0.038-0.0289 0.079-0.0615 0.115-0.0914 14.025 3.7686 22.695 8.9697 22.695 14.715 0 11.501-34.75 20.824-77.615 20.824" fill="#fcfdfd"/>
   <path id="path4785" d="m345.58 945.12c-42.689 0-77.296-9.2837-77.296-20.737 0-5.706 8.5888-10.874 22.49-14.624 0.0387 0.0312 0.0763 0.0595 0.115 0.0907-13.778 3.7315-22.284 8.8652-22.284 14.533 0 11.406 34.462 20.652 76.975 20.652 42.511 0 76.974-9.2461 76.974-20.652 0-5.6675-8.5062-10.801-22.284-14.533 0.04-0.0312 0.076-0.0595 0.115-0.0907 13.901 3.75 22.49 8.9175 22.49 14.624 0 11.454-34.606 20.737-77.295 20.737" fill="#fcfdfd"/>
   <path id="path4787" d="m345.58 945.04c-42.512 0-76.975-9.2461-76.975-20.652 0-5.6675 8.5062-10.801 22.284-14.533 0.0387 0.0312 0.0762 0.0601 0.11625 0.0914-13.652 3.7139-22.079 8.8139-22.079 14.441 0 11.359 34.319 20.566 76.654 20.566 42.334 0 76.654-9.2075 76.654-20.566 0-5.6275-8.4275-10.728-22.079-14.441 0.039-0.0312 0.076-0.0601 0.115-0.0914 13.778 3.7315 22.284 8.8652 22.284 14.533 0 11.406-34.462 20.652-76.974 20.652" fill="#fcfcfd"/>
   <path id="path4789" d="m345.58 944.95c-42.335 0-76.654-9.2075-76.654-20.566 0-5.6275 8.4262-10.728 22.079-14.441 0.0362 0.0287 0.0787 0.0625 0.115 0.0912-13.529 3.6954-21.874 8.7612-21.874 14.35 0 11.311 34.176 20.48 76.334 20.48s76.333-9.1689 76.333-20.48c0-5.5889-8.345-10.655-21.874-14.35 0.036-0.0287 0.079-0.0625 0.1163-0.0912 13.651 3.7139 22.079 8.8139 22.079 14.441 0 11.359-34.32 20.566-76.654 20.566" fill="#fcfcfc"/>
   <path id="path4791" d="m345.58 944.87c-42.158 0-76.334-9.1689-76.334-20.48 0-5.5889 8.345-10.655 21.874-14.35 0.04 0.0303 0.0775 0.0601 0.1175 0.0914-13.405 3.6762-21.67 8.709-21.67 14.259 0 11.264 34.031 20.394 76.012 20.394 41.98 0 76.011-9.1299 76.011-20.394 0-5.5498-8.265-10.582-21.669-14.259 0.039-0.0312 0.076-0.0611 0.1162-0.0914 13.529 3.6954 21.874 8.7612 21.874 14.35 0 11.311-34.175 20.48-76.333 20.48" fill="#fbfcfc"/>
   <path id="path4793" d="m345.58 944.78c-41.981 0-76.012-9.1299-76.012-20.394 0-5.5498 8.265-10.582 21.67-14.259 0.0387 0.0298 0.0775 0.06 0.11625 0.0898-13.284 3.6602-21.465 8.6578-21.465 14.169 0 11.216 33.888 20.308 75.691 20.308s75.691-9.0914 75.691-20.308c0-5.5112-8.1825-10.509-21.466-14.169 0.039-0.0298 0.078-0.06 0.1175-0.0898 13.404 3.6762 21.669 8.709 21.669 14.259 0 11.264-34.031 20.394-76.011 20.394" fill="#fbfcfc"/>
   <path id="path4795" d="m345.58 944.69c-41.804 0-75.691-9.0914-75.691-20.308 0-5.5112 8.1812-10.509 21.465-14.169 0.04 0.0312 0.0787 0.0616 0.1175 0.0914-13.161 3.6411-21.262 8.605-21.262 14.078 0 11.169 33.745 20.221 75.371 20.221s75.37-9.0522 75.37-20.221c0-5.4726-8.1013-10.436-21.262-14.078 0.04-0.0298 0.078-0.0601 0.1175-0.0914 13.284 3.6602 21.466 8.6578 21.466 14.169 0 11.216-33.889 20.308-75.691 20.308" fill="#fbfbfb"/>
   <path id="path4797" d="m345.58 944.61c-41.626 0-75.371-9.0522-75.371-20.221 0-5.4726 8.1012-10.436 21.262-14.078 0.04 0.0312 0.0787 0.0615 0.1175 0.0913-13.039 3.6226-21.059 8.5528-21.059 13.986 0 11.12 33.6 20.136 75.05 20.136 41.449 0 75.049-9.0161 75.049-20.136 0-5.4336-8.02-10.364-21.059-13.986 0.039-0.0297 0.079-0.06 0.1175-0.0913 13.161 3.6411 21.262 8.605 21.262 14.078 0 11.169-33.744 20.221-75.37 20.221" fill="#fbfbfb"/>
   <path id="path4799" d="m345.58 944.52c-41.45 0-75.05-9.0161-75.05-20.136 0-5.4336 8.02-10.364 21.059-13.986 0.04 0.0304 0.0788 0.0616 0.11875 0.0914-12.918 3.604-20.858 8.5-20.858 13.895 0 11.072 33.458 20.05 74.73 20.05 41.271 0 74.729-8.9776 74.729-20.05 0-5.395-7.94-10.291-20.858-13.895 0.04-0.0298 0.079-0.061 0.1188-0.0914 13.039 3.6226 21.059 8.5528 21.059 13.986 0 11.12-33.6 20.136-75.049 20.136" fill="#fafbfb"/>
   <path id="path4801" d="m345.58 944.44c-41.272 0-74.73-8.9776-74.73-20.05 0-5.395 7.94-10.291 20.858-13.895 0.04 0.0297 0.0788 0.0615 0.11875 0.0912-12.794 3.585-20.655 8.4488-20.655 13.804 0 11.025 33.314 19.964 74.409 19.964 41.094 0 74.408-8.939 74.408-19.964 0-5.3565-7.8588-10.219-20.655-13.804 0.04-0.0298 0.08-0.0615 0.1187-0.0912 12.918 3.604 20.858 8.5 20.858 13.895 0 11.072-33.458 20.05-74.729 20.05" fill="#fafbfb"/>
   <path id="path4803" d="m345.58 944.35c-41.095 0-74.409-8.939-74.409-19.964 0-5.355 7.8612-10.219 20.655-13.804 0.04 0.0299 0.0787 0.0611 0.11875 0.0914-12.672 3.5659-20.452 8.396-20.452 13.712 0 10.978 33.17 19.877 74.088 19.877s74.088-8.8999 74.088-19.877c0-5.3164-7.7813-10.146-20.454-13.712 0.04-0.0302 0.08-0.0615 0.1188-0.0914 12.796 3.585 20.655 8.4472 20.655 13.804 0 11.025-33.314 19.964-74.408 19.964" fill="#fafafa"/>
   <path id="path4805" d="m345.58 944.26c-40.918 0-74.088-8.8999-74.088-19.877 0-5.3164 7.78-10.146 20.452-13.712 0.04 0.0297 0.08 0.061 0.12 0.0913-12.55 3.5474-20.252 8.3438-20.252 13.621 0 10.93 33.026 19.791 73.768 19.791 40.74 0 73.766-8.8609 73.766-19.791 0-5.2774-7.7012-10.074-20.252-13.621 0.04-0.0303 0.08-0.0615 0.12-0.0913 12.672 3.5659 20.454 8.396 20.454 13.712 0 10.978-33.17 19.877-74.088 19.877" fill="#fafafa"/>
   <path id="path4807" d="m345.58 944.18c-40.741 0-73.768-8.8609-73.768-19.791 0-5.2774 7.7025-10.074 20.252-13.621 0.04 0.0299 0.08 0.0611 0.12 0.0914-12.431 3.5282-20.051 8.291-20.051 13.53 0 10.882 32.882 19.705 73.446 19.705 40.563 0 73.445-8.8227 73.445-19.705 0-5.2388-7.6188-10.002-20.051-13.53 0.04-0.0303 0.081-0.0615 0.12-0.0914 12.551 3.5474 20.252 8.3438 20.252 13.621 0 10.93-33.026 19.791-73.766 19.791" fill="#f9fafa"/>
   <path id="path4809" d="m345.58 944.09c-40.564 0-73.446-8.8227-73.446-19.705 0-5.2388 7.62-10.002 20.051-13.53 0.04 0.0298 0.08 0.061 0.12 0.0907-12.31 3.5102-19.851 8.2388-19.851 13.439 0 10.835 32.74 19.619 73.126 19.619 40.385 0 73.125-8.7836 73.125-19.619 0-5.2002-7.5413-9.9288-19.851-13.439 0.04-0.0297 0.081-0.061 0.12-0.0907 12.432 3.5282 20.051 8.291 20.051 13.53 0 10.882-32.882 19.705-73.445 19.705" fill="#f9f9f9"/>
   <path id="path4811" d="m345.58 944c-40.386 0-73.126-8.7836-73.126-19.619 0-5.2002 7.5412-9.9288 19.851-13.439 0.04 0.0303 0.0813 0.0615 0.12125 0.0914-12.188 3.4911-19.651 8.1865-19.651 13.348 0 10.788 32.596 19.534 72.805 19.534s72.804-8.7461 72.804-19.534c0-5.1611-7.4637-9.8565-19.651-13.348 0.04-0.0312 0.081-0.0611 0.1212-0.0914 12.31 3.5102 19.851 8.2388 19.851 13.439 0 10.835-32.74 19.619-73.125 19.619" fill="#f9f9f9"/>
   <path id="path4813" d="m345.58 943.92c-40.209 0-72.805-8.7461-72.805-19.534 0-5.1611 7.4638-9.8565 19.651-13.348 0.0412 0.0312 0.0788 0.059 0.12125 0.0912-12.068 3.4726-19.451 8.1339-19.451 13.256 0 10.74 32.451 19.448 72.484 19.448 40.031 0 72.484-8.7075 72.484-19.448 0-5.1225-7.385-9.7838-19.452-13.256 0.043-0.0322 0.08-0.06 0.1213-0.0912 12.188 3.4911 19.651 8.1865 19.651 13.348 0 10.788-32.595 19.534-72.804 19.534" fill="#f8f9f9"/>
   <path id="path4815" d="m345.58 943.83c-40.032 0-72.484-8.7075-72.484-19.448 0-5.1225 7.3838-9.7838 19.451-13.256 0.04 0.0303 0.0813 0.0615 0.12125 0.0914-11.949 3.4536-19.252 8.08-19.252 13.165 0 10.692 32.309 19.361 72.164 19.361 39.854 0 72.163-8.669 72.163-19.361 0-5.085-7.3038-9.7114-19.252-13.165 0.04-0.0299 0.081-0.0611 0.1212-0.0914 12.068 3.4726 19.452 8.1339 19.452 13.256 0 10.74-32.452 19.448-72.484 19.448" fill="#f8f8f8"/>
   <path id="path4817" d="m345.58 943.75c-39.855 0-72.164-8.669-72.164-19.361 0-5.085 7.3038-9.7114 19.252-13.165 0.04 0.0288 0.0825 0.0615 0.1225 0.0913-11.828 3.4351-19.054 8.0274-19.054 13.074 0 10.645 32.165 19.275 71.842 19.275 39.676 0 71.841-8.6299 71.841-19.275 0-5.0464-7.225-9.6386-19.054-13.074 0.04-0.0298 0.082-0.0625 0.1225-0.0913 11.949 3.4536 19.252 8.08 19.252 13.165 0 10.692-32.309 19.361-72.163 19.361" fill="#f8f8f8"/>
   <path id="path4819" d="m345.58 943.66c-39.678 0-71.842-8.6299-71.842-19.275 0-5.0464 7.2262-9.6386 19.054-13.074 0.0425 0.0312 0.08 0.0586 0.1225 0.0914-11.708 3.416-18.856 7.975-18.856 12.982 0 10.598 32.021 19.189 71.522 19.189 39.5 0 71.521-8.5913 71.521-19.189 0-5.0074-7.1487-9.5664-18.856-12.982 0.043-0.0327 0.08-0.0601 0.1225-0.0914 11.829 3.4351 19.054 8.0274 19.054 13.074 0 10.645-32.165 19.275-71.841 19.275" fill="#f7f8f8"/>
   <path id="path4821" d="m345.58 943.57c-39.501 0-71.522-8.5913-71.522-19.189 0-5.0074 7.1488-9.5664 18.856-12.982 0.04 0.0288 0.0837 0.061 0.12375 0.0913-11.589 3.3975-18.659 7.9224-18.659 12.891 0 10.55 31.878 19.103 71.201 19.103s71.2-8.5528 71.2-19.103c0-4.9688-7.07-9.4936-18.659-12.891 0.04-0.0303 0.084-0.0625 0.1238-0.0913 11.708 3.416 18.856 7.975 18.856 12.982 0 10.598-32.021 19.189-71.521 19.189" fill="#f7f7f7"/>
   <path id="path4823" d="m345.58 943.49c-39.324 0-71.201-8.5528-71.201-19.103 0-4.9688 7.07-9.4936 18.659-12.891 0.0425 0.0312 0.0812 0.0601 0.12375 0.0914-11.47 3.3784-18.461 7.8696-18.461 12.8 0 10.502 31.734 19.016 70.88 19.016 39.145 0 70.88-8.5136 70.88-19.016 0-4.9301-6.9925-9.4214-18.461-12.8 0.041-0.0312 0.08-0.0601 0.1225-0.0914 11.589 3.3975 18.659 7.9224 18.659 12.891 0 10.55-31.878 19.103-71.2 19.103" fill="#f6f7f7"/>
   <path id="path4825" d="m345.58 943.4c-39.146 0-70.88-8.5136-70.88-19.016 0-4.9301 6.9912-9.4214 18.461-12.8 0.04 0.0282 0.0837 0.061 0.12375 0.0907-11.349 3.3589-18.265 7.8179-18.265 12.709 0 10.455 31.591 18.931 70.56 18.931s70.559-8.476 70.559-18.931c0-4.8911-6.915-9.3501-18.265-12.709 0.04-0.0297 0.084-0.0625 0.125-0.0907 11.469 3.3784 18.461 7.8696 18.461 12.8 0 10.502-31.735 19.016-70.88 19.016" fill="#f6f6f7"/>
   <path id="path4827" d="m345.58 943.32c-38.969 0-70.56-8.476-70.56-18.931 0-4.8911 6.9162-9.3501 18.265-12.709 0.0425 0.0312 0.0825 0.0601 0.125 0.0914-11.232 3.3402-18.069 7.7651-18.069 12.618 0 10.408 31.446 18.845 70.239 18.845 38.791 0 70.238-8.4375 70.238-18.845 0-4.8525-6.8363-9.2774-18.068-12.618 0.043-0.0312 0.081-0.0601 0.1237-0.0914 11.35 3.3589 18.265 7.8179 18.265 12.709 0 10.455-31.59 18.931-70.559 18.931" fill="#f6f6f6"/>
   <path id="path4829" d="m345.58 943.23c-38.792 0-70.239-8.4375-70.239-18.845 0-4.8525 6.8362-9.2774 18.069-12.618 0.04 0.0287 0.0837 0.0615 0.125 0.0912-11.114 3.3213-17.872 7.7114-17.872 12.526 0 10.36 31.302 18.759 69.918 18.759 38.614 0 69.918-8.3989 69.918-18.759 0-4.815-6.76-9.2051-17.874-12.526 0.041-0.0297 0.085-0.0625 0.1263-0.0912 11.231 3.3402 18.068 7.7651 18.068 12.618 0 10.408-31.446 18.845-70.238 18.845" fill="#f5f6f6"/>
   <path id="path4831" d="m345.58 943.14c-38.615 0-69.918-8.3989-69.918-18.759 0-4.815 6.7588-9.2051 17.872-12.526 0.0425 0.0312 0.0825 0.0601 0.125 0.0914-10.995 3.3026-17.678 7.6586-17.678 12.435 0 10.312 31.16 18.672 69.598 18.672 38.436 0 69.596-8.3599 69.596-18.672 0-4.7764-6.6825-9.1324-17.678-12.435 0.043-0.0312 0.082-0.0601 0.125-0.0914 11.114 3.3213 17.874 7.7114 17.874 12.526 0 10.36-31.304 18.759-69.918 18.759" fill="#f5f5f5"/>
   <path id="path4833" d="m345.58 943.06c-38.438 0-69.598-8.3599-69.598-18.672 0-4.7764 6.6825-9.1324 17.678-12.435 0.0425 0.0312 0.0837 0.06 0.12625 0.0913-10.878 3.2828-17.482 7.6065-17.482 12.344 0 10.265 31.016 18.586 69.276 18.586s69.276-8.3213 69.276-18.586c0-4.7372-6.6062-9.061-17.484-12.344 0.043-0.0312 0.084-0.06 0.1262-0.0913 10.995 3.3026 17.678 7.6586 17.678 12.435 0 10.312-31.16 18.672-69.596 18.672" fill="#f5f5f5"/>
   <path id="path4835" d="m345.58 942.97c-38.26 0-69.276-8.3213-69.276-18.586 0-4.7372 6.605-9.061 17.482-12.344 0.0425 0.0312 0.0837 0.061 0.12625 0.0912-10.758 3.2638-17.289 7.5538-17.289 12.252 0 10.217 30.872 18.5 68.956 18.5 38.083 0 68.955-8.2828 68.955-18.5 0-4.6988-6.5313-8.9888-17.289-12.252 0.043-0.0303 0.084-0.06 0.1263-0.0912 10.878 3.2828 17.484 7.6065 17.484 12.344 0 10.265-31.016 18.586-69.276 18.586" fill="#f4f4f4"/>
   <path id="path4837" d="m345.58 942.89c-38.084 0-68.956-8.2828-68.956-18.5 0-4.6988 6.5312-8.9888 17.289-12.252 0.0412 0.0299 0.0862 0.0625 0.1275 0.0914-10.642 3.2436-17.095 7.5-17.095 12.161 0 10.17 30.729 18.415 68.635 18.415 37.905 0 68.634-8.2452 68.634-18.415 0-4.6611-6.4525-8.9175-17.095-12.161 0.041-0.0289 0.088-0.0615 0.1275-0.0914 10.758 3.2638 17.289 7.5538 17.289 12.252 0 10.217-30.872 18.5-68.955 18.5" fill="#f4f4f4"/>
   <path id="path4839" d="m345.58 942.8c-37.906 0-68.635-8.2452-68.635-18.415 0-4.6611 6.4525-8.9175 17.095-12.161 0.0425 0.0312 0.085 0.061 0.1275 0.0922-10.524 3.2236-16.901 7.4464-16.901 12.069 0 10.122 30.585 18.329 68.314 18.329s68.314-8.2061 68.314-18.329c0-4.6225-6.3775-8.8452-16.902-12.069 0.044-0.0312 0.085-0.061 0.1275-0.0922 10.642 3.2436 17.095 7.5 17.095 12.161 0 10.17-30.729 18.415-68.634 18.415" fill="#f3f3f3"/>
   <path id="path4841" d="m345.58 942.71c-37.729 0-68.314-8.2061-68.314-18.329 0-4.6225 6.3775-8.8452 16.901-12.069 0.0425 0.0303 0.085 0.0601 0.1275 0.0914-10.408 3.205-16.709 7.3935-16.709 11.978 0 10.075 30.441 18.243 67.994 18.243 37.551 0 67.993-8.1674 67.993-18.243 0-4.584-6.3013-8.7725-16.709-11.978 0.043-0.0312 0.085-0.0611 0.1275-0.0914 10.525 3.2236 16.902 7.4464 16.902 12.069 0 10.122-30.585 18.329-68.314 18.329" fill="#f3f3f2"/>
   <path id="path4843" d="m345.58 942.63c-37.552 0-67.994-8.1674-67.994-18.243 0-4.584 6.3012-8.7725 16.709-11.978 0.0437 0.0298 0.0863 0.0615 0.12875 0.0913-10.289 3.1851-16.516 7.3413-16.516 11.886 0 10.027 30.298 18.156 67.672 18.156s67.671-8.1289 67.671-18.156c0-4.5464-6.225-8.7011-16.516-11.886 0.043-0.0298 0.086-0.0615 0.1287-0.0913 10.408 3.205 16.709 7.3935 16.709 11.978 0 10.075-30.441 18.243-67.993 18.243" fill="#f2f2f2"/>
   <path id="path4845" d="m345.58 942.54c-37.375 0-67.672-8.1289-67.672-18.156 0-4.5449 6.2275-8.7011 16.516-11.886 0.0425 0.0298 0.0863 0.061 0.12875 0.0914-10.172 3.165-16.324 7.2875-16.324 11.795 0 9.98 30.154 18.07 67.351 18.07 37.196 0 67.351-8.0898 67.351-18.07 0-4.5074-6.1512-8.6299-16.325-11.795 0.043-0.0304 0.086-0.0616 0.1288-0.0914 10.291 3.1851 16.516 7.3399 16.516 11.886 0 10.027-30.298 18.156-67.671 18.156" fill="#f2f1f1"/>
   <path id="path4847" d="m345.58 942.46c-37.198 0-67.351-8.0898-67.351-18.07 0-4.5074 6.1512-8.6299 16.324-11.795 0.0438 0.0312 0.0875 0.061 0.13 0.0923-10.056 3.145-16.134 7.2339-16.134 11.703 0 9.9326 30.011 17.984 67.031 17.984s67.03-8.0513 67.03-17.984c0-4.4688-6.0775-8.5576-16.134-11.703 0.044-0.0312 0.086-0.061 0.13-0.0923 10.174 3.165 16.325 7.2875 16.325 11.795 0 9.98-30.155 18.07-67.351 18.07" fill="#f1f1f1"/>
   <path id="path4849" d="m345.58 942.37c-37.02 0-67.031-8.0513-67.031-17.984 0-4.4688 6.0775-8.5576 16.134-11.703 0.0438 0.0303 0.0875 0.0615 0.13 0.0913-9.94 3.125-15.942 7.1802-15.942 11.611 0 9.8848 29.866 17.897 66.71 17.897 36.843 0 66.71-8.0127 66.71-17.897 0-4.4311-6.0038-8.4864-15.944-11.611 0.044-0.0297 0.088-0.061 0.13-0.0913 10.056 3.145 16.134 7.2339 16.134 11.703 0 9.9326-30.01 17.984-67.03 17.984" fill="#f0f0f0"/>
   <path id="path4851" d="m345.58 942.28c-36.844 0-66.71-8.0127-66.71-17.897 0-4.4311 6.0025-8.4864 15.942-11.611 0.0438 0.0304 0.0875 0.0616 0.13125 0.0914-9.825 3.1064-15.754 7.1274-15.754 11.52 0 9.8374 29.724 17.812 66.39 17.812 36.665 0 66.389-7.9751 66.389-17.812 0-4.3926-5.9287-8.4136-15.752-11.52 0.043-0.0298 0.088-0.061 0.13-0.0914 9.94 3.125 15.944 7.1802 15.944 11.611 0 9.8848-29.868 17.897-66.71 17.897" fill="#f0f0ef"/>
   <path id="path4853" d="m345.58 942.2c-36.666 0-66.39-7.9751-66.39-17.812 0-4.3926 5.9288-8.4136 15.754-11.52 0.045 0.0312 0.085 0.06 0.13125 0.0912-9.7112 3.0865-15.564 7.0738-15.564 11.429 0 9.79 29.58 17.726 66.069 17.726 36.488 0 66.068-7.9361 66.068-17.726 0-4.355-5.8525-8.3422-15.562-11.429 0.045-0.0312 0.085-0.06 0.1312-0.0912 9.8238 3.1064 15.752 7.1274 15.752 11.52 0 9.8374-29.724 17.812-66.389 17.812" fill="#efefef"/>
   <path id="path4855" d="m345.58 942.11c-36.489 0-66.069-7.9361-66.069-17.726 0-4.355 5.8525-8.3422 15.564-11.429 0.0425 0.0299 0.0875 0.0625 0.13125 0.0924-9.5938 3.0649-15.374 7.02-15.374 11.336 0 9.7426 29.436 17.64 65.748 17.64 36.311 0 65.748-7.8975 65.748-17.64 0-4.3164-5.78-8.2715-15.375-11.336 0.044-0.0299 0.089-0.0625 0.1325-0.0924 9.71 3.0865 15.562 7.0738 15.562 11.429 0 9.79-29.58 17.726-66.068 17.726" fill="#eee"/>
   <path id="path4857" d="m345.58 942.03c-36.311 0-65.748-7.8975-65.748-17.64 0-4.3164 5.78-8.2715 15.374-11.336 0.0437 0.0302 0.0888 0.0615 0.1325 0.0912-9.4825 3.0464-15.186 6.9664-15.186 11.245 0 9.6949 29.292 17.554 65.428 17.554 36.134 0 65.426-7.8588 65.426-17.554 0-4.2788-5.7037-8.1988-15.186-11.245 0.044-0.0297 0.09-0.061 0.1325-0.0912 9.595 3.0649 15.375 7.02 15.375 11.336 0 9.7426-29.436 17.64-65.748 17.64" fill="#eeeeed"/>
   <path id="path4859" d="m345.58 941.94c-36.135 0-65.428-7.8588-65.428-17.554 0-4.2788 5.7038-8.1988 15.186-11.245 0.045 0.0312 0.0863 0.0601 0.1325 0.0914-9.3675 3.0262-14.998 6.9135-14.998 11.154 0 9.6475 29.149 17.467 65.106 17.467 35.956 0 65.106-7.8198 65.106-17.467 0-4.2402-5.6312-8.1275-14.999-11.154 0.046-0.0312 0.088-0.0601 0.1325-0.0914 9.4825 3.0464 15.186 6.9664 15.186 11.245 0 9.6949-29.292 17.554-65.426 17.554" fill="#ededec"/>
   <path id="path4861" d="m345.58 941.85c-35.958 0-65.106-7.8198-65.106-17.467 0-4.2402 5.63-8.1275 14.998-11.154 0.0437 0.0303 0.09 0.0625 0.13375 0.0923-9.2512 3.0054-14.811 6.8589-14.811 11.062 0 9.6001 29.006 17.381 64.786 17.381s64.785-7.7812 64.785-17.381c0-4.2026-5.56-8.0561-14.811-11.062 0.044-0.0298 0.091-0.062 0.1338-0.0923 9.3675 3.0262 14.999 6.9135 14.999 11.154 0 9.6475-29.15 17.467-65.106 17.467" fill="#ededec"/>
   <path id="path4863" d="m345.58 941.77c-35.78 0-64.786-7.7812-64.786-17.381 0-4.2026 5.56-8.0561 14.811-11.062 0.045 0.0317 0.0875 0.06 0.13375 0.0912-9.1388 2.9854-14.624 6.8066-14.624 10.97 0 9.5528 28.861 17.295 64.465 17.295 35.603 0 64.464-7.7422 64.464-17.295 0-4.1636-5.485-7.9849-14.624-10.97 0.046-0.0312 0.089-0.0595 0.1337-0.0912 9.2513 3.0054 14.811 6.8589 14.811 11.062 0 9.6001-29.005 17.381-64.785 17.381" fill="#ececeb"/>
   <path id="path4865" d="m345.58 941.68c-35.604 0-64.465-7.7422-64.465-17.295 0-4.1636 5.485-7.9849 14.624-10.97 0.0438 0.0303 0.0913 0.0625 0.13375 0.0928-9.0238 2.9639-14.436 6.751-14.436 10.878 0 9.5049 28.718 17.21 64.144 17.21 35.425 0 64.144-7.7051 64.144-17.21 0-4.1265-5.4137-7.9136-14.438-10.879 0.044-0.0289 0.091-0.0611 0.1338-0.0914 9.1387 2.9854 14.624 6.8066 14.624 10.97 0 9.5528-28.861 17.295-64.464 17.295" fill="#ecebea"/>
   <path id="path4867" d="m345.58 941.6c-35.426 0-64.144-7.7051-64.144-17.21 0-4.1265 5.4125-7.9136 14.436-10.878 0.0463 0.0312 0.09 0.0601 0.135 0.0914-8.9112 2.9439-14.251 6.6972-14.251 10.786 0 9.4575 28.575 17.124 63.824 17.124 35.248 0 63.823-7.666 63.823-17.124 0-4.0889-5.34-7.8422-14.251-10.786 0.046-0.0312 0.089-0.0615 0.135-0.0928 9.0238 2.9652 14.438 6.7524 14.438 10.879 0 9.5049-28.719 17.21-64.144 17.21" fill="#ebebea"/>
   <path id="path4869" d="m345.58 941.51c-35.249 0-63.824-7.666-63.824-17.124 0-4.0889 5.34-7.8422 14.251-10.786 0.0437 0.0297 0.0925 0.0625 0.13625 0.0912-8.7988 2.9249-14.066 6.6452-14.066 10.695 0 9.4101 28.43 17.038 63.502 17.038 35.071 0 63.501-7.6275 63.501-17.038 0-4.0498-5.2675-7.77-14.066-10.695 0.044-0.0287 0.092-0.0615 0.1362-0.0912 8.9113 2.9439 14.251 6.6972 14.251 10.786 0 9.4575-28.575 17.124-63.823 17.124" fill="#eaeae9"/>
   <path id="path4871" d="m345.58 941.42c-35.072 0-63.502-7.6275-63.502-17.038 0-4.0498 5.2675-7.77 14.066-10.695 0.0462 0.0312 0.09 0.0611 0.13625 0.0924-8.685 2.9038-13.882 6.5898-13.882 10.602 0 9.3622 28.288 16.951 63.182 16.951s63.181-7.5889 63.181-16.951c0-4.0128-5.1975-7.6988-13.882-10.602 0.046-0.0312 0.09-0.0611 0.1363-0.0924 8.7987 2.9249 14.066 6.6451 14.066 10.695 0 9.4101-28.43 17.038-63.501 17.038" fill="#eaeae8"/>
   <path id="path4873" d="m345.58 941.34c-34.895 0-63.182-7.5889-63.182-16.951 0-4.0128 5.1975-7.6988 13.882-10.602 0.0462 0.0312 0.09 0.061 0.13625 0.0913-8.5725 2.8838-13.698 6.5376-13.698 10.511 0 9.315 28.144 16.865 62.861 16.865 34.716 0 62.86-7.5498 62.86-16.865 0-3.9736-5.125-7.6275-13.698-10.511 0.046-0.0303 0.09-0.06 0.1362-0.0913 8.685 2.9038 13.882 6.5898 13.882 10.602 0 9.3622-28.288 16.951-63.181 16.951" fill="#e9e9e8"/>
   <path id="path4875" d="m345.58 941.25c-34.718 0-62.861-7.5498-62.861-16.865 0-3.9736 5.125-7.6275 13.698-10.511 0.0462 0.0312 0.0913 0.061 0.1375 0.0923-8.46 2.8629-13.514 6.483-13.514 10.419 0 9.2676 28 16.779 62.54 16.779s62.54-7.5112 62.54-16.779c0-3.936-5.055-7.5561-13.515-10.419 0.046-0.0312 0.091-0.061 0.1375-0.0923 8.5725 2.8838 13.698 6.5376 13.698 10.511 0 9.315-28.144 16.865-62.86 16.865" fill="#e9e8e7"/>
   <path id="path4877" d="m345.58 941.16c-34.54 0-62.54-7.5112-62.54-16.779 0-3.936 5.0538-7.5561 13.514-10.419 0.0462 0.0312 0.0925 0.0616 0.13875 0.0929-8.35 2.8413-13.332 6.4273-13.332 10.326 0 9.2202 27.856 16.694 62.22 16.694 34.363 0 62.219-7.4736 62.219-16.694 0-3.8989-4.9825-7.4849-13.332-10.326 0.047-0.0312 0.092-0.0616 0.1388-0.0929 8.46 2.8629 13.515 6.483 13.515 10.419 0 9.2676-28 16.779-62.54 16.779" fill="#e8e8e6"/>
   <path id="path4879" d="m345.58 941.08c-34.364 0-62.22-7.4736-62.22-16.694 0-3.8989 4.9825-7.4849 13.332-10.326 0.0462 0.0298 0.0913 0.06 0.1375 0.0913-8.2362 2.8199-13.149 6.3735-13.149 10.235 0 9.1724 27.712 16.607 61.899 16.607 34.185 0 61.898-7.4351 61.898-16.607 0-3.8614-4.9113-7.415-13.149-10.235 0.046-0.0312 0.092-0.0615 0.1375-0.0913 8.35 2.8413 13.332 6.4273 13.332 10.326 0 9.2202-27.856 16.694-62.219 16.694" fill="#e7e7e6"/>
   <path id="path4881" d="m345.58 940.99c-34.186 0-61.899-7.4351-61.899-16.607 0-3.8614 4.9125-7.415 13.149-10.235 0.0475 0.0312 0.0937 0.061 0.14 0.0922-8.1262 2.7989-12.969 6.3199-12.969 10.143 0 9.1235 27.57 16.521 61.579 16.521 34.008 0 61.578-7.398 61.578-16.521 0-3.8238-4.84-7.3438-12.969-10.143 0.046-0.0312 0.094-0.061 0.14-0.0922 8.2375 2.8199 13.149 6.3735 13.149 10.235 0 9.1724-27.712 16.607-61.898 16.607" fill="#e7e6e5"/>
   <path id="path4883" d="m345.58 940.91c-34.009 0-61.579-7.398-61.579-16.521 0-3.8228 4.8425-7.3438 12.969-10.143 0.0463 0.0304 0.0937 0.0616 0.14 0.0914-8.0162 2.7788-12.788 6.2661-12.788 10.051 0 9.0776 27.426 16.435 61.258 16.435 33.831 0 61.256-7.3574 61.256-16.435 0-3.7851-4.7712-7.2725-12.786-10.051 0.046-0.0298 0.093-0.061 0.1387-0.0914 8.1288 2.7989 12.969 6.3189 12.969 10.143 0 9.1235-27.57 16.521-61.578 16.521" fill="#e6e6e4"/>
   <path id="path4885" d="m345.58 940.82c-33.831 0-61.258-7.3574-61.258-16.435 0-3.7851 4.7712-7.2725 12.788-10.051 0.0462 0.0312 0.0937 0.0625 0.14 0.0922-7.9062 2.7579-12.606 6.2115-12.606 9.959 0 9.0288 27.281 16.349 60.936 16.349 33.654 0 60.936-7.3199 60.936-16.349 0-3.7475-4.7012-7.2011-12.608-9.959 0.046-0.0297 0.094-0.061 0.1413-0.0922 8.015 2.7788 12.786 6.2661 12.786 10.051 0 9.0776-27.425 16.435-61.256 16.435" fill="#e5e5e3"/>
   <path id="path4887" d="m345.58 940.73c-33.655 0-60.936-7.3199-60.936-16.349 0-3.7475 4.7-7.2011 12.606-9.959 0.0462 0.0303 0.095 0.0615 0.14125 0.0928-7.7962 2.7364-12.428 6.1562-12.428 9.8662 0 8.9815 27.139 16.263 60.616 16.263 33.476 0 60.615-7.2812 60.615-16.263 0-3.71-4.6313-7.1299-12.428-9.8662 0.046-0.0312 0.095-0.0625 0.1412-0.0928 7.9063 2.7579 12.608 6.2115 12.608 9.959 0 9.0288-27.282 16.349-60.936 16.349" fill="#e4e4e3"/>
   <path id="path4889" d="m345.58 940.65c-33.478 0-60.616-7.2812-60.616-16.263 0-3.71 4.6312-7.1299 12.428-9.8662 0.0462 0.0299 0.095 0.0611 0.14125 0.0914-7.6862 2.7162-12.248 6.1025-12.248 9.7749 0 8.9336 26.995 16.176 60.295 16.176 33.299 0 60.294-7.2426 60.294-16.176 0-3.6724-4.5612-7.0586-12.248-9.7749 0.046-0.0302 0.095-0.0615 0.1413-0.0914 7.7962 2.7364 12.428 6.1562 12.428 9.8662 0 8.9815-27.139 16.263-60.615 16.263" fill="#e4e3e2"/>
   <path id="path4891" d="m345.58 940.56c-33.3 0-60.295-7.2426-60.295-16.176 0-3.6724 4.5612-7.0586 12.248-9.7749 0.0488 0.0323 0.0937 0.061 0.1425 0.0922-7.5775 2.6939-12.069 6.0479-12.069 9.6826 0 8.8862 26.85 16.091 59.974 16.091 33.123 0 59.974-7.2051 59.974-16.091 0-3.6348-4.4925-6.9888-12.07-9.6826 0.049-0.0312 0.094-0.06 0.1425-0.0922 7.6863 2.7162 12.248 6.1025 12.248 9.7749 0 8.9336-26.995 16.176-60.294 16.176" fill="#e3e3e1"/>
   <path id="path4893" d="m345.58 940.48c-33.124 0-59.974-7.2051-59.974-16.091 0-3.6348 4.4912-6.9888 12.069-9.6826 0.0462 0.0303 0.0962 0.0625 0.14375 0.0928-7.4675 2.6724-11.892 5.9922-11.892 9.5899 0 8.8389 26.708 16.005 59.654 16.005 32.945 0 59.653-7.166 59.653-16.005 0-3.5976-4.4238-6.9175-11.891-9.5899 0.046-0.0303 0.096-0.0625 0.1425-0.0928 7.5775 2.6939 12.07 6.0479 12.07 9.6826 0 8.8862-26.851 16.091-59.974 16.091" fill="#e2e2e0"/>
   <path id="path4895" d="m345.58 940.39c-32.946 0-59.654-7.166-59.654-16.005 0-3.5976 4.425-6.9175 11.892-9.5899 0.0488 0.0312 0.0937 0.0601 0.1425 0.0909-7.3588 2.6528-11.714 5.939-11.714 9.499 0 8.791 26.564 15.919 59.332 15.919s59.331-7.128 59.331-15.919c0-3.56-4.355-6.8462-11.714-9.499 0.049-0.0308 0.094-0.0596 0.1437-0.0909 7.4675 2.6724 11.891 5.9922 11.891 9.5899 0 8.8389-26.708 16.005-59.653 16.005" fill="#e2e1df"/>
   <path id="path4897" d="m345.58 940.3c-32.769 0-59.332-7.128-59.332-15.919 0-3.56 4.355-6.8462 11.714-9.499 0.0475 0.0303 0.0975 0.063 0.145 0.0928-7.2512 2.6298-11.539 5.8837-11.539 9.4062 0 8.7436 26.421 15.833 59.012 15.833s59.011-7.0889 59.011-15.833c0-3.5225-4.2875-6.7764-11.539-9.4062 0.048-0.0298 0.098-0.0625 0.145-0.0928 7.3587 2.6528 11.714 5.939 11.714 9.499 0 8.791-26.564 15.919-59.331 15.919" fill="#e1e0df"/>
   <path id="path4899" d="m345.58 940.22c-32.591 0-59.012-7.0889-59.012-15.833 0-3.5225 4.2875-6.7764 11.539-9.4062 0.0487 0.0312 0.095 0.061 0.145 0.0922-7.1425 2.6089-11.362 5.8291-11.362 9.314 0 8.6962 26.276 15.746 58.691 15.746 32.414 0 58.69-7.0498 58.69-15.746 0-3.4849-4.22-6.7051-11.362-9.314 0.05-0.0312 0.096-0.061 0.145-0.0922 7.2512 2.6299 11.539 5.8838 11.539 9.4062 0 8.7436-26.42 15.833-59.011 15.833" fill="#e0e0de"/>
   <path id="path4901" d="m345.58 940.13c-32.415 0-58.691-7.0498-58.691-15.746 0-3.4849 4.22-6.7051 11.362-9.314 0.0463 0.0303 0.0987 0.0625 0.145 0.0928-7.0362 2.586-11.186 5.7735-11.186 9.2212 0 8.6489 26.132 15.66 58.37 15.66 32.236 0 58.37-7.0113 58.37-15.66 0-3.4478-4.1513-6.6352-11.188-9.2212 0.046-0.0303 0.099-0.0625 0.145-0.0928 7.1425 2.6089 11.362 5.8291 11.362 9.314 0 8.6962-26.276 15.746-58.69 15.746" fill="#e0dfdd"/>
   <path id="path4903" d="m345.58 940.05c-32.238 0-58.37-7.0113-58.37-15.66 0-3.4478 4.15-6.6352 11.186-9.2212 0.05 0.0312 0.0975 0.0611 0.1475 0.0924-6.9288 2.5649-11.014 5.7188-11.014 9.1289 0 8.6011 25.99 15.575 58.05 15.575 32.059 0 58.049-6.9741 58.049-15.575 0-3.4101-4.085-6.564-11.012-9.1289 0.049-0.0312 0.096-0.0611 0.1463-0.0924 7.0362 2.586 11.188 5.7735 11.188 9.2212 0 8.6489-26.134 15.66-58.37 15.66" fill="#dfdedc"/>
   <path id="path4905" d="m345.58 939.96c-32.06 0-58.05-6.9741-58.05-15.575 0-3.4101 4.085-6.564 11.014-9.1289 0.0487 0.0312 0.0962 0.0615 0.14625 0.0928-6.8212 2.5425-10.839 5.6636-10.839 9.0361 0 8.5538 25.846 15.489 57.729 15.489s57.728-6.935 57.728-15.489c0-3.3725-4.0163-6.4936-10.839-9.0361 0.05-0.0312 0.097-0.0615 0.1475-0.0928 6.9275 2.5649 11.012 5.7188 11.012 9.1289 0 8.6011-25.99 15.575-58.049 15.575" fill="#dedddb"/>
   <path id="path4907" d="m345.58 939.87c-31.882 0-57.729-6.935-57.729-15.489 0-3.3725 4.0175-6.4936 10.839-9.0361 0.05 0.0312 0.0987 0.061 0.1475 0.0922-6.715 2.5215-10.666 5.6089-10.666 8.9439 0 8.5064 25.702 15.402 57.409 15.402 31.705 0 57.408-6.896 57.408-15.402 0-3.335-3.9513-6.4224-10.666-8.9439 0.049-0.0312 0.099-0.061 0.1475-0.0922 6.8225 2.5425 10.839 5.6636 10.839 9.0361 0 8.5538-25.845 15.489-57.728 15.489" fill="#dddcda"/>
   <path id="path4909" d="m345.58 939.79c-31.706 0-57.409-6.896-57.409-15.402 0-3.335 3.9512-6.4224 10.666-8.9439 0.05 0.0303 0.0987 0.0615 0.14875 0.0928-6.61 2.4986-10.494 5.5538-10.494 8.8511 0 8.459 25.559 15.316 57.088 15.316 31.528 0 57.086-6.8574 57.086-15.316 0-3.2974-3.8837-6.3525-10.494-8.8511 0.05-0.0312 0.099-0.0625 0.1487-0.0928 6.715 2.5215 10.666 5.6089 10.666 8.9439 0 8.5064-25.702 15.402-57.408 15.402" fill="#dddcda"/>
   <path id="path4911" d="m345.58 939.7c-31.529 0-57.088-6.8574-57.088-15.316 0-3.2974 3.8838-6.3525 10.494-8.8511 0.05 0.0299 0.1025 0.0635 0.1525 0.0937-6.505 2.4761-10.324 5.4946-10.324 8.7535 0 8.415 25.414 15.233 56.768 15.233s56.768-6.8179 56.768-15.233c0-3.2589-3.82-6.2789-10.328-8.7549 0.05-0.0312 0.1-0.0625 0.15-0.0924 6.61 2.4986 10.494 5.5538 10.494 8.8511 0 8.459-25.559 15.316-57.086 15.316" fill="#dcdbd9"/>
   <path id="path4913" d="m352.3 924.39c0 0.9975-3.0112 1.8051-6.7262 1.8051-3.7162 0-6.7275-0.80762-6.7275-1.8051 0-0.99612 3.0112-1.8051 6.7275-1.8051 3.715 0 6.7262 0.809 6.7262 1.8051" fill="#100f0d"/>
  </g>
  <g id="g4997" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g4999" clip-path="url(#clipPath5001-8)">
    <path id="path5013" d="m2880.5 3736.9c0 105.26-86.12 191.38-191.38 191.38h-73.44c-10.55 0-20.91-0.86-31-2.52v1763.8c0 30.46-24.7 55.16-55.17 55.16-30.46 0-55.16-24.7-55.16-55.16v-1823.9c-31.06-34.06-50.06-79.28-50.06-128.72v1925c0 105.26 86.12 191.38 191.39 191.38h73.44c105.26 0 191.38-86.12 191.38-191.38v-1925" fill="url(#linearGradient5005)"/>
   </g>
  </g>
  <g id="g5015" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g5017" clip-path="url(#clipPath5019-4)">
    <path id="path5029" d="m2880.5 1400.7c-70.08 29.76-147.17 46.22-228.1 46.22-80.94 0-158.03-16.46-228.11-46.22v2336.2c0 49.44 19 94.66 50.06 128.72v-2278.8c0-30.47 24.7-55.16 55.16-55.16 30.47 0 55.17 24.69 55.17 55.16v2338.9c10.09 1.66 20.45 2.52 31 2.52h73.44c105.26 0 191.38-86.12 191.38-191.38v-2336.2" fill="url(#linearGradient5023)"/>
   </g>
  </g>
  <g id="g5031" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g5033" clip-path="url(#clipPath5035-2)">
    <path id="path5045" d="m3236.5 862.75c0-322.64-261.54-584.18-584.17-584.18-322.64 0-584.18 261.54-584.18 584.18 0 322.63 261.54 584.18 584.18 584.18 322.63 0 584.17-261.55 584.17-584.18" fill="url(#radialGradient5071-6)"/>
   </g>
  </g>
  <g id="g5047" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g5049" clip-path="url(#clipPath5051-9)">
    <path id="path5061" d="m2994.9 1172v2.03-1.01-1.02" fill="url(#radialGradient5071-6)"/>
   </g>
  </g>
  <g id="g5063" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g5065" clip-path="url(#clipPath5067-4)">
    <path id="path5077" d="m2872.9 1006.9c74.59 39.83 121.99 99.49 121.99 166.16v-1.02c-0.48-66.26-47.76-125.51-121.99-165.14m121.99 166.16c0 31.39-10.5 61.21-29.4 88.15 18.7-26.65 29.18-56.13 29.4-87.14v-1.01" fill="url(#radialGradient5071-6)"/>
   </g>
  </g>
  <g id="g5079" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g5081" clip-path="url(#clipPath5083-5)">
    <g id="g5087" transform="matrix(696.2,0,0,453.2,2303.9,945.9)">
     <image id="image5089" xlink:href="data:image/png;base64,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" transform="matrix(1,0,0,-1,0,1)" height="1" width="1" preserveAspectRatio="none"/>
    </g>
   </g>
  </g>
  <path id="path5091" d="m350.17 200.97h-9.18c-21.739 0-39.424 17.685-39.424 39.422v523.07c-27.34 15.644-44.509 44.775-44.509 76.826 0 48.811 39.711 88.522 88.522 88.522 48.81 0 88.521-39.712 88.521-88.522 0-32.052-17.169-61.182-44.509-76.826v-523.07c0-21.738-17.685-39.422-39.423-39.422m0 15.5c13.158 0 23.923 10.765 23.923 23.922v532.65c26.161 11.106 44.509 37.031 44.509 67.242 0 40.33-32.692 73.022-73.021 73.022-40.33 0-73.022-32.692-73.022-73.022 0-30.211 18.349-56.136 44.509-67.242v-532.65c0-13.158 10.765-23.922 23.924-23.922h9.18" fill="#100f0d"/>
  <g id="g5093" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g5095" clip-path="url(#clipPath5097-6)">
    <path id="path5111" d="m2689.1 5941.9h-73.44c-154.37 0-279.96-125.59-279.96-279.96v-4205.5c-218.11-116.22-356.07-343.22-356.07-593.7 0-370.96 301.79-672.75 672.75-672.75 370.95 0 672.74 301.79 672.74 672.75 0 250.48-137.95 477.48-356.07 593.7v4205.5c0 154.37-125.59 279.96-279.95 279.96m0-88.58c105.26 0 191.38-86.12 191.38-191.38v-4261.2c209.29-88.85 356.07-296.25 356.07-537.94 0-322.63-261.54-584.18-584.17-584.18-322.64 0-584.18 261.55-584.18 584.18 0 241.69 146.79 449.09 356.07 537.94v4261.2c0 105.26 86.12 191.38 191.39 191.38h73.44" fill="url(#linearGradient5101)"/>
   </g>
  </g>
  <g id="g5113" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g5115" clip-path="url(#clipPath5117-0)">
    <path id="path5129" d="m2474.3 3865.6v1823.9c0 30.46 24.7 55.16 55.16 55.16 30.47 0 55.17-24.7 55.17-55.16v-1763.8c-43.33-7.14-81.89-28.96-110.33-60.14" fill="url(#linearGradient5121)"/>
   </g>
  </g>
  <g id="g5131" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g5133" clip-path="url(#clipPath5135-7)">
    <path id="path5145" d="m2529.5 1531.7c-30.46 0-55.16 24.69-55.16 55.16v2278.8c28.44 31.18 67 53 110.33 60.14v-2338.9c0-30.47-24.7-55.16-55.17-55.16" fill="url(#linearGradient5139)"/>
   </g>
  </g>
  <g id="g6105" transform="matrix(.125 0 0 -.125 14.032 948.14)">
   <g id="g6107" clip-path="url(#clipPath6109-9)">
    <g id="g6113" transform="matrix(918.2,0,0,253.2,2192.9,62.9)">
     <image id="image6115" xlink:href="data:image/png;base64,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" transform="matrix(1,0,0,-1,0,1)" height="1" width="1" preserveAspectRatio="none"/>
    </g>
   </g>
  </g>
 </g>
</svg>
\",\"data:image/svg+xml;base64,<svg id="svg6934" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="210.87mm" width="49.966mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 177.04375 747.16249" xmlns:dc="http://purl.org/dc/elements/1.1/">
 <defs id="defs6936">
  <linearGradient id="linearGradient5571" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1e-7 -1704.3 -1704.3 -1e-7 4596.6 2828.6)">
   <stop id="stop5573" stop-color="#f7d649" offset="0"/>
   <stop id="stop5575" stop-color="#f18355" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient5553" gradientUnits="userSpaceOnUse" gradientTransform="matrix(456.22 0 0 -456.22 4368.4 3494.3)">
   <stop id="stop5555" stop-color="#cac9c8" offset="0"/>
   <stop id="stop5557" stop-color="#f6f6f6" offset=".75269"/>
   <stop id="stop5559" stop-color="#d4d3d2" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient5533" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1345.5 0 0 -1345.5 3923.8 3065.9)">
   <stop id="stop5535" stop-color="#b3b3b2" offset="0"/>
   <stop id="stop5537" stop-color="#b3b3b2" offset=".1"/>
   <stop id="stop5539" stop-color="#feffff" offset=".24731"/>
   <stop id="stop5541" stop-color="#a3a3a1" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient5455" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1e-7 -1704.3 -1704.3 -1e-7 4596.6 2828.6)">
   <stop id="stop5457" stop-color="#f3b70c" offset="0"/>
   <stop id="stop5459" stop-color="#e73e20" offset="1"/>
  </linearGradient>
  <linearGradient id="linearGradient5437" gradientUnits="userSpaceOnUse" gradientTransform="matrix(456.22 0 0 -456.22 4368.4 3494.3)">
   <stop id="stop5439" stop-color="#a3a3a1" offset="0"/>
   <stop id="stop5441" stop-color="#ececec" offset=".75269"/>
   <stop id="stop5443" stop-color="#b3b3b2" offset="1"/>
  </linearGradient>
  <clipPath id="clipPath6121-3" clipPathUnits="userSpaceOnUse">
   <path id="path6123-6" clip-rule="evenodd" d="m4142.4 190.03c0 67.231 203.31 121.77 454.14 121.77s454.14-54.539 454.14-121.77c0-67.32-203.31-121.86-454.14-121.86s-454.14 54.543-454.14 121.86"/>
  </clipPath>
  <clipPath id="clipPath5567-7" clipPathUnits="userSpaceOnUse">
   <path id="path5569-5" d="m4473.7 1531.7c-30.47 0-55.16 24.69-55.16 55.16v2914.1c28.43 31.18 66.99 53 110.32 60.14v-2974.2c0-30.47-24.7-55.16-55.16-55.16"/>
  </clipPath>
  <clipPath id="clipPath5549-6" clipPathUnits="userSpaceOnUse">
   <path id="path5551-2" d="m4418.5 4501v1188.6c0 30.46 24.69 55.16 55.16 55.16 30.46 0 55.16-24.7 55.16-55.16v-1128.4c-43.33-7.14-81.89-28.96-110.32-60.14"/>
  </clipPath>
  <clipPath id="clipPath5529-7" clipPathUnits="userSpaceOnUse">
   <path id="path5531-0" d="m4633.3 5941.9h-73.44c-154.37 0-279.96-125.59-279.96-279.96v-4205.5c-218.11-116.22-356.07-343.22-356.07-593.7 0-370.96 301.79-672.75 672.75-672.75 370.95 0 672.74 301.79 672.74 672.75 0 250.48-137.95 477.48-356.07 593.7v4205.5c0 154.37-125.59 279.96-279.95 279.96m0-88.58c105.26 0 191.39-86.12 191.39-191.38v-4261.2c209.28-88.85 356.07-296.25 356.07-537.94 0-322.63-261.55-584.18-584.18-584.18-322.64 0-584.18 261.55-584.18 584.18 0 241.69 146.78 449.09 356.07 537.94v4261.2c0 105.26 86.12 191.38 191.39 191.38h73.44"/>
  </clipPath>
  <clipPath id="clipPath5515-6" clipPathUnits="userSpaceOnUse">
   <path id="path5517-2" d="m4596.6 955.89c-189.16 0-342.5 97.219-342.5 217.15 0 119.92 153.34 217.14 342.5 217.14 118.59 0 223.1-38.21 284.57-96.28 36.58-34.55 57.92-76.12 57.92-120.86 0-83.39-74.13-155.8-182.9-192.18-47.65-15.937-101.96-24.968-159.59-24.968"/>
  </clipPath>
  <clipPath id="clipPath5499-6" clipPathUnits="userSpaceOnUse">
   <path id="path5501-1" d="m4756.2 980.86c108.77 36.381 182.9 108.79 182.9 192.18v-1.24c-0.73-82.87-74.67-154.73-182.9-190.94m182.9 192.18c0 44.74-21.34 86.31-57.92 120.86 36.24-34.23 57.53-75.36 57.92-119.63v-1.23"/>
  </clipPath>
  <radialGradient id="radialGradient5503-8" gradientUnits="userSpaceOnUse" cy="0" cx="0" gradientTransform="matrix(584.18 0 0 -584.18 4596.6 862.75)" r="1">
   <stop id="stop5505-7" stop-color="#f3b70c" offset="0"/>
   <stop id="stop5507-9" stop-color="#e73e20" offset="1"/>
  </radialGradient>
  <clipPath id="clipPath5483-2" clipPathUnits="userSpaceOnUse">
   <path id="path5485-0" d="m4939 1171.8v1.24 1.23-1.23-1.24"/>
  </clipPath>
  <clipPath id="clipPath5467-5" clipPathUnits="userSpaceOnUse">
   <path id="path5469-9" d="m5180.7 862.75c0-322.64-261.55-584.18-584.18-584.18-322.64 0-584.18 261.54-584.18 584.18 0 322.63 261.54 584.18 584.18 584.18 322.63 0 584.18-261.55 584.18-584.18"/>
  </clipPath>
  <clipPath id="clipPath5451-9" clipPathUnits="userSpaceOnUse">
   <path id="path5453-7" d="m4824.7 1400.7c-70.09 29.76-147.18 46.22-228.11 46.22-80.94 0-158.03-16.46-228.11-46.22v2971.5c0 49.44 19 94.67 50.07 128.72v-2914.1c0-30.47 24.69-55.16 55.16-55.16 30.46 0 55.16 24.69 55.16 55.16v2974.2c10.09 1.66 20.45 2.53 31 2.53h73.44c105.26 0 191.39-86.13 191.39-191.39v-2971.5"/>
  </clipPath>
  <clipPath id="clipPath5433-1" clipPathUnits="userSpaceOnUse">
   <path id="path5435-2" d="m4824.7 4372.2c0 105.26-86.13 191.39-191.39 191.39h-73.44c-10.55 0-20.91-0.87-31-2.53v1128.4c0 30.46-24.7 55.16-55.16 55.16-30.47 0-55.16-24.7-55.16-55.16v-1188.6c-31.07-34.05-50.07-79.28-50.07-128.72v1289.7c0 105.26 86.12 191.38 191.39 191.38h73.44c105.26 0 191.39-86.12 191.39-191.38v-1289.7"/>
  </clipPath>
 </defs>
 <g id="layer1" transform="translate(-217.07 -204.53)">
  <g fill="#fff">
   <path id="path5147" d="m305.59 951.7c-48.89 0-88.523-10.632-88.523-23.75 0-7.0864 11.571-13.449 29.919-17.8 0.035 0.03 0.0675 0.058 0.1025 0.09-18.22 4.335-29.7 10.663-29.7 17.71 0 13.069 39.489 23.664 88.201 23.664 48.711 0 88.201-10.595 88.201-23.664 0-7.0474-11.481-13.375-29.701-17.71 0.0362-0.031 0.0675-0.06 0.1025-0.09 18.348 4.351 29.919 10.713 29.919 17.8 0 13.118-39.632 23.75-88.521 23.75m37.502-45.174c0.0437-0.026 0.0875-0.054 0.13125-0.079-0.0438 0.025-0.0875 0.052-0.13125 0.079"/>
   <path id="path5149" d="m305.59 951.61c-48.713 0-88.201-10.595-88.201-23.664 0-7.0474 11.48-13.375 29.7-17.71 0.0337 0.029 0.07 0.061 0.1025 0.091-18.089 4.3174-29.481 10.611-29.481 17.619 0 13.021 39.345 23.578 87.88 23.578s87.88-10.557 87.88-23.578c0-7.0074-11.394-13.301-29.482-17.619 0.0338-0.03 0.07-0.062 0.1025-0.091 18.22 4.335 29.701 10.663 29.701 17.71 0 13.069-39.49 23.664-88.201 23.664m37.371-45.01c0.045-0.026 0.0863-0.051 0.13125-0.078-0.045 0.026-0.0863 0.051-0.13125 0.078"/>
   <path id="path5151" d="m305.59 951.52c-48.535 0-87.88-10.557-87.88-23.578 0-7.0074 11.392-13.301 29.481-17.619 0.0362 0.03 0.0688 0.059 0.10375 0.09-17.96 4.3026-29.265 10.562-29.265 17.529 0 12.974 39.201 23.491 87.56 23.491 48.358 0 87.559-10.518 87.559-23.491 0-6.9672-11.305-13.226-29.264-17.529 0.035-0.031 0.0675-0.06 0.1025-0.09 18.089 4.3174 29.482 10.611 29.482 17.619 0 13.021-39.345 23.578-87.88 23.578m37.24-44.845c0.0425-0.025 0.0875-0.052 0.13125-0.079-0.0438 0.026-0.0887 0.054-0.13125 0.079"/>
   <path id="path5153" d="m305.59 951.44c-48.359 0-87.56-10.518-87.56-23.491 0-6.9672 11.305-13.226 29.265-17.529 0.0337 0.029 0.07 0.061 0.10375 0.09-17.83 4.2866-29.048 10.511-29.048 17.439 0 12.926 39.058 23.406 87.239 23.406 48.18 0 87.239-10.48 87.239-23.406 0-6.9278-11.218-13.152-29.048-17.439 0.0325-0.029 0.07-0.061 0.10375-0.09 17.959 4.3026 29.264 10.562 29.264 17.529 0 12.974-39.201 23.491-87.559 23.491m37.108-44.68c0.0425-0.026 0.0888-0.052 0.1325-0.079-0.0438 0.026-0.09 0.053-0.1325 0.079"/>
   <path id="path5155" d="m305.59 951.35c-48.181 0-87.239-10.48-87.239-23.406 0-6.9277 11.218-13.152 29.048-17.439 0.035 0.031 0.0675 0.06 0.10375 0.091-17.701 4.269-28.831 10.459-28.831 17.348 0 12.879 38.915 23.32 86.919 23.32s86.918-10.441 86.918-23.32c0-6.8886-11.13-13.079-28.83-17.348 0.035-0.031 0.0675-0.06 0.10375-0.091 17.83 4.2866 29.048 10.511 29.048 17.439 0 12.926-39.059 23.406-87.239 23.406m36.974-44.516c0.0463-0.028 0.0875-0.053 0.13375-0.079-0.0463 0.026-0.0875 0.051-0.13375 0.079"/>
   <path id="path5157" d="m305.59 951.27c-48.004 0-86.919-10.441-86.919-23.32 0-6.8886 11.13-13.079 28.831-17.348 0.035 0.031 0.0688 0.06 0.10375 0.09-17.569 4.2525-28.614 10.41-28.614 17.257 0 12.831 38.771 23.234 86.598 23.234 47.826 0 86.598-10.403 86.598-23.234 0-6.8476-11.046-13.005-28.615-17.256 0.0362-0.031 0.0687-0.06 0.105-0.091 17.7 4.269 28.83 10.459 28.83 17.348 0 12.879-38.914 23.32-86.918 23.32m36.841-44.353c0.0425-0.025 0.09-0.052 0.1325-0.077-0.0425 0.025-0.09 0.052-0.1325 0.077"/>
   <path id="path5159" d="m305.59 951.18c-47.826 0-86.598-10.403-86.598-23.234 0-6.8476 11.045-13.005 28.614-17.257 0.0337 0.03 0.0712 0.062 0.105 0.091-17.441 4.2349-28.398 10.357-28.398 17.166 0 12.784 38.626 23.148 86.276 23.148 47.649 0 86.276-10.364 86.276-23.148 0-6.8086-10.956-12.931-28.398-17.166 0.0325-0.029 0.0712-0.062 0.10375-0.09 17.569 4.2515 28.615 10.409 28.615 17.256 0 12.831-38.771 23.234-86.598 23.234m36.708-44.188c0.045-0.026 0.0875-0.051 0.13375-0.079-0.0463 0.028-0.0887 0.053-0.13375 0.079"/>
   <path id="path5161" d="m305.59 951.09c-47.65 0-86.276-10.364-86.276-23.148 0-6.8086 10.956-12.931 28.398-17.166 0.035 0.031 0.0688 0.06 0.105 0.091-17.311 4.2187-28.182 10.307-28.182 17.075 0 12.736 38.484 23.061 85.956 23.061 47.471 0 85.955-10.325 85.955-23.061 0-6.7685-10.871-12.856-28.181-17.075 0.035-0.031 0.0688-0.06 0.105-0.091 17.441 4.2348 28.398 10.357 28.398 17.166 0 12.784-38.628 23.147-86.276 23.147m36.572-44.024c0.0438-0.025 0.0913-0.052 0.135-0.077-0.0438 0.025-0.0913 0.052-0.135 0.077"/>
   <path id="path5163" d="m305.59 951.01c-47.473 0-85.956-10.325-85.956-23.061 0-6.7685 10.871-12.856 28.182-17.075 0.035 0.03 0.0688 0.06 0.105 0.09-17.184 4.2021-27.966 10.256-27.966 16.985 0 12.688 38.34 22.976 85.635 22.976s85.635-10.288 85.635-22.976c0-6.729-10.784-12.783-27.966-16.985 0.035-0.03 0.0687-0.06 0.105-0.09 17.31 4.2188 28.181 10.307 28.181 17.075 0 12.736-38.484 23.061-85.955 23.061m36.438-43.858c0.045-0.026 0.0888-0.053 0.135-0.079-0.0463 0.026-0.09 0.053-0.135 0.079"/>
   <path id="path5165" d="m305.59 950.92c-47.295 0-85.635-10.288-85.635-22.976 0-6.729 10.782-12.783 27.966-16.985 0.0337 0.029 0.0712 0.062 0.105 0.091-17.054 4.1845-27.751 10.204-27.751 16.894 0 12.641 38.198 22.89 85.315 22.89 47.118 0 85.314-10.249 85.314-22.89 0-6.689-10.698-12.709-27.751-16.894 0.0337-0.029 0.0725-0.062 0.10625-0.091 17.182 4.2021 27.966 10.256 27.966 16.985 0 12.688-38.34 22.976-85.635 22.976m36.301-43.696c0.0463-0.026 0.09-0.051 0.13625-0.077-0.0463 0.026-0.09 0.051-0.13625 0.077"/>
   <path id="path5167" d="m305.59 950.84c-47.118 0-85.315-10.249-85.315-22.89 0-6.689 10.698-12.709 27.751-16.894 0.0362 0.03 0.07 0.06 0.10625 0.09-16.925 4.169-27.536 10.154-27.536 16.804 0 12.594 38.052 22.804 84.994 22.804 46.94 0 84.992-10.21 84.992-22.804 0-6.6499-10.611-12.635-27.536-16.804 0.0362-0.03 0.0713-0.06 0.10625-0.09 17.054 4.1845 27.751 10.204 27.751 16.894 0 12.641-38.196 22.89-85.314 22.89m36.166-43.531c0.0438-0.026 0.0913-0.054 0.135-0.079-0.0438 0.025-0.0913 0.053-0.135 0.079"/>
   <path id="path5169" d="m305.59 950.75c-46.941 0-84.994-10.21-84.994-22.804 0-6.6499 10.611-12.635 27.536-16.804 0.0363 0.031 0.07 0.06 0.10625 0.091-16.796 4.1513-27.321 10.102-27.321 16.712 0 12.546 37.909 22.717 84.673 22.717 46.762 0 84.672-10.171 84.672-22.717 0-6.6099-10.525-12.561-27.322-16.712 0.0362-0.031 0.0712-0.06 0.10625-0.091 16.925 4.169 27.536 10.154 27.536 16.804 0 12.594-38.052 22.804-84.992 22.804m36.029-43.368c0.0463-0.026 0.0913-0.052 0.1375-0.077-0.0463 0.025-0.0913 0.051-0.1375 0.077"/>
   <path id="path5171" d="m305.59 950.66c-46.764 0-84.673-10.171-84.673-22.717 0-6.6099 10.525-12.561 27.321-16.712 0.0362 0.03 0.0712 0.06 0.10625 0.09-16.668 4.1353-27.108 10.053-27.108 16.622 0 12.499 37.766 22.631 84.353 22.631 46.586 0 84.351-10.133 84.351-22.631 0-6.5699-10.439-12.487-27.108-16.622 0.0362-0.03 0.0712-0.06 0.10625-0.09 16.798 4.1514 27.322 10.102 27.322 16.712 0 12.546-37.91 22.717-84.672 22.717m35.891-43.204c0.0463-0.026 0.0913-0.051 0.1375-0.078-0.0463 0.026-0.0913 0.051-0.1375 0.078"/>
   <path id="path5173" d="m305.59 950.58c-46.586 0-84.353-10.133-84.353-22.631 0-6.5699 10.44-12.487 27.108-16.622 0.0362 0.031 0.0713 0.062 0.1075 0.091-16.541 4.1176-26.894 10-26.894 16.531 0 12.451 37.621 22.545 84.031 22.545 46.409 0 84.031-10.094 84.031-22.545 0-6.5313-10.352-12.414-26.894-16.531 0.035-0.03 0.0712-0.06 0.10625-0.091 16.669 4.1353 27.108 10.053 27.108 16.622 0 12.499-37.765 22.631-84.351 22.631m35.754-43.04c0.0463-0.025 0.0925-0.051 0.1375-0.078-0.045 0.026-0.0912 0.053-0.1375 0.078"/>
   <path id="path5175" d="m305.59 950.49c-46.41 0-84.031-10.094-84.031-22.545 0-6.5312 10.352-12.414 26.894-16.531 0.035 0.03 0.0712 0.06 0.1075 0.091-16.415 4.1001-26.681 9.9487-26.681 16.44 0 12.404 37.479 22.459 83.711 22.459 46.231 0 83.71-10.055 83.71-22.459 0-6.4913-10.266-12.34-26.68-16.44 0.0362-0.031 0.0712-0.062 0.1075-0.091 16.541 4.1176 26.894 10 26.894 16.531 0 12.451-37.622 22.545-84.031 22.545m35.616-42.876c0.045-0.025 0.0913-0.051 0.1375-0.078-0.0463 0.026-0.0925 0.052-0.1375 0.078"/>
   <path id="path5177" d="m305.59 950.41c-46.233 0-83.711-10.055-83.711-22.459 0-6.4912 10.266-12.34 26.681-16.44 0.035 0.03 0.0713 0.06 0.1075 0.09-16.289 4.084-26.468 9.8975-26.468 16.35 0 12.356 37.335 22.373 83.39 22.373s83.39-10.016 83.39-22.373c0-6.4526-10.18-12.266-26.468-16.35 0.0362-0.03 0.0713-0.06 0.1075-0.09 16.414 4.1001 26.68 9.9488 26.68 16.44 0 12.404-37.479 22.459-83.71 22.459m35.476-42.712c0.0463-0.026 0.0937-0.053 0.14-0.079-0.0463 0.026-0.0937 0.052-0.14 0.079"/>
   <path id="path5179" d="m305.59 950.32c-46.055 0-83.39-10.016-83.39-22.373 0-6.4526 10.179-12.266 26.468-16.35 0.0362 0.03 0.0713 0.06 0.1075 0.091-16.159 4.0664-26.254 9.8461-26.254 16.259 0 12.309 37.19 22.288 83.069 22.288 45.878 0 83.069-9.979 83.069-22.288 0-6.4126-10.095-12.192-26.255-16.259 0.0362-0.03 0.0725-0.061 0.10875-0.091 16.288 4.084 26.468 9.8975 26.468 16.35 0 12.356-37.335 22.373-83.39 22.373m35.338-42.547c0.0463-0.026 0.0925-0.053 0.13875-0.078-0.0463 0.025-0.0925 0.051-0.13875 0.078"/>
   <path id="path5181" d="m305.59 950.23c-45.879 0-83.069-9.979-83.069-22.288 0-6.4126 10.095-12.192 26.254-16.259 0.0362 0.03 0.0725 0.06 0.10875 0.09-16.031 4.0488-26.042 9.7965-26.042 16.169 0 12.261 37.048 22.201 82.749 22.201 45.7 0 82.748-9.9399 82.748-22.201 0-6.3725-10.011-12.12-26.041-16.169 0.035-0.03 0.0713-0.06 0.1075-0.09 16.16 4.0663 26.255 9.8461 26.255 16.259 0 12.309-37.191 22.288-83.069 22.288m35.198-42.386c0.0463-0.025 0.0937-0.051 0.14-0.076-0.0463 0.025-0.0937 0.051-0.14 0.076"/>
   <path id="path5183" d="m305.59 950.15c-45.701 0-82.749-9.94-82.749-22.201 0-6.3725 10.011-12.12 26.042-16.169 0.0362 0.031 0.0725 0.062 0.10875 0.091-15.906 4.0313-25.83 9.7441-25.83 16.078 0 12.214 36.904 22.115 82.428 22.115 45.522 0 82.428-9.9009 82.428-22.115 0-6.3335-9.9238-12.046-25.83-16.078 0.0362-0.03 0.0725-0.06 0.10875-0.091 16.03 4.0489 26.041 9.7965 26.041 16.169 0 12.261-37.048 22.201-82.748 22.201m35.056-42.223c0.0487-0.026 0.0925-0.05 0.14125-0.077-0.0487 0.027-0.0925 0.051-0.14125 0.077"/>
   <path id="path5185" d="m305.59 950.06c-45.524 0-82.428-9.9009-82.428-22.115 0-6.3335 9.9238-12.046 25.83-16.078 0.0362 0.03 0.0725 0.062 0.10875 0.091-15.779 4.0137-25.619 9.6914-25.619 15.986 0 12.166 36.761 22.029 82.108 22.029 45.346 0 82.106-9.8628 82.106-22.029 0-6.2949-9.8388-11.973-25.619-15.986 0.0362-0.03 0.0738-0.061 0.11-0.091 15.906 4.0313 25.83 9.7442 25.83 16.078 0 12.214-36.905 22.115-82.428 22.115m34.915-42.059c0.0463-0.025 0.095-0.051 0.14125-0.078-0.0463 0.026-0.095 0.053-0.14125 0.078"/>
   <path id="path5187" d="m305.59 949.98c-45.346 0-82.108-9.8628-82.108-22.029 0-6.2949 9.84-11.973 25.619-15.986 0.0363 0.03 0.0738 0.06 0.11 0.09-15.652 3.9977-25.408 9.6417-25.408 15.896 0 12.119 36.616 21.942 81.786 21.942 45.169 0 81.785-9.8237 81.785-21.942 0-6.2548-9.7538-11.899-25.406-15.896 0.0362-0.03 0.0725-0.06 0.10875-0.09 15.78 4.0138 25.619 9.6915 25.619 15.986 0 12.166-36.76 22.029-82.106 22.029m34.772-41.895c0.0487-0.026 0.0937-0.051 0.1425-0.078-0.0487 0.026-0.0937 0.051-0.1425 0.078"/>
   <path id="path5189" d="m305.59 949.89c-45.17 0-81.786-9.8237-81.786-21.942 0-6.2549 9.755-11.899 25.408-15.896 0.0362 0.03 0.0725 0.062 0.11 0.091-15.528 3.9799-25.196 9.5889-25.196 15.805 0 12.071 36.472 21.856 81.465 21.856 44.991 0 81.465-9.7852 81.465-21.856 0-6.2162-9.67-11.825-25.196-15.805 0.0362-0.03 0.0738-0.061 0.11-0.091 15.652 3.9976 25.406 9.6416 25.406 15.896 0 12.119-36.616 21.942-81.785 21.942m34.63-41.731c0.0475-0.025 0.0962-0.053 0.1425-0.078-0.0463 0.025-0.095 0.052-0.1425 0.078"/>
   <path id="path5191" d="m305.59 949.8c-44.993 0-81.465-9.7852-81.465-21.856 0-6.2162 9.6688-11.825 25.196-15.805 0.0362 0.03 0.0738 0.062 0.11 0.091-15.398 3.9614-24.986 9.5377-24.986 15.714 0 12.024 36.33 21.77 81.145 21.77 44.814 0 81.144-9.7461 81.144-21.77 0-6.1762-9.5875-11.752-24.985-15.714 0.0362-0.03 0.0737-0.061 0.11-0.091 15.526 3.9799 25.196 9.5889 25.196 15.805 0 12.071-36.474 21.856-81.465 21.856m34.488-41.569c0.0487-0.025 0.095-0.05 0.1425-0.076-0.0475 0.026-0.0937 0.051-0.1425 0.076"/>
   <path id="path5193" d="m305.59 949.72c-44.815 0-81.145-9.7461-81.145-21.77 0-6.1762 9.5888-11.752 24.986-15.714 0.0362 0.029 0.0737 0.06 0.11 0.09-15.272 3.9448-24.775 9.4858-24.775 15.624 0 11.976 36.186 21.685 80.824 21.685s80.822-9.709 80.822-21.685c0-6.1377-9.5012-11.679-24.775-15.624 0.0362-0.03 0.075-0.062 0.11125-0.09 15.398 3.9614 24.985 9.5377 24.985 15.714 0 12.024-36.33 21.77-81.144 21.77m34.344-41.405c0.0463-0.025 0.0963-0.052 0.14375-0.077-0.0475 0.025-0.0975 0.052-0.14375 0.077"/>
  </g>
  <g>
   <path id="path5195" d="m305.59 949.63c-44.638 0-80.824-9.709-80.824-21.685 0-6.1377 9.5025-11.679 24.775-15.624 0.0387 0.031 0.0725 0.06 0.11125 0.091-15.146 3.9278-24.566 9.4351-24.566 15.533 0 11.929 36.042 21.599 80.504 21.599 44.46 0 80.502-9.6699 80.502-21.599 0-6.0977-9.42-11.605-24.566-15.533 0.0387-0.031 0.0725-0.06 0.11125-0.091 15.274 3.9448 24.775 9.4858 24.775 15.624 0 11.976-36.185 21.685-80.822 21.685m34.199-41.244c0.0487-0.025 0.0962-0.05 0.145-0.077-0.0487 0.026-0.0962 0.051-0.145 0.077" fill="#feffff"/>
   <path id="path5197" d="m305.59 949.55c-44.461 0-80.504-9.67-80.504-21.599 0-6.0976 9.42-11.605 24.566-15.533 0.0362 0.03 0.075 0.062 0.11125 0.091-15.022 3.9101-24.356 9.3827-24.356 15.441 0 11.881 35.899 21.513 80.183 21.513 44.282 0 80.181-9.6313 80.181-21.513 0-6.0586-9.3338-11.531-24.356-15.441 0.0375-0.03 0.075-0.061 0.11125-0.091 15.146 3.9278 24.566 9.4352 24.566 15.533 0 11.929-36.042 21.599-80.502 21.599m34.054-41.08c0.0487-0.026 0.0962-0.051 0.145-0.077-0.0487 0.026-0.0962 0.051-0.145 0.077" fill="#feffff"/>
   <path id="path5199" d="m305.59 949.46c-44.284 0-80.183-9.6313-80.183-21.513 0-6.0586 9.3338-11.531 24.356-15.441 0.0362 0.029 0.075 0.062 0.11125 0.09-14.895 3.8922-24.146 9.3327-24.146 15.351 0 11.834 35.755 21.426 79.861 21.426s79.861-9.5923 79.861-21.426c0-6.0185-9.2512-11.459-24.148-15.351 0.0362-0.029 0.075-0.062 0.11125-0.09 15.022 3.9102 24.356 9.3828 24.356 15.441 0 11.881-35.899 21.513-80.181 21.513m33.909-40.917c0.0487-0.025 0.0962-0.05 0.145-0.077-0.0487 0.026-0.0962 0.051-0.145 0.077" fill="#fefeff"/>
   <path id="path5201" d="m305.59 949.37c-44.106 0-79.861-9.5923-79.861-21.426 0-6.0185 9.2512-11.459 24.146-15.351 0.0387 0.031 0.0738 0.06 0.1125 0.091-14.77 3.8755-23.939 9.2802-23.939 15.26 0 11.786 35.611 21.34 79.541 21.34 43.929 0 79.54-9.5537 79.54-21.34 0-5.98-9.1675-11.385-23.939-15.26 0.0387-0.031 0.0737-0.06 0.1125-0.091 14.896 3.8921 24.148 9.3326 24.148 15.351 0 11.834-35.755 21.426-79.861 21.426m33.762-40.754c0.0463-0.025 0.0988-0.052 0.14625-0.077-0.0475 0.025-0.1 0.052-0.14625 0.077" fill="#fefefe"/>
   <path id="path5203" d="m305.59 949.29c-43.93 0-79.541-9.5537-79.541-21.34 0-5.98 9.1688-11.385 23.939-15.26 0.0362 0.03 0.0763 0.062 0.1125 0.091-14.645 3.8565-23.73 9.2276-23.73 15.169 0 11.739 35.468 21.255 79.22 21.255 43.751 0 79.219-9.5162 79.219-21.255 0-5.9414-9.0838-11.312-23.73-15.169 0.0375-0.03 0.0763-0.061 0.1125-0.091 14.771 3.8755 23.939 9.2802 23.939 15.26 0 11.786-35.611 21.34-79.54 21.34m33.615-40.591c0.0487-0.025 0.0975-0.051 0.1475-0.076-0.05 0.025-0.0987 0.051-0.1475 0.076" fill="#fefefe"/>
   <path id="path5205" d="m305.59 949.2c-43.753 0-79.22-9.5161-79.22-21.255 0-5.9414 9.085-11.312 23.73-15.169 0.0387 0.031 0.0738 0.059 0.1125 0.09-14.521 3.8399-23.522 9.1773-23.522 15.079 0 11.691 35.325 21.169 78.9 21.169s78.899-9.4776 78.899-21.169c0-5.9013-9.0012-11.239-23.522-15.079 0.0387-0.031 0.0737-0.059 0.1125-0.09 14.646 3.8565 23.73 9.2276 23.73 15.169 0 11.739-35.468 21.255-79.219 21.255m33.468-40.43c0.0513-0.026 0.0963-0.05 0.1475-0.077-0.0512 0.026-0.0962 0.05-0.1475 0.077" fill="#fdfefe"/>
   <path id="path5207" d="m305.59 949.12c-43.575 0-78.9-9.4776-78.9-21.169 0-5.9014 9.0012-11.239 23.522-15.079l0.11375 0.091c-14.395 3.8207-23.315 9.125-23.315 14.987 0 11.644 35.181 21.083 78.579 21.083s78.578-9.439 78.578-21.083c0-5.8622-8.92-11.166-23.315-14.987 0.0375-0.029 0.0775-0.062 0.11375-0.091 14.521 3.8399 23.522 9.1772 23.522 15.079 0 11.691-35.324 21.169-78.899 21.169m33.319-40.268c0.0487-0.025 0.0987-0.051 0.14875-0.076-0.05 0.025-0.1 0.051-0.14875 0.076" fill="#fdfefe"/>
   <path id="path5209" d="m305.59 949.03c-43.398 0-78.579-9.4389-78.579-21.082 0-5.8622 8.92-11.166 23.315-14.987 0.0387 0.031 0.075 0.06 0.11375 0.091-14.271 3.8042-23.108 9.0727-23.108 14.896 0 11.596 35.036 20.996 78.258 20.996 43.22 0 78.258-9.3999 78.258-20.996 0-5.8238-8.8362-11.092-23.109-14.896 0.04-0.031 0.075-0.06 0.11375-0.091 14.395 3.8207 23.315 9.125 23.315 14.987 0 11.644-35.18 21.082-78.578 21.082m33.17-40.105c0.0487-0.025 0.1-0.051 0.14875-0.076-0.0487 0.025-0.1 0.051-0.14875 0.076" fill="#fdfdfe"/>
   <path id="path5211" d="m305.59 948.94c-43.221 0-78.258-9.3999-78.258-20.996 0-5.8237 8.8362-11.092 23.108-14.896 0.0362 0.029 0.0775 0.062 0.11375 0.091-14.146 3.7851-22.901 9.0214-22.901 14.805 0 11.549 34.894 20.91 77.938 20.91 43.042 0 77.936-9.3614 77.936-20.91 0-5.7837-8.755-11.02-22.901-14.805l0.11375-0.091c14.272 3.8042 23.109 9.0727 23.109 14.896 0 11.596-35.038 20.996-78.258 20.996m33.02-39.942c0.0487-0.025 0.10125-0.051 0.15-0.076-0.0487 0.025-0.10125 0.051-0.15 0.076" fill="#fdfdfd"/>
   <path id="path5213" d="m305.59 948.86c-43.044 0-77.938-9.3614-77.938-20.91 0-5.7837 8.755-11.02 22.901-14.805 0.04 0.031 0.0762 0.06 0.115 0.09-14.025 3.7686-22.695 8.9697-22.695 14.715 0 11.501 34.75 20.824 77.616 20.824s77.615-9.3223 77.615-20.824c0-5.7452-8.67-10.946-22.694-14.715 0.0387-0.03 0.075-0.059 0.11375-0.09 14.146 3.7851 22.901 9.0214 22.901 14.805 0 11.549-34.894 20.91-77.936 20.91m32.87-39.78c0.0512-0.026 0.0987-0.05 0.15-0.076-0.0513 0.026-0.0988 0.05-0.15 0.076" fill="#fdfdfd"/>
   <path id="path5215" d="m305.59 948.77c-42.866 0-77.616-9.3222-77.616-20.824 0-5.7451 8.67-10.946 22.695-14.715 0.0362 0.03 0.0775 0.062 0.115 0.091-13.901 3.75-22.489 8.9175-22.489 14.624 0 11.454 34.606 20.737 77.295 20.737s77.295-9.2836 77.295-20.737c0-5.706-8.5888-10.874-22.489-14.624 0.0362-0.029 0.0775-0.062 0.115-0.091 14.024 3.7687 22.694 8.9698 22.694 14.715 0 11.502-34.749 20.824-77.615 20.824m32.719-39.618c0.05-0.025 0.10125-0.051 0.15125-0.076-0.05 0.025-0.10125 0.051-0.15125 0.076" fill="#fcfdfd"/>
   <path id="path5217" d="m305.59 948.68c-42.689 0-77.295-9.2837-77.295-20.737 0-5.706 8.5875-10.874 22.489-14.624 0.0388 0.031 0.0763 0.06 0.115 0.091-13.778 3.7315-22.284 8.8653-22.284 14.533 0 11.406 34.462 20.652 76.975 20.652 42.511 0 76.974-9.2461 76.974-20.652 0-5.6675-8.5062-10.801-22.284-14.533 0.04-0.031 0.0762-0.059 0.11625-0.091 13.9 3.75 22.489 8.9175 22.489 14.624 0 11.454-34.606 20.737-77.295 20.737m32.566-39.455c0.0525-0.026 0.10125-0.05 0.1525-0.076-0.0512 0.026-0.1 0.05-0.1525 0.076" fill="#fcfdfd"/>
   <path id="path5219" d="m305.59 948.6c-42.513 0-76.975-9.2461-76.975-20.652 0-5.6675 8.5062-10.801 22.284-14.533 0.0387 0.031 0.0763 0.06 0.11625 0.091-13.651 3.7138-22.079 8.8138-22.079 14.441 0 11.359 34.319 20.566 76.654 20.566 42.334 0 76.654-9.2075 76.654-20.566 0-5.6275-8.4275-10.728-22.079-14.441 0.0387-0.031 0.0763-0.06 0.115-0.091 13.778 3.7315 22.284 8.8652 22.284 14.533 0 11.406-34.462 20.652-76.974 20.652m32.414-39.294c0.05-0.025 0.10375-0.051 0.1525-0.077-0.0487 0.025-0.1025 0.051-0.1525 0.077" fill="#fcfcfd"/>
   <path id="path5221" d="m305.59 948.51c-42.335 0-76.654-9.2075-76.654-20.566 0-5.6275 8.4275-10.728 22.079-14.441 0.0362 0.029 0.0787 0.062 0.11625 0.091-13.53 3.6954-21.875 8.7613-21.875 14.35 0 11.311 34.176 20.48 76.334 20.48s76.332-9.1689 76.332-20.48c0-5.5889-8.345-10.655-21.874-14.35 0.0375-0.029 0.0788-0.062 0.11625-0.091 13.651 3.7139 22.079 8.8139 22.079 14.441 0 11.359-34.32 20.566-76.654 20.566m32.261-39.133c0.0512-0.025 0.10125-0.05 0.1525-0.075-0.0512 0.025-0.10125 0.05-0.1525 0.075" fill="#fcfcfc"/>
   <path id="path5223" d="m305.59 948.43c-42.158 0-76.334-9.1689-76.334-20.48 0-5.5889 8.345-10.655 21.875-14.35 0.0387 0.03 0.0763 0.06 0.11625 0.091-13.405 3.6762-21.67 8.709-21.67 14.259 0 11.264 34.031 20.394 76.013 20.394 41.98 0 76.011-9.1299 76.011-20.394 0-5.5497-8.2638-10.582-21.669-14.259 0.0387-0.031 0.0775-0.061 0.11625-0.091 13.529 3.6954 21.874 8.7612 21.874 14.35 0 11.311-34.175 20.48-76.332 20.48m32.108-38.97c0.0513-0.026 0.1025-0.05 0.15375-0.076-0.0512 0.026-0.1025 0.05-0.15375 0.076" fill="#fbfcfc"/>
   <path id="path5225" d="m305.59 948.34c-41.981 0-76.013-9.1299-76.013-20.394 0-5.5497 8.265-10.582 21.67-14.259 0.0387 0.03 0.0775 0.06 0.11625 0.09-13.284 3.6602-21.465 8.6577-21.465 14.169 0 11.216 33.888 20.308 75.691 20.308 41.802 0 75.691-9.0914 75.691-20.308 0-5.5113-8.1825-10.509-21.466-14.169 0.04-0.03 0.0775-0.06 0.1175-0.09 13.405 3.6762 21.669 8.709 21.669 14.259 0 11.264-34.031 20.394-76.011 20.394m31.952-38.809c0.0513-0.025 0.1025-0.05 0.155-0.075-0.0525 0.025-0.10375 0.05-0.155 0.075" fill="#fbfcfc"/>
   <path id="path5227" d="m305.59 948.25c-41.804 0-75.691-9.0913-75.691-20.308 0-5.5112 8.1812-10.509 21.465-14.169 0.04 0.031 0.0787 0.062 0.1175 0.091-13.161 3.6411-21.262 8.605-21.262 14.078 0 11.169 33.745 20.221 75.371 20.221s75.37-9.0522 75.37-20.221c0-5.4726-8.1012-10.436-21.262-14.078 0.04-0.03 0.0788-0.06 0.1175-0.091 13.284 3.6603 21.466 8.6578 21.466 14.169 0 11.216-33.889 20.308-75.691 20.308m31.798-38.646c0.0513-0.025 0.10375-0.051 0.155-0.076-0.0512 0.025-0.10375 0.051-0.155 0.076" fill="#fbfbfb"/>
   <path id="path5229" d="m305.59 948.17c-41.626 0-75.371-9.0522-75.371-20.221 0-5.4726 8.1012-10.436 21.262-14.078 0.04 0.031 0.0787 0.062 0.1175 0.091-13.038 3.6226-21.059 8.5527-21.059 13.986 0 11.12 33.601 20.136 75.05 20.136s75.049-9.0161 75.049-20.136c0-5.4337-8.02-10.364-21.059-13.986 0.04-0.03 0.0788-0.06 0.1175-0.091 13.161 3.6411 21.262 8.605 21.262 14.078 0 11.169-33.744 20.221-75.37 20.221m31.641-38.485c0.0513-0.025 0.10375-0.05 0.15625-0.075-0.0525 0.025-0.105 0.05-0.15625 0.075" fill="#fbfbfb"/>
   <path id="path5231" d="m305.59 948.08c-41.449 0-75.05-9.0161-75.05-20.136 0-5.4336 8.0212-10.364 21.059-13.986 0.04 0.03 0.0788 0.062 0.11875 0.091-12.916 3.604-20.858 8.5-20.858 13.895 0 11.072 33.458 20.05 74.73 20.05 41.271 0 74.729-8.9775 74.729-20.05 0-5.395-7.94-10.291-20.858-13.895 0.04-0.03 0.0787-0.061 0.11875-0.091 13.039 3.6227 21.059 8.5528 21.059 13.986 0 11.12-33.6 20.136-75.049 20.136m31.484-38.325l0.1575-0.075-0.1575 0.075" fill="#fafbfb"/>
   <path id="path5233" d="m305.59 948c-41.273 0-74.73-8.9775-74.73-20.05 0-5.395 7.9412-10.291 20.858-13.895 0.04 0.03 0.0788 0.062 0.11875 0.091-12.792 3.585-20.655 8.4488-20.655 13.804 0 11.025 33.314 19.964 74.409 19.964 41.094 0 74.408-8.939 74.408-19.964 0-5.355-7.8612-10.219-20.654-13.804 0.0387-0.03 0.0787-0.062 0.1175-0.091 12.918 3.604 20.858 8.5 20.858 13.895 0 11.072-33.458 20.05-74.729 20.05m31.326-38.162c0.0525-0.026 0.105-0.051 0.1575-0.077-0.0525 0.025-0.105 0.051-0.1575 0.077" fill="#fafbfb"/>
   <path id="path5235" d="m305.59 947.91c-41.095 0-74.409-8.939-74.409-19.964 0-5.355 7.8625-10.219 20.655-13.804 0.04 0.03 0.0788 0.061 0.11875 0.091-12.672 3.5658-20.452 8.396-20.452 13.712 0 10.978 33.17 19.878 74.088 19.878s74.088-8.9 74.088-19.878c0-5.3163-7.7812-10.146-20.454-13.712 0.04-0.03 0.08-0.062 0.12-0.091 12.792 3.585 20.654 8.4487 20.654 13.804 0 11.025-33.314 19.964-74.408 19.964m31.168-38.002c0.0525-0.025 0.10625-0.051 0.15875-0.075-0.0525 0.023-0.10625 0.05-0.15875 0.075" fill="#fafafa"/>
   <path id="path5237" d="m305.59 947.82c-40.918 0-74.088-8.9-74.088-19.878 0-5.3164 7.78-10.146 20.452-13.712 0.04 0.03 0.08 0.061 0.12 0.091-12.55 3.5474-20.252 8.3438-20.252 13.621 0 10.93 33.028 19.791 73.768 19.791s73.766-8.8609 73.766-19.791c0-5.2774-7.7012-10.074-20.251-13.621 0.0387-0.03 0.0788-0.062 0.11875-0.091 12.672 3.5659 20.454 8.396 20.454 13.712 0 10.978-33.17 19.878-74.088 19.878m31.009-37.84c0.0537-0.026 0.105-0.05 0.15875-0.075-0.0537 0.025-0.105 0.049-0.15875 0.075" fill="#fafafa"/>
   <path id="path5239" d="m305.59 947.74c-40.74 0-73.768-8.8609-73.768-19.791 0-5.2774 7.7025-10.074 20.252-13.621 0.04 0.03 0.08 0.061 0.12 0.091-12.431 3.5282-20.051 8.291-20.051 13.53 0 10.882 32.882 19.705 73.446 19.705 40.562 0 73.445-8.8227 73.445-19.705 0-5.2387-7.6188-10.002-20.05-13.53 0.0388-0.03 0.08-0.062 0.12-0.091 12.55 3.5474 20.251 8.3437 20.251 13.621 0 10.93-33.026 19.791-73.766 19.791m30.849-37.679c0.0512-0.025 0.1075-0.051 0.16-0.075-0.0525 0.023-0.10875 0.05-0.16 0.075" fill="#f9fafa"/>
   <path id="path5241" d="m305.59 947.65c-40.564 0-73.446-8.8227-73.446-19.705 0-5.2387 7.62-10.002 20.051-13.53 0.04 0.03 0.08 0.061 0.12 0.091-12.31 3.5102-19.851 8.2387-19.851 13.439 0 10.835 32.74 19.619 73.126 19.619 40.385 0 73.125-8.7836 73.125-19.619 0-5.2003-7.54-9.9288-19.851-13.439 0.04-0.03 0.0813-0.061 0.12125-0.091 12.431 3.5282 20.05 8.291 20.05 13.53 0 10.882-32.882 19.705-73.445 19.705m30.688-37.518c0.055-0.026 0.10625-0.05 0.16125-0.075-0.055 0.026-0.10625 0.049-0.16125 0.075" fill="#f9f9f9"/>
   <path id="path5243" d="m305.59 947.57c-40.386 0-73.126-8.7837-73.126-19.619 0-5.2002 7.5412-9.9287 19.851-13.439 0.04 0.03 0.0813 0.062 0.12125 0.091-12.188 3.4911-19.651 8.1865-19.651 13.348 0 10.788 32.596 19.534 72.805 19.534s72.804-8.746 72.804-19.534c0-5.1611-7.4638-9.8565-19.65-13.348 0.04-0.03 0.08-0.061 0.12-0.091 12.311 3.5103 19.851 8.2388 19.851 13.439 0 10.835-32.74 19.619-73.125 19.619m30.526-37.357c0.0538-0.025 0.10625-0.049 0.16125-0.074-0.055 0.025-0.1075 0.049-0.16125 0.074" fill="#f9f9f9"/>
   <path id="path5245" d="m305.59 947.48c-40.209 0-72.805-8.7461-72.805-19.534 0-5.1611 7.4638-9.8565 19.651-13.348 0.0412 0.031 0.0788 0.059 0.12125 0.091-12.068 3.4726-19.451 8.1339-19.451 13.256 0 10.74 32.451 19.448 72.484 19.448 40.031 0 72.484-8.7075 72.484-19.448 0-5.1225-7.3838-9.7838-19.452-13.256 0.0425-0.032 0.08-0.06 0.1225-0.091 12.186 3.4911 19.65 8.1865 19.65 13.348 0 10.788-32.595 19.534-72.804 19.534m30.362-37.197c0.055-0.025 0.10875-0.05 0.16375-0.075-0.055 0.025-0.10875 0.05-0.16375 0.075" fill="#f8f9f9"/>
   <path id="path5247" d="m305.59 947.39c-40.033 0-72.484-8.7075-72.484-19.448 0-5.1225 7.3838-9.7837 19.451-13.256 0.04 0.03 0.0813 0.062 0.12125 0.091-11.949 3.4537-19.252 8.08-19.252 13.165 0 10.692 32.309 19.361 72.164 19.361 39.854 0 72.162-8.669 72.162-19.361 0-5.085-7.3038-9.7113-19.252-13.165 0.04-0.03 0.0825-0.061 0.12125-0.091 12.069 3.4727 19.452 8.1339 19.452 13.256 0 10.74-32.452 19.448-72.484 19.448m30.2-37.037c0.0525-0.023 0.11-0.051 0.1625-0.075-0.0525 0.024-0.11 0.051-0.1625 0.075" fill="#f8f8f8"/>
   <path id="path5249" d="m305.59 947.31c-39.855 0-72.164-8.6689-72.164-19.361 0-5.085 7.3038-9.7114 19.252-13.165 0.04 0.029 0.0825 0.062 0.1225 0.091-11.828 3.4351-19.054 8.0274-19.054 13.074 0 10.645 32.165 19.275 71.843 19.275s71.841-8.6299 71.841-19.275c0-5.0464-7.225-9.6387-19.054-13.074 0.04-0.03 0.0825-0.062 0.1225-0.091 11.949 3.4536 19.252 8.08 19.252 13.165 0 10.692-32.309 19.361-72.162 19.361m30.035-36.876c0.055-0.024 0.11-0.049 0.165-0.074-0.055 0.025-0.11 0.05-0.165 0.074" fill="#f8f8f8"/>
   <path id="path5251" d="m305.59 947.22c-39.678 0-71.843-8.6299-71.843-19.275 0-5.0464 7.2262-9.6386 19.054-13.074 0.0425 0.031 0.0812 0.059 0.1225 0.091-11.708 3.416-18.855 7.975-18.855 12.982 0 10.598 32.021 19.189 71.521 19.189s71.521-8.5913 71.521-19.189c0-5.0073-7.1488-9.5663-18.856-12.982 0.0425-0.033 0.0813-0.06 0.1225-0.091 11.829 3.4351 19.054 8.0273 19.054 13.074 0 10.645-32.164 19.275-71.841 19.275m29.87-36.715c0.0575-0.026 0.10875-0.049 0.165-0.075-0.0563 0.026-0.1075 0.049-0.165 0.075" fill="#f7f8f8"/>
   <path id="path5253" d="m305.59 947.14c-39.5 0-71.521-8.5914-71.521-19.189 0-5.0074 7.1475-9.5664 18.855-12.982 0.04 0.029 0.0837 0.061 0.12375 0.091-11.589 3.3975-18.659 7.9224-18.659 12.891 0 10.55 31.878 19.102 71.201 19.102 39.322 0 71.2-8.5528 71.2-19.102 0-4.9688-7.07-9.4937-18.658-12.891 0.04-0.03 0.0825-0.062 0.1225-0.091 11.708 3.416 18.856 7.975 18.856 12.982 0 10.598-32.021 19.189-71.521 19.189m29.704-36.555c0.055-0.024 0.11125-0.049 0.16625-0.074-0.055 0.025-0.11125 0.05-0.16625 0.074" fill="#f7f7f7"/>
   <path id="path5255" d="m305.59 947.05c-39.324 0-71.201-8.5528-71.201-19.103 0-4.9687 7.07-9.4936 18.659-12.891 0.0425 0.031 0.0813 0.06 0.12375 0.091-11.47 3.3784-18.461 7.8696-18.461 12.8 0 10.502 31.734 19.016 70.88 19.016s70.88-8.5137 70.88-19.016c0-4.9301-6.9925-9.4213-18.461-12.8 0.0425-0.031 0.0813-0.06 0.12375-0.091 11.588 3.3975 18.658 7.9224 18.658 12.891 0 10.55-31.878 19.103-71.2 19.103m29.538-36.394c0.055-0.025 0.11125-0.05 0.16625-0.075-0.055 0.025-0.11125 0.05-0.16625 0.075" fill="#f6f7f7"/>
   <path id="path5257" d="m305.59 946.96c-39.146 0-70.88-8.5136-70.88-19.016 0-4.9301 6.9912-9.4214 18.461-12.8 0.04 0.028 0.0837 0.061 0.12375 0.091-11.349 3.3588-18.265 7.8178-18.265 12.709 0 10.455 31.591 18.931 70.56 18.931s70.559-8.476 70.559-18.931c0-4.8912-6.915-9.3502-18.265-12.709 0.0412-0.03 0.085-0.062 0.125-0.091 11.469 3.3783 18.461 7.8696 18.461 12.8 0 10.502-31.734 19.016-70.88 19.016m29.37-36.233c0.0563-0.025 0.11-0.049 0.1675-0.074-0.0575 0.025-0.11125 0.049-0.1675 0.074" fill="#f6f6f7"/>
   <path id="path5259" d="m305.59 946.88c-38.969 0-70.56-8.4761-70.56-18.931 0-4.8911 6.9162-9.3501 18.265-12.709 0.0425 0.031 0.0825 0.06 0.125 0.091-11.232 3.3403-18.069 7.7651-18.069 12.618 0 10.408 31.446 18.845 70.239 18.845 38.791 0 70.238-8.4374 70.238-18.845 0-4.8525-6.8362-9.2773-18.068-12.618 0.0425-0.031 0.0813-0.06 0.12375-0.091 11.35 3.3589 18.265 7.8179 18.265 12.709 0 10.455-31.59 18.931-70.559 18.931m29.201-36.075c0.055-0.024 0.11375-0.05 0.16875-0.074-0.055 0.023-0.11375 0.05-0.16875 0.074" fill="#f6f6f6"/>
   <path id="path5261" d="m305.59 946.79c-38.793 0-70.239-8.4374-70.239-18.845 0-4.8525 6.8362-9.2774 18.069-12.618 0.04 0.029 0.0838 0.062 0.125 0.091-11.114 3.3213-17.872 7.7114-17.872 12.526 0 10.36 31.302 18.759 69.918 18.759 38.614 0 69.918-8.399 69.918-18.759 0-4.815-6.76-9.2051-17.872-12.526 0.04-0.03 0.085-0.062 0.125-0.091 11.231 3.3402 18.068 7.7651 18.068 12.618 0 10.408-31.446 18.845-70.238 18.845m29.031-35.915c0.0575-0.025 0.1125-0.049 0.17-0.074-0.0575 0.025-0.1125 0.048-0.17 0.074" fill="#f5f6f6"/>
   <path id="path5263" d="m305.59 946.71c-38.615 0-69.918-8.3989-69.918-18.759 0-4.815 6.7588-9.2051 17.872-12.526 0.0425 0.031 0.0825 0.06 0.125 0.091-10.995 3.3027-17.678 7.6587-17.678 12.435 0 10.312 31.16 18.672 69.598 18.672s69.596-8.3599 69.596-18.672c0-4.7763-6.6825-9.1323-17.678-12.435 0.0425-0.031 0.0838-0.06 0.12625-0.091 11.112 3.3213 17.872 7.7114 17.872 12.526 0 10.36-31.304 18.759-69.918 18.759m28.861-35.755c0.0562-0.025 0.1125-0.049 0.17-0.074-0.0575 0.025-0.11375 0.048-0.17 0.074" fill="#f5f5f5"/>
   <path id="path5265" d="m305.59 946.62c-38.438 0-69.598-8.3599-69.598-18.672 0-4.7764 6.6825-9.1324 17.678-12.435 0.0425 0.031 0.0838 0.06 0.12625 0.091-10.878 3.2828-17.482 7.6065-17.482 12.344 0 10.265 31.016 18.586 69.276 18.586s69.276-8.3213 69.276-18.586c0-4.7373-6.6062-9.061-17.484-12.344 0.0437-0.031 0.0838-0.06 0.12625-0.091 10.995 3.3026 17.678 7.6586 17.678 12.435 0 10.312-31.159 18.672-69.596 18.672m28.689-35.595c0.055-0.024 0.11625-0.05 0.1725-0.074-0.0563 0.024-0.1175 0.05-0.1725 0.074" fill="#f5f5f5"/>
   <path id="path5267" d="m305.59 946.53c-38.26 0-69.276-8.3213-69.276-18.586 0-4.7372 6.605-9.061 17.482-12.344 0.0425 0.031 0.0837 0.061 0.12625 0.091-10.758 3.2637-17.288 7.5537-17.288 12.252 0 10.217 30.871 18.5 68.955 18.5 38.082 0 68.955-8.2828 68.955-18.5 0-4.6988-6.5312-8.9888-17.289-12.252 0.0425-0.03 0.0838-0.06 0.12625-0.091 10.878 3.2827 17.484 7.6065 17.484 12.344 0 10.265-31.016 18.586-69.276 18.586m28.516-35.435c0.0575-0.025 0.115-0.049 0.1725-0.074-0.0575 0.025-0.115 0.049-0.1725 0.074" fill="#f4f4f4"/>
   <path id="path5269" d="m305.59 946.45c-38.084 0-68.955-8.2827-68.955-18.5 0-4.6987 6.53-8.9887 17.288-12.252 0.0412 0.03 0.0863 0.062 0.1275 0.091-10.642 3.2436-17.095 7.5-17.095 12.161 0 10.17 30.729 18.415 68.635 18.415 37.905 0 68.634-8.2452 68.634-18.415 0-4.6611-6.4525-8.9175-17.094-12.161 0.04-0.029 0.0863-0.062 0.12625-0.091 10.758 3.2638 17.289 7.5538 17.289 12.252 0 10.217-30.872 18.5-68.955 18.5m28.344-35.276c0.0588-0.025 0.1125-0.047 0.1725-0.072-0.06 0.025-0.11375 0.047-0.1725 0.072" fill="#f4f4f4"/>
   <path id="path5271" d="m305.59 946.36c-37.906 0-68.635-8.2452-68.635-18.415 0-4.6611 6.4525-8.9175 17.095-12.161 0.0425 0.031 0.085 0.061 0.1275 0.092-10.524 3.2236-16.901 7.4464-16.901 12.069 0 10.122 30.585 18.329 68.314 18.329s68.314-8.2061 68.314-18.329c0-4.6225-6.3775-8.8453-16.902-12.069 0.0437-0.031 0.085-0.061 0.12875-0.092 10.641 3.2436 17.094 7.5 17.094 12.161 0 10.17-30.729 18.415-68.634 18.415m28.169-35.118c0.0575-0.024 0.11625-0.049 0.175-0.074-0.0587 0.025-0.1175 0.05-0.175 0.074" fill="#f3f3f3"/>
   <path id="path5273" d="m305.59 946.28c-37.729 0-68.314-8.2061-68.314-18.329 0-4.6225 6.3775-8.8452 16.901-12.069 0.0425 0.03 0.085 0.06 0.1275 0.091-10.406 3.205-16.709 7.3935-16.709 11.978 0 10.075 30.441 18.243 67.994 18.243 37.551 0 67.992-8.1674 67.992-18.243 0-4.584-6.3012-8.7725-16.709-11.978 0.0425-0.031 0.085-0.061 0.1275-0.091 10.525 3.2237 16.902 7.4464 16.902 12.069 0 10.122-30.585 18.329-68.314 18.329m27.992-34.958c0.0588-0.025 0.11875-0.05 0.17625-0.074-0.0575 0.024-0.1175 0.049-0.17625 0.074" fill="#f3f3f2"/>
   <path id="path5275" d="m305.59 946.19c-37.553 0-67.994-8.1674-67.994-18.243 0-4.584 6.3025-8.7725 16.709-11.978 0.0437 0.03 0.0863 0.062 0.12875 0.091-10.289 3.1851-16.516 7.3413-16.516 11.886 0 10.027 30.298 18.156 67.673 18.156 37.374 0 67.672-8.1289 67.672-18.156 0-4.5449-6.2288-8.7011-16.518-11.886 0.0437-0.03 0.0862-0.062 0.12875-0.091 10.408 3.205 16.709 7.3935 16.709 11.978 0 10.075-30.441 18.243-67.992 18.243m27.816-34.799c0.06-0.025 0.11625-0.047 0.17625-0.073-0.06 0.025-0.11625 0.048-0.17625 0.073" fill="#f2f2f2"/>
   <path id="path5277" d="m305.59 946.1c-37.375 0-67.673-8.1289-67.673-18.156 0-4.5449 6.2275-8.7011 16.516-11.886 0.0437 0.03 0.0863 0.061 0.12875 0.091-10.172 3.165-16.324 7.2875-16.324 11.795 0 9.98 30.154 18.07 67.351 18.07 37.198 0 67.351-8.0899 67.351-18.07 0-4.5073-6.1512-8.6298-16.325-11.795 0.0425-0.03 0.0862-0.062 0.12875-0.091 10.289 3.1851 16.518 7.3413 16.518 11.886 0 10.027-30.299 18.156-67.672 18.156m27.639-34.64c0.0588-0.024 0.12-0.049 0.1775-0.072-0.0575 0.023-0.11875 0.049-0.1775 0.072" fill="#f2f1f1"/>
   <path id="path5279" d="m305.59 946.02c-37.198 0-67.351-8.0898-67.351-18.07 0-4.5074 6.1512-8.6299 16.324-11.795 0.0438 0.031 0.0875 0.061 0.13 0.092-10.056 3.145-16.134 7.2339-16.134 11.703 0 9.9326 30.011 17.984 67.031 17.984s67.03-8.0513 67.03-17.984c0-4.4688-6.0775-8.5577-16.134-11.703 0.0438-0.031 0.0875-0.061 0.13-0.092 10.174 3.165 16.325 7.2875 16.325 11.795 0 9.98-30.154 18.07-67.351 18.07m27.46-34.48c0.06-0.025 0.11875-0.049 0.17875-0.074-0.06 0.025-0.11875 0.049-0.17875 0.074" fill="#f1f1f1"/>
   <path id="path5281" d="m305.59 945.93c-37.02 0-67.031-8.0513-67.031-17.984 0-4.4687 6.0775-8.5576 16.134-11.703 0.0438 0.03 0.0875 0.062 0.13 0.091-9.94 3.125-15.942 7.1802-15.942 11.611 0 9.8847 29.866 17.897 66.71 17.897 36.842 0 66.71-8.0127 66.71-17.897 0-4.4312-6.0038-8.4864-15.944-11.611 0.0438-0.03 0.0875-0.061 0.13-0.091 10.056 3.145 16.134 7.2339 16.134 11.703 0 9.9326-30.01 17.984-67.03 17.984m27.281-34.321c0.06-0.025 0.11875-0.049 0.17875-0.073-0.06 0.024-0.11875 0.048-0.17875 0.073" fill="#f0f0f0"/>
   <path id="path5283" d="m305.59 945.84c-36.844 0-66.71-8.0127-66.71-17.898 0-4.4311 6.0025-8.4864 15.942-11.611 0.0437 0.03 0.0875 0.062 0.13125 0.091-9.825 3.1064-15.754 7.1274-15.754 11.52 0 9.8374 29.724 17.812 66.39 17.812 36.665 0 66.389-7.9751 66.389-17.812 0-4.3926-5.9275-8.4136-15.752-11.52 0.0425-0.03 0.0875-0.061 0.13-0.091 9.94 3.125 15.944 7.1803 15.944 11.611 0 9.8848-29.868 17.898-66.71 17.898m27.1-34.163c0.06-0.024 0.12-0.049 0.18125-0.072-0.0612 0.023-0.12125 0.049-0.18125 0.072" fill="#f0f0ef"/>
   <path id="path5285" d="m305.59 945.76c-36.666 0-66.39-7.9751-66.39-17.812 0-4.3926 5.9288-8.4136 15.754-11.52 0.045 0.031 0.085 0.06 0.13125 0.091-9.7112 3.0865-15.564 7.0738-15.564 11.429 0 9.79 29.58 17.726 66.069 17.726s66.068-7.936 66.068-17.726c0-4.355-5.8525-8.3423-15.562-11.429 0.045-0.031 0.085-0.06 0.13125-0.091 9.825 3.1064 15.752 7.1274 15.752 11.52 0 9.8374-29.724 17.812-66.389 17.812m26.918-34.005l0.1825-0.073c-0.06 0.024-0.12125 0.049-0.1825 0.073" fill="#efefef"/>
   <path id="path5287" d="m305.59 945.67c-36.489 0-66.069-7.9361-66.069-17.726 0-4.355 5.8525-8.3422 15.564-11.429 0.0425 0.03 0.0875 0.062 0.13125 0.092-9.5938 3.0648-15.374 7.02-15.374 11.336 0 9.7427 29.436 17.64 65.748 17.64 36.311 0 65.748-7.8975 65.748-17.64 0-4.3163-5.78-8.2715-15.375-11.336 0.0437-0.03 0.0887-0.062 0.1325-0.092 9.71 3.0865 15.562 7.0737 15.562 11.429 0 9.79-29.579 17.726-66.068 17.726m26.735-33.846c0.06-0.023 0.1225-0.049 0.1825-0.072-0.06 0.023-0.1225 0.049-0.1825 0.072" fill="#eee"/>
   <path id="path5289" d="m305.59 945.59c-36.311 0-65.748-7.8976-65.748-17.64 0-4.3164 5.78-8.2715 15.374-11.336 0.0438 0.03 0.0888 0.062 0.1325 0.091-9.4812 3.0465-15.186 6.9665-15.186 11.245 0 9.6949 29.292 17.554 65.428 17.554 36.134 0 65.426-7.8588 65.426-17.554 0-4.2787-5.7038-8.1987-15.185-11.245 0.0425-0.03 0.0888-0.061 0.13125-0.091 9.595 3.0649 15.375 7.02 15.375 11.336 0 9.7426-29.436 17.64-65.748 17.64m26.551-33.688c0.0625-0.025 0.12125-0.048 0.18375-0.073-0.0625 0.025-0.12125 0.048-0.18375 0.073" fill="#eeeeed"/>
   <path id="path5291" d="m305.59 945.5c-36.135 0-65.428-7.8588-65.428-17.554 0-4.2787 5.705-8.1987 15.186-11.245 0.045 0.031 0.0863 0.06 0.1325 0.091-9.3675 3.0262-14.998 6.9135-14.998 11.154 0 9.6475 29.149 17.467 65.106 17.467 35.956 0 65.106-7.8198 65.106-17.467 0-4.2402-5.6312-8.1275-14.999-11.154 0.0463-0.031 0.0875-0.06 0.13375-0.091 9.4812 3.0464 15.185 6.9664 15.185 11.245 0 9.6949-29.292 17.554-65.426 17.554m26.365-33.53c0.0613-0.024 0.125-0.049 0.18625-0.071-0.0613 0.023-0.125 0.047-0.18625 0.071" fill="#ededec"/>
   <path id="path5293" d="m305.59 945.41c-35.958 0-65.106-7.8198-65.106-17.467 0-4.2402 5.63-8.1275 14.998-11.154 0.0437 0.03 0.09 0.062 0.13375 0.092-9.2512 3.0053-14.811 6.8588-14.811 11.062 0 9.6001 29.006 17.381 64.786 17.381s64.785-7.7812 64.785-17.381c0-4.2027-5.5588-8.0562-14.81-11.062 0.0425-0.03 0.09-0.062 0.1325-0.092 9.3675 3.0262 14.999 6.9135 14.999 11.154 0 9.6475-29.15 17.467-65.106 17.467m26.179-33.371c0.0625-0.024 0.12375-0.047 0.18625-0.072-0.0625 0.025-0.12375 0.048-0.18625 0.072" fill="#ededec"/>
   <path id="path5295" d="m305.59 945.33c-35.78 0-64.786-7.7813-64.786-17.381 0-4.2026 5.56-8.0561 14.811-11.062 0.045 0.032 0.0875 0.06 0.13375 0.091-9.1388 2.9854-14.624 6.8066-14.624 10.97 0 9.5527 28.862 17.295 64.465 17.295 35.602 0 64.465-7.7422 64.465-17.295 0-4.1637-5.485-7.9849-14.624-10.97 0.045-0.031 0.0875-0.059 0.13375-0.091 9.2512 3.0054 14.81 6.8589 14.81 11.062 0 9.6001-29.005 17.381-64.785 17.381m25.991-33.214c0.0625-0.024 0.12375-0.047 0.1875-0.071-0.0625 0.024-0.125 0.047-0.1875 0.071" fill="#ececeb"/>
   <path id="path5297" d="m305.59 945.24c-35.603 0-64.465-7.7421-64.465-17.295 0-4.1636 5.485-7.9849 14.624-10.97 0.0437 0.03 0.0913 0.062 0.13375 0.093-9.0238 2.9638-14.436 6.751-14.436 10.878 0 9.5048 28.718 17.21 64.144 17.21 35.425 0 64.144-7.7051 64.144-17.21 0-4.1265-5.4125-7.9137-14.438-10.878 0.0438-0.03 0.0913-0.062 0.135-0.093 9.1388 2.9853 14.624 6.8066 14.624 10.97 0 9.5528-28.862 17.295-64.465 17.295m25.802-33.055c0.0625-0.024 0.125-0.049 0.18875-0.073-0.0637 0.024-0.12625 0.049-0.18875 0.073" fill="#ecebea"/>
   <path id="path5299" d="m305.59 945.16c-35.426 0-64.144-7.7051-64.144-17.21 0-4.1265 5.4125-7.9136 14.436-10.878 0.0463 0.031 0.09 0.06 0.13625 0.091-8.9125 2.9439-14.252 6.6973-14.252 10.786 0 9.4575 28.575 17.124 63.824 17.124s63.822-7.6661 63.822-17.124c0-4.0888-5.34-7.8422-14.251-10.786 0.0462-0.031 0.0888-0.06 0.135-0.091 9.025 2.9639 14.438 6.751 14.438 10.878 0 9.5049-28.719 17.21-64.144 17.21m25.611-32.899c0.0637-0.023 0.1275-0.047 0.19125-0.071-0.0637 0.023-0.1275 0.047-0.19125 0.071" fill="#ebebea"/>
   <path id="path5301" d="m305.59 945.07c-35.249 0-63.824-7.6661-63.824-17.124 0-4.0889 5.34-7.8422 14.252-10.786 0.0425 0.03 0.0913 0.062 0.135 0.091-8.7988 2.9249-14.066 6.6452-14.066 10.695 0 9.4101 28.431 17.038 63.503 17.038 35.071 0 63.502-7.6275 63.502-17.038 0-4.0497-5.2675-7.77-14.068-10.695 0.0437-0.029 0.0925-0.062 0.13625-0.091 8.9112 2.9439 14.251 6.6973 14.251 10.786 0 9.4575-28.574 17.124-63.822 17.124m25.42-32.741c0.0625-0.024 0.12875-0.047 0.19125-0.071-0.0625 0.024-0.12875 0.048-0.19125 0.071" fill="#eaeae9"/>
   <path id="path5303" d="m305.59 944.98c-35.071 0-63.503-7.6275-63.503-17.038 0-4.0497 5.2675-7.77 14.066-10.695 0.0463 0.031 0.09 0.061 0.13625 0.092-8.685 2.9038-13.881 6.5898-13.881 10.602 0 9.3623 28.286 16.951 63.181 16.951 34.894 0 63.181-7.5889 63.181-16.951 0-4.0127-5.1962-7.6987-13.882-10.602 0.0463-0.031 0.0913-0.061 0.13625-0.092 8.8 2.9249 14.068 6.6452 14.068 10.695 0 9.4101-28.431 17.038-63.502 17.038m25.228-32.584c0.065-0.024 0.1275-0.046 0.1925-0.071-0.065 0.025-0.1275 0.048-0.1925 0.071" fill="#eaeae8"/>
   <path id="path5305" d="m305.59 944.9c-34.895 0-63.181-7.5889-63.181-16.951 0-4.0127 5.1962-7.6987 13.881-10.602 0.0462 0.031 0.0913 0.061 0.13625 0.091-8.5725 2.8838-13.698 6.5376-13.698 10.511 0 9.315 28.144 16.865 62.861 16.865 34.716 0 62.86-7.5497 62.86-16.865 0-3.9737-5.125-7.6275-13.698-10.511 0.0462-0.03 0.0913-0.06 0.13625-0.091 8.6862 2.9038 13.882 6.5898 13.882 10.602 0 9.3623-28.288 16.951-63.181 16.951m25.032-32.426c0.0637-0.022 0.13125-0.047 0.195-0.071-0.0637 0.024-0.13125 0.049-0.195 0.071" fill="#e9e9e8"/>
   <path id="path5307" d="m305.59 944.81c-34.718 0-62.861-7.5498-62.861-16.865 0-3.9736 5.125-7.6275 13.698-10.511 0.0462 0.031 0.0913 0.061 0.1375 0.092-8.46 2.8628-13.514 6.483-13.514 10.419 0 9.2676 28 16.779 62.54 16.779s62.54-7.5112 62.54-16.779c0-3.936-5.0538-7.5562-13.515-10.419 0.0462-0.031 0.0912-0.061 0.1375-0.092 8.5725 2.8837 13.698 6.5376 13.698 10.511 0 9.315-28.144 16.865-62.86 16.865m24.838-32.268c0.065-0.024 0.13-0.047 0.195-0.071-0.065 0.024-0.13 0.047-0.195 0.071" fill="#e9e8e7"/>
   <path id="path5309" d="m305.59 944.73c-34.54 0-62.54-7.5112-62.54-16.779 0-3.936 5.0538-7.5561 13.514-10.419 0.0462 0.031 0.0925 0.062 0.13875 0.093-8.35 2.8413-13.332 6.4273-13.332 10.326 0 9.2203 27.858 16.694 62.22 16.694s62.219-7.4736 62.219-16.694c0-3.8988-4.9825-7.4848-13.331-10.326 0.0463-0.031 0.0913-0.062 0.1375-0.093 8.4612 2.8629 13.515 6.483 13.515 10.419 0 9.2676-28 16.779-62.54 16.779m24.64-32.111c0.0663-0.024 0.13125-0.047 0.1975-0.071-0.0662 0.024-0.13125 0.047-0.1975 0.071" fill="#e8e8e6"/>
   <path id="path5311" d="m305.59 944.64c-34.363 0-62.22-7.4736-62.22-16.694 0-3.8989 4.9825-7.4849 13.332-10.326 0.0462 0.03 0.0913 0.06 0.13875 0.091-8.2375 2.8199-13.15 6.3735-13.15 10.235 0 9.1723 27.712 16.607 61.899 16.607 34.185 0 61.899-7.4351 61.899-16.607 0-3.8614-4.9125-7.415-13.15-10.235 0.0462-0.03 0.0925-0.062 0.13875-0.091 8.3488 2.8412 13.331 6.4272 13.331 10.326 0 9.2203-27.856 16.694-62.219 16.694m24.441-31.957c0.0662-0.022 0.1325-0.046 0.19875-0.07-0.0662 0.024-0.1325 0.047-0.19875 0.07" fill="#e7e7e6"/>
   <path id="path5313" d="m305.59 944.55c-34.186 0-61.899-7.435-61.899-16.607 0-3.8614 4.9125-7.415 13.15-10.235 0.0463 0.031 0.0925 0.061 0.13875 0.092-8.1262 2.7989-12.968 6.3199-12.968 10.143 0 9.1235 27.569 16.522 61.578 16.522 34.008 0 61.578-7.398 61.578-16.522 0-3.8228-4.8425-7.3438-12.969-10.143 0.0475-0.031 0.0937-0.061 0.14-0.092 8.2375 2.8199 13.15 6.3735 13.15 10.235 0 9.1724-27.714 16.607-61.899 16.607m24.241-31.799c0.0687-0.024 0.1325-0.046 0.2-0.071-0.0675 0.026-0.13125 0.048-0.2 0.071" fill="#e7e6e5"/>
   <path id="path5315" d="m305.59 944.47c-34.009 0-61.578-7.398-61.578-16.522 0-3.8227 4.8412-7.3437 12.968-10.143 0.0462 0.03 0.0937 0.062 0.14 0.091-8.0162 2.7787-12.788 6.2661-12.788 10.051 0 9.0777 27.426 16.435 61.258 16.435 33.831 0 61.256-7.3574 61.256-16.435 0-3.7851-4.7712-7.2725-12.786-10.051 0.0462-0.03 0.0925-0.061 0.13875-0.091 8.1262 2.7989 12.969 6.3199 12.969 10.143 0 9.1235-27.57 16.522-61.578 16.522m24.04-31.643c0.0662-0.022 0.13625-0.046 0.20125-0.07-0.065 0.024-0.135 0.048-0.20125 0.07" fill="#e6e6e4"/>
   <path id="path5317" d="m305.59 944.38c-33.831 0-61.258-7.3575-61.258-16.435 0-3.7851 4.7712-7.2725 12.788-10.051 0.0463 0.031 0.0937 0.062 0.14 0.092-7.9062 2.7578-12.606 6.2115-12.606 9.959 0 9.0287 27.281 16.349 60.936 16.349 33.654 0 60.936-7.3199 60.936-16.349 0-3.7475-4.7012-7.2012-12.608-9.959 0.0475-0.03 0.095-0.061 0.14125-0.092 8.015 2.7787 12.786 6.2661 12.786 10.051 0 9.0776-27.425 16.435-61.256 16.435m23.838-31.485c0.0687-0.024 0.135-0.048 0.2025-0.071-0.0675 0.024-0.13375 0.047-0.2025 0.071" fill="#e5e5e3"/>
   <path id="path5319" d="m305.59 944.3c-33.655 0-60.936-7.3199-60.936-16.349 0-3.7475 4.7-7.2011 12.606-9.959 0.0462 0.03 0.095 0.062 0.14125 0.093-7.795 2.7364-12.428 6.1563-12.428 9.8663 0 8.9815 27.139 16.263 60.616 16.263 33.476 0 60.615-7.2812 60.615-16.263 0-3.71-4.6312-7.1299-12.428-9.8663 0.0475-0.031 0.095-0.062 0.14125-0.093 7.9062 2.7579 12.608 6.2115 12.608 9.959 0 9.0288-27.282 16.349-60.936 16.349m23.632-31.329c0.0687-0.024 0.1375-0.047 0.205-0.07-0.0675 0.022-0.13625 0.046-0.205 0.07" fill="#e4e4e3"/>
   <path id="path5321" d="m305.59 944.21c-33.478 0-60.616-7.2812-60.616-16.263 0-3.71 4.6325-7.1299 12.428-9.8662 0.0463 0.03 0.095 0.061 0.14125 0.091-7.685 2.7162-12.248 6.1025-12.248 9.7748 0 8.9337 26.995 16.176 60.295 16.176s60.294-7.2426 60.294-16.176c0-3.6723-4.5612-7.0586-12.248-9.7748 0.0463-0.03 0.095-0.062 0.14125-0.091 7.7962 2.7363 12.428 6.1562 12.428 9.8662 0 8.9815-27.139 16.263-60.615 16.263m23.428-31.173c0.0675-0.024 0.1375-0.046 0.205-0.07-0.0675 0.024-0.1375 0.046-0.205 0.07" fill="#e4e3e2"/>
   <path id="path5323" d="m305.59 944.12c-33.3 0-60.295-7.2427-60.295-16.176 0-3.6724 4.5625-7.0586 12.248-9.7749 0.05 0.032 0.0937 0.061 0.1425 0.092-7.5775 2.6939-12.069 6.0479-12.069 9.6827 0 8.8862 26.851 16.091 59.974 16.091 33.122 0 59.974-7.2051 59.974-16.091 0-3.6348-4.4925-6.9888-12.07-9.6827 0.0487-0.031 0.0937-0.06 0.1425-0.092 7.6862 2.7163 12.248 6.1025 12.248 9.7749 0 8.9336-26.994 16.176-60.294 16.176m23.22-31.016c0.0675-0.024 0.13875-0.048 0.2075-0.07-0.0688 0.022-0.14 0.046-0.2075 0.07" fill="#e3e3e1"/>
   <path id="path5325" d="m305.59 944.04c-33.123 0-59.974-7.205-59.974-16.091 0-3.6347 4.4912-6.9887 12.069-9.6826 0.0475 0.03 0.0962 0.062 0.14375 0.093-7.4675 2.6724-11.892 5.9922-11.892 9.5899 0 8.8388 26.708 16.005 59.654 16.005 32.945 0 59.652-7.166 59.652-16.005 0-3.5977-4.4238-6.9175-11.891-9.5899 0.0463-0.03 0.0962-0.062 0.1425-0.093 7.5775 2.6939 12.07 6.0479 12.07 9.6826 0 8.8863-26.851 16.091-59.974 16.091m23.01-30.861c0.0713-0.024 0.13875-0.046 0.21-0.07-0.0713 0.024-0.13875 0.046-0.21 0.07" fill="#e2e2e0"/>
   <path id="path5327" d="m305.59 943.95c-32.946 0-59.654-7.166-59.654-16.005 0-3.5976 4.425-6.9175 11.892-9.5899 0.0487 0.031 0.0937 0.06 0.14375 0.091-7.36 2.6528-11.715 5.939-11.715 9.499 0 8.791 26.564 15.919 59.333 15.919 32.768 0 59.332-7.128 59.332-15.919 0-3.56-4.3562-6.8462-11.715-9.499 0.0488-0.031 0.095-0.06 0.14375-0.091 7.4675 2.6724 11.891 5.9923 11.891 9.5899 0 8.8389-26.708 16.005-59.652 16.005m22.799-30.706c0.0712-0.022 0.14125-0.046 0.21125-0.069-0.07 0.023-0.14 0.046-0.21125 0.069" fill="#e2e1df"/>
   <path id="path5329" d="m305.59 943.87c-32.769 0-59.333-7.128-59.333-15.919 0-3.56 4.355-6.8462 11.715-9.499 0.0462 0.03 0.0962 0.063 0.14375 0.093-7.2512 2.6298-11.539 5.8837-11.539 9.4062 0 8.7436 26.421 15.832 59.013 15.832 32.591 0 59.011-7.0889 59.011-15.832 0-3.5225-4.2875-6.7764-11.539-9.4062 0.0475-0.03 0.0975-0.062 0.145-0.093 7.3588 2.6527 11.715 5.939 11.715 9.499 0 8.791-26.565 15.919-59.332 15.919m22.586-30.55c0.0687-0.022 0.14375-0.047 0.2125-0.07-0.0688 0.022-0.14375 0.047-0.2125 0.07" fill="#e1e0df"/>
   <path id="path5331" d="m305.59 943.78c-32.591 0-59.013-7.0889-59.013-15.832 0-3.5225 4.2875-6.7764 11.539-9.4062 0.0487 0.031 0.0962 0.061 0.145 0.092-7.1425 2.6088-11.362 5.8291-11.362 9.314 0 8.6962 26.276 15.746 58.691 15.746 32.414 0 58.69-7.0499 58.69-15.746 0-3.4849-4.22-6.7052-11.361-9.314 0.0488-0.031 0.095-0.061 0.14375-0.092 7.2512 2.6298 11.539 5.8837 11.539 9.4062 0 8.7436-26.42 15.832-59.011 15.832m22.372-30.395c0.0725-0.022 0.14-0.045 0.21375-0.069-0.0738 0.024-0.14125 0.046-0.21375 0.069" fill="#e0e0de"/>
   <path id="path5333" d="m305.59 943.69c-32.415 0-58.691-7.0498-58.691-15.746 0-3.4849 4.22-6.7051 11.362-9.314 0.0462 0.03 0.0987 0.062 0.145 0.093-7.0362 2.586-11.186 5.7735-11.186 9.2213 0 8.6488 26.132 15.66 58.37 15.66 32.236 0 58.37-7.0113 58.37-15.66 0-3.4478-4.1512-6.6353-11.188-9.2213 0.0475-0.03 0.0987-0.062 0.14625-0.093 7.1412 2.6089 11.361 5.8291 11.361 9.314 0 8.6963-26.276 15.746-58.69 15.746m22.155-30.239c0.0713-0.023 0.14625-0.046 0.2175-0.07-0.0712 0.024-0.14625 0.047-0.2175 0.07" fill="#e0dfdd"/>
   <path id="path5335" d="m305.59 943.61c-32.238 0-58.37-7.0113-58.37-15.66 0-3.4477 4.15-6.6352 11.186-9.2212 0.05 0.031 0.0975 0.061 0.1475 0.092-6.9288 2.5648-11.014 5.7187-11.014 9.1288 0 8.6012 25.99 15.575 58.05 15.575s58.049-6.974 58.049-15.575c0-3.4101-4.085-6.564-11.012-9.1288 0.0487-0.031 0.0962-0.061 0.14625-0.092 7.0362 2.586 11.188 5.7735 11.188 9.2212 0 8.6489-26.134 15.66-58.37 15.66m21.938-30.084c0.0738-0.022 0.14375-0.045 0.2175-0.069-0.0737 0.024-0.14375 0.046-0.2175 0.069" fill="#dfdedc"/>
   <path id="path5337" d="m305.59 943.52c-32.06 0-58.05-6.9741-58.05-15.575 0-3.4101 4.085-6.564 11.014-9.1289 0.0487 0.031 0.0975 0.062 0.14625 0.093-6.8212 2.5425-10.839 5.6637-10.839 9.0362 0 8.5537 25.846 15.489 57.729 15.489 31.882 0 57.729-6.935 57.729-15.489 0-3.3725-4.0175-6.4937-10.84-9.0362 0.05-0.031 0.0975-0.062 0.1475-0.093 6.9275 2.5649 11.012 5.7188 11.012 9.1289 0 8.6011-25.989 15.575-58.049 15.575m21.718-29.93c0.0738-0.023 0.14625-0.045 0.22-0.069-0.0737 0.024-0.14625 0.046-0.22 0.069" fill="#dedddb"/>
   <path id="path5339" d="m305.59 943.44c-31.883 0-57.729-6.935-57.729-15.489 0-3.3725 4.0175-6.4936 10.839-9.0361 0.05 0.031 0.0987 0.061 0.1475 0.092-6.715 2.5215-10.666 5.6089-10.666 8.9439 0 8.5064 25.702 15.402 57.409 15.402 31.705 0 57.408-6.8959 57.408-15.402 0-3.335-3.9512-6.4224-10.666-8.9439 0.05-0.031 0.0988-0.061 0.1475-0.092 6.8225 2.5425 10.84 5.6636 10.84 9.0361 0 8.5538-25.846 15.489-57.729 15.489m21.495-29.775c0.0738-0.023 0.14875-0.046 0.2225-0.069-0.0737 0.022-0.14875 0.046-0.2225 0.069" fill="#dddcda"/>
   <path id="path5341" d="m305.59 943.35c-31.706 0-57.409-6.896-57.409-15.402 0-3.335 3.9512-6.4224 10.666-8.9439 0.05 0.03 0.1 0.062 0.14875 0.093-6.61 2.4987-10.494 5.5538-10.494 8.8512 0 8.459 25.559 15.316 57.088 15.316 31.528 0 57.086-6.8574 57.086-15.316 0-3.2974-3.8838-6.3525-10.494-8.8512 0.05-0.031 0.0987-0.062 0.14875-0.093 6.715 2.5215 10.666 5.6089 10.666 8.9439 0 8.5064-25.702 15.402-57.408 15.402m21.27-29.62c0.0737-0.023 0.15125-0.046 0.225-0.069-0.0738 0.022-0.15125 0.046-0.225 0.069" fill="#dddcda"/>
   <path id="path5343" d="m305.59 943.26c-31.529 0-57.088-6.8574-57.088-15.316 0-3.2974 3.8838-6.3525 10.494-8.8511 0.05 0.03 0.1025 0.062 0.15125 0.094-6.505 2.4761-10.324 5.4946-10.324 8.7535 0 8.415 25.414 15.233 56.768 15.233s56.768-6.8179 56.768-15.233c0-3.2589-3.8212-6.2789-10.326-8.7549 0.05-0.03 0.10125-0.062 0.15-0.092 6.61 2.4986 10.494 5.5538 10.494 8.8511 0 8.459-25.559 15.316-57.086 15.316m21.034-29.462c0.0775-0.024 0.15875-0.048 0.23625-0.071-0.0775 0.023-0.15875 0.047-0.23625 0.071" fill="#dcdbd9"/>
   <path id="path5345" d="m312.32 927.95c0 0.9975-3.0112 1.8051-6.7262 1.8051s-6.7275-0.8076-6.7275-1.8051c0-0.9961 3.0125-1.8051 6.7275-1.8051s6.7262 0.809 6.7262 1.8051" fill="#100f0d"/>
  </g>
  <g id="g5429" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g5431" clip-path="url(#clipPath5433-1)">
    <path id="path5445" d="m4824.7 4372.2c0 105.26-86.13 191.39-191.39 191.39h-73.44c-10.55 0-20.91-0.87-31-2.53v1128.4c0 30.46-24.7 55.16-55.16 55.16-30.47 0-55.16-24.7-55.16-55.16v-1188.6c-31.07-34.05-50.07-79.28-50.07-128.72v1289.7c0 105.26 86.12 191.38 191.39 191.38h73.44c105.26 0 191.39-86.12 191.39-191.38v-1289.7" fill="url(#linearGradient5437)"/>
   </g>
  </g>
  <g id="g5447" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g5449" clip-path="url(#clipPath5451-9)">
    <path id="path5461" d="m4824.7 1400.7c-70.09 29.76-147.18 46.22-228.11 46.22-80.94 0-158.03-16.46-228.11-46.22v2971.5c0 49.44 19 94.67 50.07 128.72v-2914.1c0-30.47 24.69-55.16 55.16-55.16 30.46 0 55.16 24.69 55.16 55.16v2974.2c10.09 1.66 20.45 2.53 31 2.53h73.44c105.26 0 191.39-86.13 191.39-191.39v-2971.5" fill="url(#linearGradient5455)"/>
   </g>
  </g>
  <g id="g5463" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g5465" clip-path="url(#clipPath5467-5)">
    <path id="path5477" d="m5180.7 862.75c0-322.64-261.55-584.18-584.18-584.18-322.64 0-584.18 261.54-584.18 584.18 0 322.63 261.54 584.18 584.18 584.18 322.63 0 584.18-261.55 584.18-584.18" fill="url(#radialGradient5503-8)"/>
   </g>
  </g>
  <g id="g5479" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g5481" clip-path="url(#clipPath5483-2)">
    <path id="path5493" d="m4939 1171.8v2.47-1.23-1.24" fill="url(#radialGradient5503-8)"/>
   </g>
  </g>
  <g id="g5495" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g5497" clip-path="url(#clipPath5499-6)">
    <path id="path5509" d="m4756.2 980.86c108.77 36.381 182.9 108.79 182.9 192.18v-1.24c-0.73-82.87-74.67-154.73-182.9-190.94m182.9 192.18c0 44.74-21.34 86.31-57.92 120.86 36.24-34.23 57.53-75.36 57.92-119.63v-1.23" fill="url(#radialGradient5503-8)"/>
   </g>
  </g>
  <g id="g5511" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g5513" clip-path="url(#clipPath5515-6)">
    <g id="g5519" transform="matrix(696.2,0,0,453.2,4247.9,945.9)">
     <image id="image5521" xlink:href="data:image/png;base64,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" transform="matrix(1,0,0,-1,0,1)" height="1" width="1" preserveAspectRatio="none"/>
    </g>
   </g>
  </g>
  <path id="path5523" d="m310.18 204.53h-9.18c-21.739 0-39.424 17.685-39.424 39.422v523.07c-27.34 15.644-44.509 44.775-44.509 76.826 0 48.811 39.711 88.522 88.523 88.522 48.811 0 88.521-39.712 88.521-88.522 0-32.052-17.168-61.182-44.509-76.826v-523.07c0-21.738-17.685-39.422-39.422-39.422m0 15.5c13.158 0 23.924 10.765 23.924 23.922v532.65c26.16 11.106 44.509 37.031 44.509 67.242 0 40.33-32.694 73.022-73.022 73.022-40.33 0-73.023-32.692-73.023-73.022 0-30.211 18.349-56.136 44.509-67.242v-532.65c0-13.158 10.765-23.922 23.924-23.922h9.18" fill="#100f0d"/>
  <g id="g5525" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g5527" clip-path="url(#clipPath5529-7)">
    <path id="path5543" d="m4633.3 5941.9h-73.44c-154.37 0-279.96-125.59-279.96-279.96v-4205.5c-218.11-116.22-356.07-343.22-356.07-593.7 0-370.96 301.79-672.75 672.75-672.75 370.95 0 672.74 301.79 672.74 672.75 0 250.48-137.95 477.48-356.07 593.7v4205.5c0 154.37-125.59 279.96-279.95 279.96m0-88.58c105.26 0 191.39-86.12 191.39-191.38v-4261.2c209.28-88.85 356.07-296.25 356.07-537.94 0-322.63-261.55-584.18-584.18-584.18-322.64 0-584.18 261.55-584.18 584.18 0 241.69 146.78 449.09 356.07 537.94v4261.2c0 105.26 86.12 191.38 191.39 191.38h73.44" fill="url(#linearGradient5533)"/>
   </g>
  </g>
  <g id="g5545" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g5547" clip-path="url(#clipPath5549-6)">
    <path id="path5561" d="m4418.5 4501v1188.6c0 30.46 24.69 55.16 55.16 55.16 30.46 0 55.16-24.7 55.16-55.16v-1128.4c-43.33-7.14-81.89-28.96-110.32-60.14" fill="url(#linearGradient5553)"/>
   </g>
  </g>
  <g id="g5563" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g5565" clip-path="url(#clipPath5567-7)">
    <path id="path5577" d="m4473.7 1531.7c-30.47 0-55.16 24.69-55.16 55.16v2914.1c28.43 31.18 66.99 53 110.32 60.14v-2974.2c0-30.47-24.7-55.16-55.16-55.16" fill="url(#linearGradient5571)"/>
   </g>
  </g>
  <g id="g6117" transform="matrix(0.125 0 0 -0.125 -268.98 951.7)">
   <g id="g6119" clip-path="url(#clipPath6121-3)">
    <g id="g6125" transform="matrix(915.2,0,0,253.2,4139.9,62.9)">
     <image id="image6127" xlink:href="data:image/png;base64,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" transform="matrix(1,0,0,-1,0,1)" height="1" width="1" preserveAspectRatio="none"/>
    </g>
   </g>
  </g>
 </g>
</svg>
\",\"data:image/svg+xml;base64,<svg id="svg6934" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="210.87mm" width="49.966mm" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 177.04501 747.16249" xmlns:dc="http://purl.org/dc/elements/1.1/">
 <defs id="defs6936">
  <clipPath id="clipPath6133" clipPathUnits="userSpaceOnUse">
   <path id="path6135" clip-rule="evenodd" d="m6215 190.03c0 48.239 145.89 87.391 325.8 87.391s325.8-39.152 325.8-87.391c0-48.332-145.89-87.48-325.8-87.48s-325.8 39.148-325.8 87.48"/>
  </clipPath>
  <clipPath id="clipPath6081" clipPathUnits="userSpaceOnUse">
   <path id="path6083" d="m6417.9 1531.7c-30.47 0-55.16 24.69-55.16 55.16v4102.7c0 30.46 24.69 55.16 55.16 55.16 30.46 0 55.16-24.7 55.16-55.16v-4102.7c0-30.47-24.7-55.16-55.16-55.16"/>
  </clipPath>
  <linearGradient id="linearGradient6085" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1e-7 -2349.1 -2349.1 -1e-7 6540.8 3469.2)">
   <stop id="stop6087" stop-color="#f1485f" offset="0"/>
   <stop id="stop6089" stop-color="#a17d5a" offset="1"/>
  </linearGradient>
  <clipPath id="clipPath6061" clipPathUnits="userSpaceOnUse">
   <path id="path6063" d="m6577.5 5941.9h-73.44c-154.37 0-279.96-125.59-279.96-279.96v-4205.5c-218.1-116.2-356.1-343.2-356.1-593.65 0-370.96 301.8-672.75 672.8-672.75 370.96 0 672.75 301.79 672.75 672.75 0 250.48-137.96 477.48-356.07 593.7v4205.5c0 154.37-125.59 279.96-279.96 279.96m0-88.58c105.26 0 191.39-86.12 191.39-191.38v-4261.2c209.28-88.85 356.07-296.25 356.07-537.94 0-322.63-261.55-584.18-584.18-584.18s-584.18 261.55-584.18 584.18c0 241.69 146.79 449.09 356.07 537.94v4261.2c0 105.26 86.13 191.38 191.39 191.38h73.44"/>
  </clipPath>
  <linearGradient id="linearGradient6065" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1345.5 0 0 -1345.5 5868 3065.9)">
   <stop id="stop6067" stop-color="#b3b3b2" offset="0"/>
   <stop id="stop6069" stop-color="#b3b3b2" offset=".1"/>
   <stop id="stop6071" stop-color="#feffff" offset=".24731"/>
   <stop id="stop6073" stop-color="#a3a3a1" offset="1"/>
  </linearGradient>
  <clipPath id="clipPath6047" clipPathUnits="userSpaceOnUse">
   <path id="path6049" d="m6540.8 955.89c-189.16 0-342.5 97.219-342.5 217.15 0 119.92 153.34 217.14 342.5 217.14 127.83 0 239.3-44.4 298.14-110.2 28.23-31.56 44.35-68.06 44.35-106.94 0-65-45.04-123.33-116.42-163.12-60.32-33.631-139.44-54.029-226.07-54.029"/>
  </clipPath>
  <clipPath id="clipPath6031" clipPathUnits="userSpaceOnUse">
   <path id="path6033" d="m6766.8 1009.9c71.38 39.79 116.42 98.12 116.42 163.12v-1.24c-0.56-64.5-45.49-122.34-116.42-161.88m116.42 163.12c0 38.88-16.12 75.38-44.35 106.94 27.94-31.23 44.02-67.29 44.35-105.71v-1.23"/>
  </clipPath>
  <radialGradient id="radialGradient6035" gradientUnits="userSpaceOnUse" cy="0" cx="0" gradientTransform="matrix(584.18 0 0 -584.18 6540.8 862.75)" r="1">
   <stop id="stop6037" stop-color="#ed1c24" offset="0"/>
   <stop id="stop6039" stop-color="#632d16" offset="1"/>
  </radialGradient>
  <clipPath id="clipPath6015" clipPathUnits="userSpaceOnUse">
   <path id="path6017" d="m6883.2 1171.8v1.24 1.23c0.01-0.41 0.01-0.82 0.01-1.23s0-0.83-0.01-1.24"/>
  </clipPath>
  <clipPath id="clipPath5999" clipPathUnits="userSpaceOnUse">
   <path id="path6001" d="m7124.9 862.75c0-322.64-261.55-584.18-584.18-584.18s-584.18 261.54-584.18 584.18c0 322.63 261.55 584.18 584.18 584.18s584.18-261.55 584.18-584.18"/>
  </clipPath>
  <clipPath id="clipPath5983" clipPathUnits="userSpaceOnUse">
   <path id="path5985" d="m6312.6 1400.7v4261.2c0 105.26 86.13 191.38 191.39 191.38h73.44c105.26 0 191.39-86.12 191.39-191.38v-4261.2c-70.08 29.76-147.18 46.22-228.11 46.22s-158.03-16.46-228.11-46.22m105.23 4344c-30.47 0-55.16-24.7-55.16-55.16v-4102.7c0-30.47 24.69-55.16 55.16-55.16 30.46 0 55.16 24.69 55.16 55.16v4102.7c0 30.46-24.7 55.16-55.16 55.16"/>
  </clipPath>
  <linearGradient id="linearGradient5987" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1e-7 -2349.1 -2349.1 -1e-7 6540.8 3469.2)">
   <stop id="stop5989" stop-color="#ed1c24" offset="0"/>
   <stop id="stop5991" stop-color="#632d16" offset="1"/>
  </linearGradient>
  <clipPath id="clipPath5965" clipPathUnits="userSpaceOnUse">
   <path id="path5967" d="m6768.9 1326.8c0-105.26-86.13-191.39-191.39-191.39h-73.44c-105.26 0-191.39 86.13-191.39 191.39v4335.2c0 105.26 86.13 191.38 191.39 191.38h73.44c105.26 0 191.39-86.12 191.39-191.38v-4335.2"/>
  </clipPath>
  <linearGradient id="linearGradient5969" gradientUnits="userSpaceOnUse" gradientTransform="matrix(456.22 0 0 -456.22 6312.6 3494.3)">
   <stop id="stop5971" stop-color="#a3a3a1" offset="0"/>
   <stop id="stop5973" stop-color="#ececec" offset=".75269"/>
   <stop id="stop5975" stop-color="#b3b3b2" offset="1"/>
  </linearGradient>
 </defs>
 <g id="layer1" transform="translate(-231.37 -176.67)">
  <g fill="#fff">
   <path id="path5579" d="m319.89 923.83c-48.889 0-88.522-10.632-88.522-23.75 0-7.0864 11.572-13.449 29.919-17.8 0.0362 0.0298 0.0675 0.0585 0.1025 0.0897-18.219 4.335-29.7 10.663-29.7 17.71 0 13.069 39.489 23.664 88.201 23.664s88.201-10.595 88.201-23.664c0-7.0474-11.48-13.375-29.7-17.71 0.035-0.0312 0.0675-0.0585 0.1025-0.0897 18.348 4.351 29.918 10.713 29.918 17.8 0 13.118-39.632 23.75-88.521 23.75"/>
   <path id="path5581" d="m319.89 923.74c-48.712 0-88.201-10.595-88.201-23.664 0-7.0474 11.481-13.375 29.7-17.71 0.0337 0.0289 0.07 0.0611 0.10375 0.0914-18.09 4.3174-29.482 10.611-29.482 17.619 0 13.021 39.345 23.578 87.88 23.578s87.88-10.557 87.88-23.578c0-7.0074-11.392-13.301-29.482-17.619 0.0338-0.0302 0.07-0.0625 0.10375-0.0914 18.22 4.335 29.7 10.663 29.7 17.71 0 13.069-39.489 23.664-88.201 23.664"/>
   <path id="path5583" d="m319.89 923.66c-48.535 0-87.88-10.557-87.88-23.578 0-7.0074 11.392-13.301 29.482-17.619 0.035 0.0297 0.0675 0.0586 0.1025 0.0899-17.959 4.3026-29.265 10.562-29.265 17.529 0 12.974 39.202 23.491 87.56 23.491s87.56-10.518 87.56-23.491c0-6.9672-11.306-13.226-29.265-17.529 0.035-0.0312 0.0675-0.0601 0.1025-0.0899 18.09 4.3174 29.482 10.611 29.482 17.619 0 13.021-39.345 23.578-87.88 23.578"/>
   <path id="path5585" d="m319.89 923.57c-48.358 0-87.56-10.518-87.56-23.491 0-6.9672 11.306-13.226 29.265-17.529 0.0337 0.0288 0.07 0.061 0.10375 0.0897-17.83 4.2866-29.048 10.511-29.048 17.439 0 12.926 39.058 23.406 87.239 23.406 48.18 0 87.239-10.48 87.239-23.406 0-6.9278-11.218-13.152-29.048-17.438 0.0337-0.0303 0.07-0.0625 0.10375-0.0913 17.959 4.3026 29.265 10.562 29.265 17.529 0 12.974-39.202 23.491-87.56 23.491"/>
   <path id="path5587" d="m319.89 923.49c-48.181 0-87.239-10.48-87.239-23.406 0-6.9278 11.218-13.152 29.048-17.439 0.035 0.0312 0.0687 0.0601 0.10375 0.0914-17.701 4.269-28.831 10.459-28.831 17.348 0 12.879 38.915 23.32 86.919 23.32s86.918-10.441 86.918-23.32c0-6.8886-11.129-13.079-28.83-17.348 0.035-0.0312 0.0687-0.0601 0.10375-0.0899 17.83 4.2851 29.048 10.51 29.048 17.438 0 12.926-39.059 23.406-87.239 23.406"/>
   <path id="path5589" d="m319.89 923.4c-48.004 0-86.919-10.441-86.919-23.32 0-6.8886 11.13-13.079 28.831-17.348 0.0362 0.0312 0.0687 0.06 0.105 0.0902-17.57 4.2525-28.615 10.41-28.615 17.257 0 12.831 38.771 23.234 86.598 23.234 47.826 0 86.598-10.403 86.598-23.234 0-6.8476-11.045-13.005-28.614-17.256 0.035-0.0312 0.0687-0.06 0.10375-0.0912 17.701 4.269 28.83 10.459 28.83 17.348 0 12.879-38.914 23.32-86.918 23.32"/>
   <path id="path5591" d="m319.89 923.31c-47.826 0-86.598-10.403-86.598-23.234 0-6.8476 11.045-13.005 28.615-17.257 0.0325 0.0299 0.07 0.0625 0.10375 0.0914-17.441 4.2349-28.398 10.357-28.398 17.166 0 12.784 38.626 23.147 86.276 23.147 47.649 0 86.276-10.364 86.276-23.147 0-6.8086-10.956-12.931-28.398-17.166 0.0337-0.0289 0.0712-0.0615 0.105-0.0904 17.569 4.2515 28.614 10.409 28.614 17.256 0 12.831-38.771 23.234-86.598 23.234"/>
   <path id="path5593" d="m319.89 923.23c-47.65 0-86.276-10.364-86.276-23.148 0-6.8086 10.956-12.931 28.398-17.166 0.0362 0.0308 0.0687 0.0595 0.105 0.0899-17.314 4.2196-28.182 10.308-28.182 17.076 0 12.736 38.484 23.061 85.956 23.061s85.956-10.325 85.956-23.061c0-6.7685-10.872-12.856-28.182-17.075 0.0363-0.0312 0.07-0.06 0.105-0.0908 17.441 4.2349 28.398 10.357 28.398 17.166 0 12.784-38.628 23.147-86.276 23.147"/>
   <path id="path5595" d="m319.89 923.14c-47.472 0-85.956-10.325-85.956-23.061 0-6.7685 10.869-12.856 28.182-17.076 0.035 0.0312 0.07 0.061 0.105 0.0913-17.184 4.2021-27.966 10.256-27.966 16.985 0 12.688 38.34 22.976 85.635 22.976s85.635-10.288 85.635-22.976c0-6.729-10.782-12.783-27.966-16.985 0.035-0.0303 0.07-0.06 0.105-0.0904 17.31 4.2188 28.182 10.307 28.182 17.075 0 12.736-38.484 23.061-85.956 23.061"/>
   <path id="path5597" d="m319.89 923.06c-47.295 0-85.635-10.288-85.635-22.976 0-6.729 10.782-12.783 27.966-16.985 0.0337 0.0289 0.0725 0.0625 0.10625 0.0914-17.055 4.1845-27.752 10.204-27.752 16.894 0 12.641 38.198 22.89 85.315 22.89 47.118 0 85.314-10.249 85.314-22.89 0-6.689-10.696-12.709-27.751-16.894 0.0337-0.0289 0.0725-0.0625 0.10625-0.0914 17.184 4.2021 27.966 10.256 27.966 16.985 0 12.688-38.34 22.976-85.635 22.976"/>
   <path id="path5599" d="m319.89 922.97c-47.118 0-85.315-10.249-85.315-22.89 0-6.689 10.698-12.709 27.752-16.894 0.035 0.0298 0.07 0.0595 0.105 0.0897-16.925 4.169-27.536 10.154-27.536 16.804 0 12.594 38.052 22.804 84.994 22.804 46.94 0 84.994-10.21 84.994-22.804 0-6.6499-10.611-12.635-27.536-16.804 0.035-0.0303 0.07-0.06 0.105-0.0897 17.055 4.1845 27.751 10.204 27.751 16.894 0 12.641-38.196 22.89-85.314 22.89"/>
   <path id="path5601" d="m319.89 922.88c-46.941 0-84.994-10.21-84.994-22.804 0-6.6499 10.611-12.635 27.536-16.804 0.0362 0.0312 0.0713 0.0601 0.10625 0.0914-16.799 4.1514-27.321 10.101-27.321 16.712 0 12.546 37.909 22.717 84.672 22.717 46.764 0 84.672-10.171 84.672-22.717 0-6.6099-10.525-12.561-27.321-16.712 0.035-0.0312 0.07-0.0601 0.10625-0.0914 16.925 4.169 27.536 10.154 27.536 16.804 0 12.594-38.054 22.804-84.994 22.804"/>
   <path id="path5603" d="m319.89 922.8c-46.764 0-84.672-10.171-84.672-22.717 0-6.6114 10.522-12.561 27.321-16.712 0.0362 0.0297 0.0713 0.06 0.1075 0.0899-16.669 4.1352-27.109 10.053-27.109 16.622 0 12.499 37.766 22.631 84.352 22.631s84.351-10.133 84.351-22.631c0-6.5699-10.439-12.487-27.106-16.622 0.035-0.0299 0.07-0.0601 0.10625-0.0899 16.796 4.1514 27.321 10.102 27.321 16.712 0 12.546-37.909 22.717-84.672 22.717"/>
   <path id="path5605" d="m319.89 922.71c-46.586 0-84.352-10.133-84.352-22.631 0-6.5699 10.44-12.487 27.109-16.622 0.035 0.0312 0.07 0.0615 0.10625 0.0913-16.541 4.1176-26.894 10-26.894 16.531 0 12.451 37.622 22.545 84.031 22.545s84.031-10.094 84.031-22.545c0-6.5312-10.352-12.414-26.894-16.531 0.0362-0.0298 0.0712-0.06 0.1075-0.0913 16.668 4.1352 27.106 10.053 27.106 16.622 0 12.499-37.765 22.631-84.351 22.631"/>
   <path id="path5607" d="m319.89 922.62c-46.409 0-84.031-10.094-84.031-22.545 0-6.5312 10.352-12.414 26.894-16.531 0.0362 0.0297 0.0713 0.06 0.1075 0.0899-16.414 4.1015-26.681 9.9501-26.681 16.441 0 12.404 37.479 22.459 83.711 22.459s83.71-10.055 83.71-22.459c0-6.4912-10.265-12.34-26.68-16.44 0.0362-0.0312 0.0712-0.0615 0.1075-0.0912 16.541 4.1176 26.894 10 26.894 16.531 0 12.451-37.622 22.545-84.031 22.545"/>
   <path id="path5609" d="m319.89 922.54c-46.232 0-83.711-10.055-83.711-22.459 0-6.4912 10.268-12.34 26.681-16.441 0.0362 0.0312 0.0712 0.0615 0.1075 0.0912-16.288 4.084-26.468 9.8975-26.468 16.35 0 12.356 37.335 22.373 83.39 22.373s83.39-10.016 83.39-22.373c0-6.4526-10.18-12.266-26.468-16.35 0.0362-0.0297 0.0713-0.06 0.1075-0.0899 16.415 4.1001 26.68 9.9488 26.68 16.44 0 12.404-37.478 22.459-83.71 22.459"/>
   <path id="path5611" d="m319.89 922.45c-46.055 0-83.39-10.016-83.39-22.373 0-6.4526 10.18-12.266 26.468-16.35 0.0363 0.0303 0.0725 0.0601 0.10875 0.0914-16.16 4.0664-26.255 9.8461-26.255 16.259 0 12.309 37.191 22.288 83.069 22.288s83.069-9.979 83.069-22.288c0-6.4126-10.095-12.192-26.254-16.259 0.035-0.0299 0.0712-0.0611 0.1075-0.0914 16.288 4.084 26.468 9.8975 26.468 16.35 0 12.356-37.335 22.373-83.39 22.373"/>
   <path id="path5613" d="m319.89 922.37c-45.878 0-83.069-9.979-83.069-22.288 0-6.4126 10.095-12.192 26.255-16.259 0.035 0.0303 0.0712 0.06 0.1075 0.0898-16.03 4.0489-26.042 9.7965-26.042 16.169 0 12.261 37.049 22.201 82.749 22.201s82.748-9.9399 82.748-22.201c0-6.3725-10.011-12.12-26.041-16.169 0.0362-0.0298 0.0725-0.0595 0.10875-0.0898 16.159 4.0664 26.254 9.8461 26.254 16.259 0 12.309-37.191 22.288-83.069 22.288"/>
   <path id="path5615" d="m319.89 922.28c-45.7 0-82.749-9.94-82.749-22.201 0-6.3725 10.012-12.12 26.042-16.169 0.0363 0.0304 0.0725 0.0616 0.10875 0.0914-15.906 4.0312-25.83 9.7441-25.83 16.078 0 12.214 36.904 22.115 82.428 22.115s82.428-9.9009 82.428-22.115c0-6.3335-9.9238-12.046-25.83-16.078 0.0362-0.0298 0.0725-0.0601 0.10875-0.0914 16.03 4.0489 26.041 9.7965 26.041 16.169 0 12.261-37.048 22.201-82.748 22.201"/>
   <path id="path5617" d="m319.89 922.19c-45.524 0-82.428-9.9008-82.428-22.115 0-6.3335 9.9238-12.046 25.83-16.078 0.0362 0.0303 0.0737 0.0615 0.11 0.0913-15.78 4.0138-25.619 9.6915-25.619 15.986 0 12.166 36.76 22.029 82.106 22.029s82.106-9.8628 82.106-22.029c0-6.2949-9.8388-11.973-25.618-15.986 0.0363-0.0297 0.0725-0.061 0.10875-0.0913 15.906 4.0312 25.83 9.7441 25.83 16.078 0 12.214-36.904 22.115-82.428 22.115"/>
   <path id="path5619" d="m319.89 922.11c-45.346 0-82.106-9.8628-82.106-22.029 0-6.2949 9.8388-11.973 25.619-15.986 0.035 0.0304 0.0725 0.0601 0.10875 0.0899-15.652 3.9976-25.408 9.6416-25.408 15.896 0 12.119 36.618 21.942 81.786 21.942 45.169 0 81.786-9.8237 81.786-21.942 0-6.2549-9.755-11.899-25.408-15.896 0.0362-0.0297 0.0737-0.0595 0.11-0.0899 15.779 4.0138 25.618 9.6915 25.618 15.986 0 12.166-36.76 22.029-82.106 22.029"/>
   <path id="path5621" d="m319.89 922.02c-45.169 0-81.786-9.8238-81.786-21.942 0-6.2549 9.755-11.899 25.408-15.896 0.0362 0.0303 0.0737 0.0615 0.11 0.0914-15.526 3.9799-25.196 9.5889-25.196 15.805 0 12.071 36.472 21.856 81.465 21.856 44.991 0 81.465-9.7852 81.465-21.856 0-6.2162-9.67-11.825-25.196-15.805 0.0362-0.0299 0.0738-0.0611 0.11-0.0914 15.652 3.9976 25.408 9.6416 25.408 15.896 0 12.119-36.618 21.942-81.786 21.942"/>
   <path id="path5623" d="m319.89 921.94c-44.992 0-81.465-9.7851-81.465-21.856 0-6.2162 9.67-11.825 25.196-15.805 0.0363 0.0302 0.0738 0.0615 0.11 0.0912-15.398 3.9614-24.985 9.5376-24.985 15.714 0 12.024 36.329 21.77 81.144 21.77s81.144-9.7461 81.144-21.77c0-6.1762-9.5875-11.752-24.985-15.714 0.0362-0.0297 0.0737-0.061 0.11-0.0912 15.526 3.9799 25.196 9.5889 25.196 15.805 0 12.071-36.474 21.856-81.465 21.856"/>
   <path id="path5625" d="m319.89 921.85c-44.815 0-81.144-9.7461-81.144-21.77 0-6.1762 9.5875-11.752 24.985-15.714 0.0362 0.0289 0.0738 0.0601 0.11125 0.0904-15.274 3.9448-24.776 9.4858-24.776 15.624 0 11.976 36.186 21.685 80.824 21.685s80.824-9.709 80.824-21.685c0-6.1378-9.5025-11.679-24.775-15.624 0.0362-0.0303 0.0738-0.0601 0.11-0.0904 15.398 3.9614 24.985 9.5376 24.985 15.714 0 12.024-36.329 21.77-81.144 21.77"/>
  </g>
  <g>
   <path id="path5627" d="m319.89 921.77c-44.638 0-80.824-9.709-80.824-21.685 0-6.1378 9.5025-11.679 24.776-15.624 0.0375 0.0308 0.0713 0.0595 0.11 0.0907-15.145 3.9278-24.565 9.4352-24.565 15.533 0 11.929 36.042 21.599 80.502 21.599s80.502-9.6699 80.502-21.599c0-6.0976-9.42-11.605-24.565-15.533 0.0387-0.0312 0.0725-0.0585 0.11125-0.0907 15.272 3.9448 24.775 9.4858 24.775 15.624 0 11.976-36.186 21.685-80.824 21.685" fill="#feffff"/>
   <path id="path5629" d="m319.89 921.68c-44.46 0-80.502-9.6699-80.502-21.599 0-6.0976 9.42-11.605 24.565-15.533 0.0362 0.0303 0.075 0.0615 0.11125 0.0914-15.021 3.9086-24.356 9.3827-24.356 15.441 0 11.881 35.899 21.513 80.182 21.513 44.284 0 80.182-9.6314 80.182-21.513 0-6.0586-9.335-11.531-24.356-15.441 0.0362-0.0299 0.075-0.0611 0.11125-0.0914 15.145 3.9278 24.565 9.4351 24.565 15.533 0 11.929-36.042 21.599-80.502 21.599" fill="#feffff"/>
   <path id="path5631" d="m319.89 921.59c-44.284 0-80.182-9.6314-80.182-21.513 0-6.0586 9.335-11.533 24.356-15.441 0.0375 0.0287 0.0762 0.06 0.1125 0.0902-14.896 3.8921-24.148 9.3326-24.148 15.351 0 11.834 35.755 21.426 79.861 21.426s79.861-9.5923 79.861-21.426c0-6.0185-9.2512-11.459-24.148-15.351 0.0375-0.0287 0.075-0.0615 0.1125-0.0902 15.021 3.9101 24.356 9.3828 24.356 15.441 0 11.881-35.899 21.513-80.182 21.513" fill="#fefeff"/>
   <path id="path5633" d="m319.89 921.51c-44.106 0-79.861-9.5923-79.861-21.426 0-6.0185 9.2512-11.459 24.148-15.351 0.0387 0.0312 0.0725 0.0601 0.11125 0.0909-14.77 3.8755-23.939 9.2802-23.939 15.26 0 11.786 35.612 21.34 79.541 21.34s79.54-9.5537 79.54-21.34c0-5.98-9.1675-11.385-23.938-15.26 0.0387-0.0308 0.0725-0.0596 0.11125-0.0909 14.896 3.8921 24.148 9.3326 24.148 15.351 0 11.834-35.755 21.426-79.861 21.426" fill="#fefefe"/>
   <path id="path5635" d="m319.89 921.42c-43.929 0-79.541-9.5537-79.541-21.34 0-5.98 9.1688-11.385 23.939-15.26 0.0375 0.0303 0.0762 0.0615 0.11375 0.0913-14.646 3.8564-23.731 9.2276-23.731 15.169 0 11.739 35.468 21.255 79.22 21.255 43.751 0 79.22-9.5161 79.22-21.255 0-5.9414-9.085-11.312-23.73-15.169 0.0363-0.0298 0.075-0.061 0.1125-0.0913 14.77 3.8755 23.938 9.2802 23.938 15.26 0 11.786-35.611 21.34-79.54 21.34" fill="#fefefe"/>
   <path id="path5637" d="m319.89 921.33c-43.752 0-79.22-9.5161-79.22-21.255 0-5.9414 9.085-11.312 23.731-15.169 0.0387 0.0312 0.0738 0.0591 0.1125 0.0904-14.521 3.8399-23.522 9.1772-23.522 15.079 0 11.691 35.324 21.169 78.899 21.169s78.899-9.4776 78.899-21.169c0-5.9014-9.0012-11.239-23.522-15.078 0.0387-0.0312 0.075-0.0601 0.11375-0.0914 14.645 3.8565 23.73 9.2276 23.73 15.169 0 11.739-35.469 21.255-79.22 21.255" fill="#fdfefe"/>
   <path id="path5639" d="m319.89 921.25c-43.575 0-78.899-9.4776-78.899-21.169 0-5.9014 9.0012-11.239 23.522-15.079 0.0362 0.0297 0.0762 0.0625 0.1125 0.0914-14.394 3.8208-23.315 9.125-23.315 14.987 0 11.644 35.181 21.083 78.579 21.083s78.579-9.439 78.579-21.083c0-5.8622-8.9212-11.166-23.315-14.987 0.0362-0.0289 0.0763-0.0616 0.1125-0.0904 14.521 3.8389 23.522 9.1762 23.522 15.078 0 11.691-35.324 21.169-78.899 21.169" fill="#fdfefe"/>
   <path id="path5641" d="m319.89 921.16c-43.398 0-78.579-9.439-78.579-21.083 0-5.8622 8.9212-11.166 23.315-14.987 0.04 0.0312 0.075 0.06 0.11375 0.0907-14.271 3.8042-23.108 9.0728-23.108 14.896 0 11.596 35.036 20.996 78.258 20.996 43.22 0 78.258-9.3999 78.258-20.996 0-5.8238-8.8362-11.092-23.108-14.896 0.0387-0.0308 0.075-0.0595 0.11375-0.0907 14.394 3.8208 23.315 9.125 23.315 14.987 0 11.644-35.181 21.083-78.579 21.083" fill="#fdfdfe"/>
   <path id="path5643" d="m319.89 921.08c-43.221 0-78.258-9.3999-78.258-20.996 0-5.8238 8.8362-11.092 23.108-14.896 0.0375 0.0289 0.0775 0.0615 0.115 0.0914-14.146 3.7851-22.901 9.0214-22.901 14.805 0 11.549 34.892 20.91 77.936 20.91 43.042 0 77.936-9.3613 77.936-20.91 0-5.7838-8.755-11.02-22.901-14.805 0.0375-0.0299 0.0775-0.0625 0.115-0.0914 14.271 3.8042 23.108 9.0728 23.108 14.896 0 11.596-35.038 20.996-78.258 20.996" fill="#fdfdfd"/>
   <path id="path5645" d="m319.89 920.99c-43.044 0-77.936-9.3613-77.936-20.91 0-5.7838 8.755-11.02 22.901-14.805 0.0387 0.0312 0.075 0.06 0.11375 0.0902-14.024 3.7686-22.695 8.9697-22.695 14.715 0 11.501 34.75 20.824 77.616 20.824s77.616-9.3223 77.616-20.824c0-5.7451-8.67-10.946-22.695-14.715 0.0387-0.0303 0.075-0.059 0.11375-0.0902 14.146 3.7851 22.901 9.0214 22.901 14.805 0 11.549-34.894 20.91-77.936 20.91" fill="#fdfdfd"/>
   <path id="path5647" d="m319.89 920.9c-42.866 0-77.616-9.3223-77.616-20.824 0-5.7451 8.6712-10.946 22.695-14.715 0.0375 0.0299 0.0788 0.0625 0.115 0.0914-13.9 3.75-22.489 8.9175-22.489 14.624 0 11.454 34.606 20.737 77.295 20.737s77.295-9.2837 77.295-20.737c0-5.706-8.5888-10.874-22.489-14.624 0.0375-0.0289 0.0775-0.0615 0.115-0.0914 14.025 3.7686 22.695 8.9697 22.695 14.715 0 11.501-34.75 20.824-77.616 20.824" fill="#fcfdfd"/>
   <path id="path5649" d="m319.89 920.82c-42.689 0-77.295-9.2837-77.295-20.737 0-5.706 8.5888-10.874 22.489-14.624 0.0387 0.0312 0.0763 0.0595 0.115 0.0907-13.776 3.7315-22.284 8.8652-22.284 14.533 0 11.406 34.462 20.652 76.975 20.652 42.511 0 76.974-9.2461 76.974-20.652 0-5.6675-8.5062-10.801-22.282-14.533 0.0387-0.0312 0.0762-0.0595 0.115-0.0907 13.9 3.75 22.489 8.9175 22.489 14.624 0 11.454-34.606 20.737-77.295 20.737" fill="#fcfdfd"/>
   <path id="path5651" d="m319.89 920.73c-42.512 0-76.975-9.2461-76.975-20.652 0-5.6675 8.5075-10.801 22.284-14.533 0.04 0.0312 0.0775 0.0601 0.11625 0.0914-13.651 3.7139-22.079 8.8139-22.079 14.441 0 11.359 34.319 20.566 76.654 20.566s76.654-9.2075 76.654-20.566c0-5.6275-8.4275-10.728-22.079-14.441 0.04-0.0312 0.0763-0.0601 0.11625-0.0914 13.776 3.7315 22.282 8.8652 22.282 14.533 0 11.406-34.462 20.652-76.974 20.652" fill="#fcfcfd"/>
   <path id="path5653" d="m319.89 920.65c-42.335 0-76.654-9.2075-76.654-20.566 0-5.6275 8.4275-10.728 22.079-14.441 0.0375 0.0287 0.0788 0.0615 0.11625 0.0912-13.529 3.6954-21.874 8.7613-21.874 14.35 0 11.311 34.175 20.48 76.332 20.48 42.158 0 76.332-9.1689 76.332-20.48 0-5.5889-8.3438-10.655-21.874-14.35 0.04-0.0312 0.0775-0.06 0.11625-0.0912 13.651 3.7139 22.079 8.8139 22.079 14.441 0 11.359-34.319 20.566-76.654 20.566" fill="#fcfcfc"/>
   <path id="path5655" d="m319.89 920.56c-42.158 0-76.332-9.1689-76.332-20.48 0-5.5889 8.345-10.655 21.874-14.35 0.0388 0.0303 0.0775 0.0601 0.11625 0.0904-13.405 3.6772-21.67 8.71-21.67 14.26 0 11.264 34.032 20.394 76.012 20.394s76.012-9.1299 76.012-20.394c0-5.5498-8.265-10.582-21.67-14.259 0.0375-0.0299 0.08-0.0625 0.11625-0.0914 13.53 3.6954 21.874 8.7612 21.874 14.35 0 11.311-34.175 20.48-76.332 20.48" fill="#fbfcfc"/>
   <path id="path5657" d="m319.89 920.47c-41.98 0-76.012-9.1299-76.012-20.394 0-5.5498 8.265-10.582 21.67-14.26 0.0387 0.0308 0.0775 0.061 0.1175 0.0908-13.284 3.6592-21.466 8.6578-21.466 14.169 0 11.216 33.888 20.308 75.691 20.308 41.804 0 75.691-9.0914 75.691-20.308 0-5.5112-8.1812-10.509-21.466-14.169 0.04-0.0298 0.0787-0.06 0.1175-0.0898 13.405 3.6762 21.67 8.709 21.67 14.259 0 11.264-34.032 20.394-76.012 20.394" fill="#fbfcfc"/>
   <path id="path5659" d="m319.89 920.39c-41.804 0-75.691-9.0914-75.691-20.308 0-5.5112 8.1825-10.51 21.466-14.169 0.0387 0.0312 0.0775 0.0616 0.1175 0.0914-13.161 3.6411-21.262 8.605-21.262 14.078 0 11.169 33.744 20.221 75.37 20.221s75.37-9.0522 75.37-20.221c0-5.4726-8.1012-10.436-21.261-14.078 0.0387-0.0298 0.0775-0.0601 0.11625-0.0914 13.285 3.6602 21.466 8.6578 21.466 14.169 0 11.216-33.888 20.308-75.691 20.308" fill="#fbfbfb"/>
   <path id="path5661" d="m319.89 920.3c-41.626 0-75.37-9.0522-75.37-20.221 0-5.4726 8.1012-10.436 21.262-14.078 0.0387 0.0312 0.0775 0.0615 0.1175 0.0913-13.039 3.6226-21.06 8.5528-21.06 13.986 0 11.12 33.601 20.136 75.05 20.136s75.05-9.0161 75.05-20.136c0-5.4336-8.0212-10.364-21.06-13.986 0.04-0.0297 0.0788-0.06 0.11875-0.0913 13.16 3.6411 21.261 8.605 21.261 14.078 0 11.169-33.744 20.221-75.37 20.221" fill="#fbfbfb"/>
   <path id="path5663" d="m319.89 920.22c-41.449 0-75.05-9.0161-75.05-20.136 0-5.4336 8.0212-10.364 21.06-13.986 0.0388 0.0304 0.0788 0.0616 0.1175 0.0914-12.916 3.604-20.856 8.5-20.856 13.895 0 11.072 33.456 20.05 74.729 20.05 41.271 0 74.729-8.9776 74.729-20.05 0-5.395-7.94-10.291-20.856-13.895 0.0387-0.0298 0.0787-0.0601 0.1175-0.0914 13.039 3.6226 21.06 8.5528 21.06 13.986 0 11.12-33.601 20.136-75.05 20.136" fill="#fafbfb"/>
   <path id="path5665" d="m319.89 920.13c-41.272 0-74.729-8.9776-74.729-20.05 0-5.395 7.94-10.291 20.856-13.895 0.04 0.0297 0.08 0.0615 0.11875 0.0912-12.795 3.585-20.655 8.4472-20.655 13.804 0 11.025 33.314 19.964 74.409 19.964s74.409-8.939 74.409-19.964c0-5.355-7.8625-10.219-20.655-13.804 0.0387-0.0298 0.0787-0.0615 0.11875-0.0912 12.916 3.604 20.856 8.5 20.856 13.895 0 11.072-33.458 20.05-74.729 20.05" fill="#fafbfb"/>
   <path id="path5667" d="m319.89 920.04c-41.095 0-74.409-8.939-74.409-19.964 0-5.3565 7.86-10.219 20.655-13.804 0.04 0.0299 0.08 0.0611 0.12 0.0914-12.674 3.5658-20.454 8.396-20.454 13.712 0 10.978 33.17 19.877 74.088 19.877s74.088-8.8999 74.088-19.877c0-5.3164-7.78-10.146-20.452-13.712 0.0387-0.0302 0.0788-0.0615 0.11875-0.0914 12.792 3.585 20.655 8.4488 20.655 13.804 0 11.025-33.314 19.964-74.409 19.964" fill="#fafafa"/>
   <path id="path5669" d="m319.89 919.96c-40.918 0-74.088-8.8999-74.088-19.877 0-5.3164 7.78-10.146 20.454-13.712 0.0387 0.0297 0.08 0.061 0.11875 0.0913-12.55 3.5474-20.251 8.3438-20.251 13.621 0 10.93 33.026 19.791 73.766 19.791s73.766-8.8609 73.766-19.791c0-5.2774-7.7012-10.074-20.251-13.621 0.04-0.0303 0.08-0.0615 0.12-0.0913 12.672 3.5659 20.452 8.396 20.452 13.712 0 10.978-33.17 19.877-74.088 19.877" fill="#fafafa"/>
   <path id="path5671" d="m319.89 919.87c-40.74 0-73.766-8.8609-73.766-19.791 0-5.2774 7.7012-10.074 20.251-13.621 0.04 0.0299 0.08 0.0596 0.12 0.0914-12.431 3.5282-20.051 8.291-20.051 13.53 0 10.882 32.882 19.705 73.446 19.705 40.562 0 73.446-8.8227 73.446-19.705 0-5.2388-7.62-10.002-20.051-13.53 0.04-0.0303 0.08-0.0615 0.12-0.0914 12.55 3.5474 20.251 8.3438 20.251 13.621 0 10.93-33.026 19.791-73.766 19.791" fill="#f9fafa"/>
   <path id="path5673" d="m319.89 919.79c-40.564 0-73.446-8.8227-73.446-19.705 0-5.2388 7.62-10.002 20.051-13.53 0.04 0.0298 0.0813 0.061 0.12125 0.0907-12.311 3.5102-19.851 8.2388-19.851 13.439 0 10.835 32.739 19.619 73.125 19.619s73.125-8.7836 73.125-19.619c0-5.2002-7.54-9.9272-19.85-13.439 0.0387-0.0297 0.08-0.061 0.12-0.0907 12.431 3.5282 20.051 8.291 20.051 13.53 0 10.882-32.884 19.705-73.446 19.705" fill="#f9f9f9"/>
   <path id="path5675" d="m319.89 919.7c-40.386 0-73.125-8.7836-73.125-19.619 0-5.2002 7.54-9.9288 19.851-13.439 0.0387 0.0303 0.08 0.0601 0.12 0.0914-12.188 3.4911-19.651 8.1865-19.651 13.348 0 10.788 32.596 19.534 72.805 19.534s72.804-8.7461 72.804-19.534c0-5.1611-7.4625-9.8565-19.65-13.348 0.04-0.0299 0.0812-0.0611 0.12125-0.0914 12.31 3.5118 19.85 8.2388 19.85 13.439 0 10.835-32.739 19.619-73.125 19.619" fill="#f9f9f9"/>
   <path id="path5677" d="m319.89 919.61c-40.209 0-72.805-8.7461-72.805-19.534 0-5.1611 7.4638-9.8565 19.651-13.348 0.0425 0.0312 0.08 0.059 0.12125 0.0912-12.068 3.4726-19.451 8.1339-19.451 13.256 0 10.74 32.452 19.448 72.484 19.448 40.031 0 72.484-8.7075 72.484-19.448 0-5.1225-7.3838-9.7838-19.451-13.256 0.0425-0.0322 0.0787-0.06 0.12125-0.0912 12.188 3.4911 19.65 8.1865 19.65 13.348 0 10.788-32.595 19.534-72.804 19.534" fill="#f8f9f9"/>
   <path id="path5679" d="m319.89 919.53c-40.031 0-72.484-8.7075-72.484-19.448 0-5.1225 7.3838-9.7838 19.451-13.256 0.04 0.0289 0.0825 0.0615 0.1225 0.0914-11.949 3.4536-19.252 8.08-19.252 13.165 0 10.692 32.308 19.361 72.162 19.361 39.855 0 72.162-8.669 72.162-19.361 0-5.085-7.3038-9.7114-19.252-13.165 0.04-0.0299 0.0825-0.0611 0.1225-0.0914 12.068 3.4726 19.451 8.1339 19.451 13.256 0 10.74-32.452 19.448-72.484 19.448" fill="#f8f8f8"/>
   <path id="path5681" d="m319.89 919.44c-39.855 0-72.162-8.669-72.162-19.361 0-5.085 7.3038-9.7114 19.252-13.165 0.04 0.0288 0.0812 0.0615 0.12125 0.0913-11.828 3.4351-19.054 8.0274-19.054 13.074 0 10.645 32.165 19.275 71.842 19.275 39.678 0 71.842-8.6299 71.842-19.275 0-5.0464-7.2262-9.6386-19.054-13.074 0.04-0.0298 0.0813-0.0625 0.12125-0.0913 11.949 3.4536 19.252 8.08 19.252 13.165 0 10.692-32.308 19.361-72.162 19.361" fill="#f8f8f8"/>
   <path id="path5683" d="m319.89 919.35c-39.678 0-71.842-8.6299-71.842-19.275 0-5.0464 7.2262-9.6386 19.054-13.074 0.0425 0.0312 0.0813 0.0586 0.12375 0.0914-11.709 3.416-18.856 7.975-18.856 12.982 0 10.598 32.021 19.189 71.521 19.189s71.521-8.5913 71.521-19.189c0-5.0074-7.1475-9.5664-18.856-12.982 0.0425-0.0312 0.0813-0.0601 0.12375-0.0914 11.828 3.4351 19.054 8.0274 19.054 13.074 0 10.645-32.165 19.275-71.842 19.275" fill="#f7f8f8"/>
   <path id="path5685" d="m319.89 919.27c-39.5 0-71.521-8.5913-71.521-19.189 0-5.0074 7.1475-9.5664 18.856-12.982 0.04 0.0288 0.0825 0.061 0.1225 0.0913-11.588 3.3975-18.659 7.9224-18.659 12.891 0 10.55 31.879 19.103 71.201 19.103s71.2-8.5528 71.2-19.103c0-4.9688-7.0688-9.4936-18.658-12.891 0.04-0.0303 0.0825-0.0625 0.1225-0.0913 11.709 3.416 18.856 7.975 18.856 12.982 0 10.598-32.021 19.189-71.521 19.189" fill="#f7f7f7"/>
   <path id="path5687" d="m319.89 919.18c-39.322 0-71.201-8.5528-71.201-19.103 0-4.9688 7.0712-9.4936 18.659-12.891 0.0425 0.0312 0.0812 0.0601 0.12375 0.0914-11.47 3.3784-18.461 7.8696-18.461 12.8 0 10.502 31.734 19.016 70.88 19.016s70.88-8.5136 70.88-19.016c0-4.9301-6.9912-9.4214-18.461-12.8 0.0425-0.0312 0.0813-0.0601 0.12375-0.0914 11.589 3.3975 18.658 7.9224 18.658 12.891 0 10.55-31.878 19.103-71.2 19.103" fill="#f6f7f7"/>
   <path id="path5689" d="m319.89 919.1c-39.146 0-70.88-8.5136-70.88-19.016 0-4.9301 6.9912-9.4214 18.461-12.8 0.04 0.0282 0.0838 0.061 0.12375 0.0907-11.349 3.3589-18.264 7.8179-18.264 12.709 0 10.455 31.59 18.931 70.559 18.931s70.559-8.476 70.559-18.931c0-4.8911-6.915-9.3501-18.264-12.709 0.04-0.0297 0.0838-0.0625 0.12375-0.0907 11.47 3.3784 18.461 7.8696 18.461 12.8 0 10.502-31.734 19.016-70.88 19.016" fill="#f6f6f7"/>
   <path id="path5691" d="m319.89 919.01c-38.969 0-70.559-8.476-70.559-18.931 0-4.8911 6.915-9.3501 18.264-12.709 0.0425 0.0312 0.0825 0.0601 0.125 0.0914-11.231 3.3402-18.069 7.7651-18.069 12.618 0 10.408 31.448 18.845 70.239 18.845s70.239-8.4375 70.239-18.845c0-4.8525-6.8362-9.2774-18.069-12.618 0.0425-0.0312 0.0825-0.0601 0.125-0.0914 11.349 3.3589 18.264 7.8179 18.264 12.709 0 10.455-31.59 18.931-70.559 18.931" fill="#f6f6f6"/>
   <path id="path5693" d="m319.89 918.93c-38.791 0-70.239-8.4375-70.239-18.845 0-4.8525 6.8375-9.2774 18.069-12.618 0.04 0.0287 0.085 0.0615 0.125 0.0912-11.112 3.3213-17.872 7.7114-17.872 12.526 0 10.36 31.302 18.759 69.918 18.759 38.614 0 69.918-8.3989 69.918-18.759 0-4.815-6.76-9.2051-17.872-12.526 0.04-0.0297 0.085-0.0625 0.125-0.0912 11.232 3.3402 18.069 7.7651 18.069 12.618 0 10.408-31.448 18.845-70.239 18.845" fill="#f5f6f6"/>
   <path id="path5695" d="m319.89 918.84c-38.615 0-69.918-8.3989-69.918-18.759 0-4.815 6.76-9.2051 17.872-12.526 0.0425 0.0312 0.0825 0.0601 0.12625 0.0914-10.995 3.3026-17.679 7.6586-17.679 12.435 0 10.312 31.16 18.672 69.598 18.672s69.596-8.3599 69.596-18.672c0-4.7764-6.6825-9.1324-17.676-12.435 0.0425-0.0312 0.0825-0.0601 0.125-0.0914 11.112 3.3213 17.872 7.7114 17.872 12.526 0 10.36-31.304 18.759-69.918 18.759" fill="#f5f5f5"/>
   <path id="path5697" d="m319.89 918.75c-38.438 0-69.598-8.3599-69.598-18.672 0-4.7764 6.6838-9.1324 17.679-12.435 0.0425 0.0312 0.0825 0.06 0.125 0.0913-10.876 3.2828-17.482 7.6065-17.482 12.344 0 10.265 31.016 18.586 69.276 18.586s69.276-8.3213 69.276-18.586c0-4.7372-6.6062-9.061-17.482-12.344 0.0425-0.0312 0.0825-0.06 0.12625-0.0913 10.994 3.3026 17.676 7.6586 17.676 12.435 0 10.312-31.159 18.672-69.596 18.672" fill="#f5f5f5"/>
   <path id="path5699" d="m319.89 918.67c-38.26 0-69.276-8.3213-69.276-18.586 0-4.7372 6.6062-9.061 17.482-12.344 0.0412 0.0297 0.0863 0.0625 0.1275 0.0912-10.759 3.2638-17.289 7.5538-17.289 12.252 0 10.217 30.872 18.5 68.955 18.5 38.082 0 68.955-8.2828 68.955-18.5 0-4.6988-6.53-8.9888-17.289-12.252 0.0437-0.0303 0.085-0.06 0.1275-0.0912 10.876 3.2828 17.482 7.6065 17.482 12.344 0 10.265-31.016 18.586-69.276 18.586" fill="#f4f4f4"/>
   <path id="path5701" d="m319.89 918.58c-38.082 0-68.955-8.2828-68.955-18.5 0-4.6988 6.53-8.9888 17.289-12.252 0.0425 0.0312 0.0838 0.0611 0.12625 0.0914-10.641 3.2436-17.095 7.5-17.095 12.161 0 10.17 30.729 18.415 68.635 18.415s68.634-8.2452 68.634-18.415c0-4.6611-6.4525-8.9165-17.094-12.16 0.04-0.0299 0.0863-0.0625 0.12625-0.0924 10.759 3.2638 17.289 7.5538 17.289 12.252 0 10.217-30.872 18.5-68.955 18.5" fill="#f4f4f4"/>
   <path id="path5703" d="m319.89 918.5c-37.906 0-68.635-8.2452-68.635-18.415 0-4.6611 6.4538-8.9175 17.095-12.161 0.0437 0.0312 0.085 0.061 0.1275 0.0922-10.524 3.2236-16.901 7.4464-16.901 12.069 0 10.122 30.585 18.329 68.314 18.329s68.314-8.2061 68.314-18.329c0-4.6225-6.3775-8.8452-16.901-12.069 0.0425-0.0312 0.085-0.061 0.1275-0.0912 10.641 3.2436 17.094 7.499 17.094 12.16 0 10.17-30.728 18.415-68.634 18.415" fill="#f3f3f3"/>
   <path id="path5705" d="m319.89 918.41c-37.729 0-68.314-8.2061-68.314-18.329 0-4.6225 6.3775-8.8452 16.901-12.069 0.0437 0.0303 0.085 0.0601 0.12875 0.0914-10.408 3.2036-16.71 7.3935-16.71 11.978 0 10.075 30.442 18.243 67.994 18.243 37.551 0 67.992-8.1674 67.992-18.243 0-4.584-6.3012-8.7725-16.709-11.978 0.0437-0.0312 0.0863-0.0611 0.12875-0.0914 10.524 3.2236 16.901 7.4464 16.901 12.069 0 10.122-30.585 18.329-68.314 18.329" fill="#f3f3f2"/>
   <path id="path5707" d="m319.89 918.32c-37.551 0-67.994-8.1674-67.994-18.243 0-4.584 6.3025-8.7739 16.71-11.978 0.0425 0.0298 0.085 0.0615 0.12875 0.0913-10.291 3.1851-16.518 7.3399-16.518 11.886 0 10.027 30.299 18.156 67.672 18.156 37.374 0 67.672-8.1289 67.672-18.156 0-4.5449-6.2288-8.7011-16.516-11.886 0.0425-0.0298 0.085-0.0615 0.1275-0.0913 10.408 3.205 16.709 7.3935 16.709 11.978 0 10.075-30.441 18.243-67.992 18.243" fill="#f2f2f2"/>
   <path id="path5709" d="m319.89 918.24c-37.374 0-67.672-8.1289-67.672-18.156 0-4.5464 6.2262-8.7011 16.518-11.886 0.0425 0.0298 0.085 0.061 0.12875 0.0914-10.174 3.165-16.325 7.2875-16.325 11.795 0 9.98 30.154 18.07 67.351 18.07 37.198 0 67.351-8.0898 67.351-18.07 0-4.5074-6.1512-8.6299-16.325-11.795 0.0437-0.0304 0.0862-0.0616 0.13-0.0914 10.288 3.1851 16.516 7.3414 16.516 11.886 0 10.027-30.299 18.156-67.672 18.156" fill="#f2f1f1"/>
   <path id="path5711" d="m319.89 918.15c-37.198 0-67.351-8.0898-67.351-18.07 0-4.5074 6.1512-8.6299 16.325-11.795 0.0425 0.0312 0.0863 0.061 0.13 0.0913-10.058 3.146-16.135 7.2349-16.135 11.704 0 9.9326 30.011 17.984 67.031 17.984s67.03-8.0513 67.03-17.984c0-4.4688-6.0762-8.5576-16.132-11.703 0.0425-0.0312 0.0863-0.061 0.12875-0.0923 10.174 3.165 16.325 7.2875 16.325 11.795 0 9.98-30.154 18.07-67.351 18.07" fill="#f1f1f1"/>
   <path id="path5713" d="m319.89 918.06c-37.02 0-67.031-8.0513-67.031-17.984 0-4.4688 6.0775-8.5576 16.135-11.704 0.0425 0.0312 0.0863 0.061 0.13 0.0922-9.9438 3.125-15.944 7.1802-15.944 11.611 0 9.8848 29.868 17.897 66.71 17.897s66.71-8.0127 66.71-17.897c0-4.4311-6.0025-8.4864-15.942-11.611 0.0425-0.0297 0.0863-0.061 0.13-0.0913 10.056 3.145 16.132 7.2339 16.132 11.703 0 9.9326-30.01 17.984-67.03 17.984" fill="#f0f0f0"/>
   <path id="path5715" d="m319.89 917.98c-36.842 0-66.71-8.0127-66.71-17.897 0-4.4311 6-8.4864 15.944-11.611 0.0425 0.0304 0.0863 0.0616 0.13 0.0914-9.825 3.1064-15.752 7.1274-15.752 11.52 0 9.8374 29.722 17.812 66.389 17.812 36.665 0 66.389-7.9751 66.389-17.812 0-4.3926-5.9275-8.4136-15.752-11.52 0.0437-0.0298 0.0875-0.061 0.13125-0.0914 9.94 3.125 15.942 7.1802 15.942 11.611 0 9.8848-29.868 17.897-66.71 17.897" fill="#f0f0ef"/>
   <path id="path5717" d="m319.89 917.89c-36.666 0-66.389-7.9751-66.389-17.812 0-4.3926 5.9275-8.4136 15.752-11.52 0.045 0.0312 0.0862 0.06 0.13125 0.0912-9.71 3.0865-15.564 7.0738-15.564 11.429 0 9.79 29.58 17.726 66.069 17.726s66.069-7.9361 66.069-17.726c0-4.355-5.8538-8.3422-15.564-11.429 0.0462-0.0312 0.0863-0.0585 0.13125-0.0912 9.825 3.1064 15.752 7.1274 15.752 11.52 0 9.8374-29.724 17.812-66.389 17.812" fill="#efefef"/>
   <path id="path5719" d="m319.89 917.81c-36.489 0-66.069-7.9361-66.069-17.726 0-4.355 5.8538-8.3422 15.564-11.429 0.0437 0.0299 0.0888 0.0625 0.13125 0.0924-9.5938 3.0649-15.374 7.02-15.374 11.336 0 9.7426 29.436 17.64 65.748 17.64 36.311 0 65.748-7.8975 65.748-17.64 0-4.3164-5.78-8.2715-15.374-11.336 0.0425-0.0299 0.0875-0.0611 0.13125-0.0924 9.71 3.0865 15.564 7.0738 15.564 11.429 0 9.79-29.58 17.726-66.069 17.726" fill="#eee"/>
   <path id="path5721" d="m319.89 917.72c-36.311 0-65.748-7.8975-65.748-17.64 0-4.3164 5.78-8.2715 15.374-11.336 0.0437 0.0302 0.0888 0.0615 0.1325 0.0912-9.4812 3.0464-15.186 6.9664-15.186 11.245 0 9.6949 29.292 17.554 65.428 17.554 36.134 0 65.426-7.8588 65.426-17.554 0-4.2788-5.7038-8.1988-15.185-11.245 0.0438-0.0297 0.0888-0.061 0.1325-0.0912 9.5938 3.0649 15.374 7.02 15.374 11.336 0 9.7426-29.436 17.64-65.748 17.64" fill="#eeeeed"/>
   <path id="path5723" d="m319.89 917.63c-36.135 0-65.428-7.8588-65.428-17.554 0-4.2788 5.705-8.1988 15.186-11.245 0.0462 0.0312 0.0875 0.0601 0.1325 0.0914-9.3662 3.0262-14.998 6.9135-14.998 11.154 0 9.6475 29.149 17.467 65.106 17.467 35.958 0 65.106-7.8198 65.106-17.467 0-4.2402-5.6312-8.1275-14.998-11.154 0.045-0.0312 0.0863-0.0601 0.1325-0.0914 9.4812 3.0464 15.185 6.9664 15.185 11.245 0 9.6949-29.292 17.554-65.426 17.554" fill="#ededec"/>
   <path id="path5725" d="m319.89 917.55c-35.958 0-65.106-7.8198-65.106-17.467 0-4.2402 5.6312-8.1275 14.998-11.154 0.0437 0.0303 0.09 0.0625 0.13375 0.0923-9.2512 3.0054-14.81 6.8589-14.81 11.062 0 9.6001 29.005 17.381 64.785 17.381s64.785-7.7812 64.785-17.381c0-4.2026-5.5588-8.0561-14.81-11.062 0.0437-0.0298 0.09-0.062 0.13375-0.0923 9.3662 3.0262 14.998 6.9135 14.998 11.154 0 9.6475-29.149 17.467-65.106 17.467" fill="#ededec"/>
   <path id="path5727" d="m319.89 917.46c-35.78 0-64.785-7.7812-64.785-17.381 0-4.2026 5.5588-8.0561 14.81-11.062 0.0462 0.0317 0.0888 0.06 0.13375 0.0912-9.1388 2.9854-14.624 6.8066-14.624 10.97 0 9.5528 28.862 17.295 64.465 17.295 35.602 0 64.465-7.7422 64.465-17.295 0-4.1636-5.485-7.9849-14.624-10.97 0.045-0.0312 0.0875-0.0595 0.13375-0.0912 9.2512 3.0054 14.81 6.8589 14.81 11.062 0 9.6001-29.005 17.381-64.785 17.381" fill="#ececeb"/>
   <path id="path5729" d="m319.89 917.37c-35.602 0-64.465-7.7422-64.465-17.295 0-4.1636 5.485-7.9849 14.624-10.97 0.0437 0.0303 0.0913 0.0625 0.135 0.0914-9.025 2.9652-14.438 6.7524-14.438 10.879 0 9.5049 28.718 17.21 64.144 17.21s64.144-7.7051 64.144-17.21c0-4.1265-5.4125-7.9136-14.438-10.878 0.0438-0.0303 0.0913-0.0625 0.135-0.0928 9.1388 2.9854 14.624 6.8066 14.624 10.97 0 9.5528-28.862 17.295-64.465 17.295" fill="#ecebea"/>
   <path id="path5731" d="m319.89 917.29c-35.426 0-64.144-7.7051-64.144-17.21 0-4.1265 5.4125-7.9136 14.438-10.879 0.0463 0.0312 0.0888 0.0615 0.135 0.0928-8.9112 2.9439-14.252 6.6972-14.252 10.786 0 9.4575 28.575 17.124 63.824 17.124s63.822-7.666 63.822-17.124c0-4.0889-5.34-7.8422-14.251-10.786 0.0462-0.0312 0.09-0.0601 0.135-0.0914 9.025 2.9639 14.438 6.751 14.438 10.878 0 9.5049-28.718 17.21-64.144 17.21" fill="#ebebea"/>
   <path id="path5733" d="m319.89 917.2c-35.249 0-63.824-7.666-63.824-17.124 0-4.0889 5.3412-7.8422 14.252-10.786 0.0437 0.0297 0.0913 0.0625 0.135 0.0912-8.7988 2.9234-14.066 6.6452-14.066 10.695 0 9.4101 28.431 17.038 63.502 17.038s63.502-7.6275 63.502-17.038c0-4.0498-5.2675-7.77-14.066-10.695 0.0437-0.0287 0.0913-0.0615 0.135-0.0912 8.9112 2.9439 14.251 6.6972 14.251 10.786 0 9.4575-28.574 17.124-63.822 17.124" fill="#eaeae9"/>
   <path id="path5735" d="m319.89 917.12c-35.071 0-63.502-7.6275-63.502-17.038 0-4.0498 5.2675-7.7715 14.066-10.695 0.0462 0.0312 0.0913 0.0611 0.13625 0.0924-8.685 2.9022-13.881 6.5898-13.881 10.602 0 9.3622 28.286 16.951 63.181 16.951 34.894 0 63.181-7.5889 63.181-16.951 0-4.0128-5.1962-7.6988-13.881-10.602 0.0463-0.0312 0.09-0.0611 0.13625-0.0924 8.7988 2.9249 14.066 6.6451 14.066 10.695 0 9.4101-28.431 17.038-63.502 17.038" fill="#eaeae8"/>
   <path id="path5737" d="m319.89 917.03c-34.895 0-63.181-7.5889-63.181-16.951 0-4.0128 5.1962-7.7002 13.881-10.602 0.0463 0.0312 0.0913 0.061 0.1375 0.0913-8.5725 2.8824-13.699 6.5376-13.699 10.511 0 9.315 28.144 16.865 62.861 16.865 34.718 0 62.861-7.5498 62.861-16.865 0-3.9736-5.1262-7.6275-13.699-10.511 0.0462-0.0303 0.0913-0.06 0.1375-0.0913 8.685 2.9038 13.881 6.5898 13.881 10.602 0 9.3622-28.288 16.951-63.181 16.951" fill="#e9e9e8"/>
   <path id="path5739" d="m319.89 916.94c-34.718 0-62.861-7.5498-62.861-16.865 0-3.9736 5.1262-7.6289 13.699-10.511 0.0462 0.0312 0.0913 0.061 0.1375 0.0923-8.4612 2.8629-13.515 6.483-13.515 10.419 0 9.2676 28 16.779 62.54 16.779s62.54-7.5112 62.54-16.779c0-3.936-5.0538-7.5561-13.515-10.419 0.0462-0.0312 0.0912-0.061 0.1375-0.0923 8.5725 2.8838 13.699 6.5376 13.699 10.511 0 9.315-28.144 16.865-62.861 16.865" fill="#e9e8e7"/>
   <path id="path5741" d="m319.89 916.86c-34.54 0-62.54-7.5112-62.54-16.779 0-3.936 5.0538-7.5561 13.515-10.419 0.0462 0.0312 0.0913 0.0616 0.1375 0.0914-8.35 2.8428-13.331 6.4288-13.331 10.328 0 9.2202 27.856 16.694 62.219 16.694 34.362 0 62.219-7.4736 62.219-16.694 0-3.8989-4.9812-7.4849-13.331-10.326 0.0463-0.0312 0.0913-0.0616 0.1375-0.0929 8.4612 2.8629 13.515 6.483 13.515 10.419 0 9.2676-28 16.779-62.54 16.779" fill="#e8e8e6"/>
   <path id="path5743" d="m319.89 916.77c-34.362 0-62.219-7.4736-62.219-16.694 0-3.8989 4.9812-7.4849 13.331-10.328 0.0462 0.0312 0.0925 0.0615 0.13875 0.0928-8.2375 2.8199-13.15 6.3735-13.15 10.235 0 9.1724 27.712 16.607 61.899 16.607 34.185 0 61.899-7.4351 61.899-16.607 0-3.8614-4.9125-7.415-13.15-10.235 0.0462-0.0303 0.0925-0.0615 0.13875-0.0913 8.35 2.8413 13.331 6.4273 13.331 10.326 0 9.2202-27.856 16.694-62.219 16.694" fill="#e7e7e6"/>
   <path id="path5745" d="m319.89 916.69c-34.186 0-61.899-7.4351-61.899-16.607 0-3.8614 4.9125-7.415 13.15-10.235 0.0462 0.0312 0.0925 0.061 0.13875 0.0922-8.1275 2.7989-12.968 6.3189-12.968 10.143 0 9.1235 27.569 16.521 61.578 16.521s61.578-7.398 61.578-16.521c0-3.8228-4.8412-7.3438-12.968-10.143 0.0463-0.0312 0.0925-0.061 0.13875-0.0922 8.2375 2.8199 13.15 6.3735 13.15 10.235 0 9.1724-27.714 16.607-61.899 16.607" fill="#e7e6e5"/>
   <path id="path5747" d="m319.89 916.6c-34.009 0-61.578-7.398-61.578-16.521 0-3.8238 4.84-7.3438 12.968-10.143 0.0463 0.0304 0.0937 0.0616 0.14 0.0914-8.015 2.7788-12.788 6.2661-12.788 10.051 0 9.0776 27.426 16.435 61.258 16.435 33.831 0 61.258-7.3574 61.258-16.435 0-3.7851-4.7712-7.2725-12.788-10.051 0.0462-0.0298 0.0937-0.061 0.14-0.0914 8.1262 2.7989 12.968 6.3199 12.968 10.143 0 9.1235-27.569 16.521-61.578 16.521" fill="#e6e6e4"/>
   <path id="path5749" d="m319.89 916.52c-33.831 0-61.258-7.3574-61.258-16.435 0-3.7851 4.7725-7.2725 12.788-10.051 0.0462 0.0312 0.0937 0.0625 0.14 0.0922-7.9062 2.7579-12.606 6.2115-12.606 9.959 0 9.0288 27.282 16.349 60.936 16.349s60.936-7.3199 60.936-16.349c0-3.7475-4.7-7.2011-12.606-9.959 0.0463-0.0297 0.0937-0.061 0.14-0.0922 8.0162 2.7788 12.788 6.2661 12.788 10.051 0 9.0776-27.426 16.435-61.258 16.435" fill="#e5e5e3"/>
   <path id="path5751" d="m319.89 916.43c-33.654 0-60.936-7.3199-60.936-16.349 0-3.7475 4.7-7.2011 12.606-9.959 0.0475 0.0303 0.095 0.0615 0.14125 0.0928-7.795 2.7364-12.428 6.1562-12.428 9.8662 0 8.9815 27.139 16.263 60.616 16.263 33.478 0 60.615-7.2812 60.615-16.263 0-3.71-4.6312-7.1299-12.426-9.8662 0.0462-0.0312 0.0937-0.0625 0.14125-0.0928 7.9062 2.7579 12.606 6.2115 12.606 9.959 0 9.0288-27.282 16.349-60.936 16.349" fill="#e4e4e3"/>
   <path id="path5753" d="m319.89 916.34c-33.478 0-60.616-7.2812-60.616-16.263 0-3.71 4.6325-7.1299 12.428-9.8662 0.0475 0.0299 0.095 0.0611 0.1425 0.0914-7.6862 2.7149-12.249 6.1025-12.249 9.7749 0 8.9336 26.995 16.176 60.295 16.176s60.295-7.2426 60.295-16.176c0-3.6724-4.5625-7.0586-12.249-9.7749 0.0475-0.0302 0.095-0.0615 0.1425-0.0914 7.795 2.7364 12.426 6.1562 12.426 9.8662 0 8.9815-27.138 16.263-60.615 16.263" fill="#e4e3e2"/>
   <path id="path5755" d="m319.89 916.26c-33.3 0-60.295-7.2426-60.295-16.176 0-3.6724 4.5625-7.06 12.249-9.7749 0.0487 0.0323 0.0925 0.061 0.1425 0.0922-7.5775 2.6939-12.07 6.0479-12.07 9.6826 0 8.8862 26.851 16.091 59.974 16.091 33.122 0 59.974-7.2051 59.974-16.091 0-3.6348-4.4925-6.9888-12.069-9.6826 0.0487-0.0312 0.0925-0.06 0.14125-0.0922 7.6862 2.7162 12.249 6.1025 12.249 9.7749 0 8.9336-26.995 16.176-60.295 16.176" fill="#e3e3e1"/>
   <path id="path5757" d="m319.89 916.17c-33.122 0-59.974-7.2051-59.974-16.091 0-3.6348 4.4925-6.9888 12.07-9.6826 0.0463 0.0303 0.0962 0.0625 0.1425 0.0928-7.4675 2.6724-11.892 5.9922-11.892 9.5899 0 8.8389 26.709 16.005 59.654 16.005s59.652-7.166 59.652-16.005c0-3.5976-4.4238-6.9175-11.891-9.5899 0.0463-0.0303 0.0962-0.0625 0.14375-0.0928 7.5762 2.6939 12.069 6.0479 12.069 9.6826 0 8.8862-26.851 16.091-59.974 16.091" fill="#e2e2e0"/>
   <path id="path5759" d="m319.89 916.08c-32.945 0-59.654-7.166-59.654-16.005 0-3.5976 4.425-6.9175 11.892-9.5899 0.0487 0.0312 0.095 0.0601 0.14375 0.0909-7.3588 2.6528-11.715 5.939-11.715 9.499 0 8.791 26.564 15.919 59.332 15.919 32.769 0 59.332-7.128 59.332-15.919 0-3.56-4.3562-6.8462-11.715-9.4975 0.0488-0.0322 0.095-0.0611 0.14375-0.0924 7.4675 2.6724 11.891 5.9922 11.891 9.5899 0 8.8389-26.708 16.005-59.652 16.005" fill="#e2e1df"/>
   <path id="path5761" d="m319.89 916c-32.769 0-59.332-7.128-59.332-15.919 0-3.56 4.3562-6.8462 11.715-9.499 0.0463 0.0303 0.0975 0.063 0.14375 0.0928-7.25 2.6299-11.538 5.8838-11.538 9.4062 0 8.7436 26.42 15.833 59.011 15.833s59.011-7.0889 59.011-15.833c0-3.5225-4.2862-6.7764-11.538-9.4062 0.0462-0.0298 0.0975-0.061 0.14375-0.0913 7.3588 2.6512 11.715 5.9375 11.715 9.4975 0 8.791-26.564 15.919-59.332 15.919" fill="#e1e0df"/>
   <path id="path5763" d="m319.89 915.91c-32.591 0-59.011-7.0889-59.011-15.833 0-3.5225 4.2875-6.7764 11.538-9.4062 0.05 0.0312 0.0962 0.061 0.145 0.0922-7.1425 2.6089-11.362 5.8291-11.362 9.314 0 8.6962 26.278 15.746 58.691 15.746 32.414 0 58.691-7.0498 58.691-15.746 0-3.4849-4.22-6.7051-11.362-9.314 0.0488-0.0312 0.095-0.061 0.145-0.0922 7.2512 2.6299 11.538 5.8838 11.538 9.4062 0 8.7436-26.42 15.833-59.011 15.833" fill="#e0e0de"/>
   <path id="path5765" d="m319.89 915.83c-32.414 0-58.691-7.0498-58.691-15.746 0-3.4849 4.22-6.7051 11.362-9.314 0.0475 0.0303 0.0988 0.0625 0.14625 0.0928-7.0362 2.586-11.188 5.7735-11.188 9.2212 0 8.6489 26.132 15.66 58.37 15.66 32.236 0 58.37-7.0113 58.37-15.66 0-3.4478-4.1525-6.6352-11.188-9.2212 0.0475-0.0303 0.0987-0.0625 0.14625-0.0928 7.1425 2.6089 11.362 5.8291 11.362 9.314 0 8.6962-26.278 15.746-58.691 15.746" fill="#e0dfdd"/>
   <path id="path5767" d="m319.89 915.74c-32.238 0-58.37-7.0113-58.37-15.66 0-3.4478 4.1512-6.6352 11.188-9.2212 0.0488 0.0312 0.0962 0.0611 0.14625 0.0924-6.9275 2.5649-11.012 5.7188-11.012 9.1289 0 8.6011 25.989 15.575 58.049 15.575s58.049-6.9741 58.049-15.575c0-3.4101-4.085-6.564-11.012-9.1289 0.05-0.0312 0.0975-0.0611 0.14625-0.0924 7.035 2.586 11.188 5.7735 11.188 9.2212 0 8.6489-26.134 15.66-58.37 15.66" fill="#dfdedc"/>
   <path id="path5769" d="m319.89 915.66c-32.06 0-58.049-6.9741-58.049-15.575 0-3.4101 4.085-6.564 11.012-9.1289 0.0487 0.0312 0.0975 0.0615 0.14625 0.0928-6.8212 2.5425-10.839 5.6636-10.839 9.0361 0 8.5538 25.846 15.489 57.729 15.489 31.882 0 57.729-6.935 57.729-15.489 0-3.3725-4.0175-6.4926-10.839-9.0361 0.0488-0.0312 0.0975-0.0615 0.14625-0.0928 6.9275 2.5649 11.012 5.7188 11.012 9.1289 0 8.6011-25.989 15.575-58.049 15.575" fill="#dedddb"/>
   <path id="path5771" d="m319.89 915.57c-31.882 0-57.729-6.935-57.729-15.489 0-3.3725 4.0175-6.4936 10.839-9.0361 0.05 0.0312 0.0987 0.061 0.14875 0.0922-6.715 2.5215-10.666 5.6089-10.666 8.9439 0 8.5064 25.702 15.402 57.408 15.402 31.705 0 57.408-6.896 57.408-15.402 0-3.335-3.95-6.4224-10.666-8.9439 0.05-0.0312 0.0988-0.061 0.14875-0.0922 6.8212 2.5435 10.839 5.6636 10.839 9.0361 0 8.5538-25.846 15.489-57.729 15.489" fill="#dddcda"/>
   <path id="path5773" d="m319.89 915.48c-31.705 0-57.408-6.896-57.408-15.402 0-3.335 3.9512-6.4224 10.666-8.9439 0.0487 0.0303 0.0987 0.0615 0.14875 0.0928-6.61 2.4986-10.495 5.5538-10.495 8.8511 0 8.459 25.559 15.316 57.088 15.316 31.528 0 57.088-6.8574 57.088-15.316 0-3.2974-3.885-6.3525-10.494-8.8511 0.0487-0.0312 0.0987-0.0625 0.1475-0.0928 6.7162 2.5215 10.666 5.6089 10.666 8.9439 0 8.5064-25.702 15.402-57.408 15.402" fill="#dddcda"/>
   <path id="path5775" d="m319.89 915.4c-31.529 0-57.088-6.8574-57.088-15.316 0-3.2974 3.885-6.3525 10.495-8.8511 0.0487 0.0299 0.0987 0.0611 0.14875 0.0924-6.5038 2.4775-10.322 5.499-10.322 8.7588 0 8.4111 25.415 15.23 56.766 15.23s56.766-6.8188 56.766-15.23c0-3.2598-3.8188-6.2812-10.322-8.7588 0.05-0.0312 0.1-0.0625 0.15-0.0924 6.6088 2.4986 10.494 5.5538 10.494 8.8511 0 8.459-25.56 15.316-57.088 15.316" fill="#dcdbd9"/>
   <path id="path5777" d="m319.89 915.31c-31.351 0-56.766-6.8188-56.766-15.23 0-3.2598 3.8188-6.2812 10.322-8.7588 0.0487 0.0303 0.1 0.061 0.15 0.0923-6.3988 2.4551-10.151 5.4439-10.151 8.6665 0 8.3638 25.271 15.144 56.445 15.144s56.445-6.7798 56.445-15.144c0-3.2226-3.7525-6.2114-10.151-8.6665 0.05-0.0312 0.10125-0.062 0.15-0.0923 6.5038 2.4775 10.322 5.499 10.322 8.7588 0 8.4111-25.415 15.23-56.766 15.23" fill="#dbdad8"/>
   <path id="path5779" d="m319.89 915.22c-31.174 0-56.445-6.7798-56.445-15.144 0-3.2226 3.7525-6.2114 10.151-8.6665 0.0487 0.0303 0.1 0.0615 0.15 0.0928-6.2938 2.4326-9.9812 5.3878-9.9812 8.5738 0 8.3164 25.129 15.058 56.125 15.058s56.125-6.7412 56.125-15.058c0-3.186-3.6875-6.1411-9.9812-8.5738 0.05-0.0312 0.10125-0.0625 0.15-0.0928 6.3988 2.4551 10.151 5.4439 10.151 8.6665 0 8.3638-25.271 15.144-56.445 15.144" fill="#dad9d7"/>
   <path id="path5781" d="m319.89 915.14c-30.996 0-56.125-6.7412-56.125-15.058 0-3.186 3.6875-6.1411 9.9812-8.5738 0.05 0.0298 0.10125 0.061 0.15125 0.0923-6.1875 2.4116-9.8112 5.3326-9.8112 8.4815 0 8.2685 24.984 14.973 55.804 14.973s55.804-6.7042 55.804-14.973c0-3.1489-3.6225-6.0699-9.8112-8.4815 0.05-0.0298 0.10125-0.0625 0.15125-0.0923 6.2938 2.4326 9.9812 5.3878 9.9812 8.5738 0 8.3164-25.129 15.058-56.125 15.058" fill="#d9d8d6"/>
   <path id="path5783" d="m319.89 915.05c-30.82 0-55.804-6.7042-55.804-14.973 0-3.1489 3.6238-6.0699 9.8112-8.4815 0.0525 0.0312 0.1 0.0601 0.1525 0.0929-6.085 2.3886-9.6438 5.2773-9.6438 8.3886 0 8.2212 24.841 14.886 55.484 14.886 30.642 0 55.484-6.665 55.484-14.886 0-3.1114-3.5588-6-9.6438-8.3886 0.0525-0.0312 0.1-0.0616 0.1525-0.0929 6.1888 2.4116 9.8112 5.3326 9.8112 8.4815 0 8.2685-24.984 14.973-55.804 14.973" fill="#d8d7d6"/>
   <path id="path5785" d="m319.89 914.97c-30.642 0-55.484-6.665-55.484-14.886 0-3.1114 3.5588-6 9.6438-8.3886 0.05 0.0298 0.1025 0.0625 0.1525 0.0923-5.9812 2.3663-9.475 5.2211-9.475 8.2964 0 8.1739 24.698 14.8 55.162 14.8 30.465 0 55.162-6.6259 55.162-14.8 0-3.0752-3.4938-5.9301-9.475-8.2964 0.05-0.0298 0.1025-0.0625 0.1525-0.0923 6.085 2.3886 9.6438 5.2773 9.6438 8.3886 0 8.2212-24.841 14.886-55.484 14.886" fill="#d7d6d5"/>
   <path id="path5787" d="m319.89 914.88c-30.465 0-55.162-6.6259-55.162-14.8 0-3.0752 3.4938-5.9301 9.475-8.2964 0.0525 0.0312 0.10125 0.0615 0.15375 0.0928-5.8775 2.3438-9.3075 5.166-9.3075 8.2036 0 8.1265 24.552 14.714 54.841 14.714 30.288 0 54.841-6.5874 54.841-14.714 0-3.0376-3.43-5.8599-9.3075-8.2036 0.0525-0.0312 0.10125-0.06 0.15375-0.0928 5.9812 2.3663 9.475 5.2211 9.475 8.2964 0 8.1739-24.698 14.8-55.162 14.8" fill="#d6d6d4"/>
   <path id="path5789" d="m319.89 914.79c-30.289 0-54.841-6.5874-54.841-14.714 0-3.0376 3.43-5.8599 9.3075-8.2036 0.05 0.0297 0.105 0.0625 0.155 0.0922-5.7762 2.3227-9.1425 5.1114-9.1425 8.1114 0 8.0786 24.41 14.627 54.521 14.627s54.521-6.5488 54.521-14.627c0-3-3.3662-5.7886-9.1425-8.1099 0.0512-0.0303 0.105-0.064 0.155-0.0937 5.8775 2.3438 9.3075 5.166 9.3075 8.2036 0 8.1265-24.554 14.714-54.841 14.714" fill="#d5d5d3"/>
   <path id="path5791" d="m319.89 914.71c-30.111 0-54.521-6.5488-54.521-14.627 0-3 3.3662-5.7886 9.1425-8.1114 0.0525 0.0328 0.1025 0.0625 0.155 0.0937-5.6725 2.2989-8.9762 5.0552-8.9762 8.0176 0 8.0312 24.266 14.541 54.2 14.541s54.2-6.5098 54.2-14.541c0-2.9624-3.3038-5.7188-8.9762-8.0176 0.0525-0.0312 0.1025-0.061 0.155-0.0922 5.7762 2.3212 9.1425 5.1099 9.1425 8.1099 0 8.0786-24.41 14.627-54.521 14.627" fill="#d4d4d2"/>
   <path id="path5793" d="m319.89 914.62c-29.934 0-54.2-6.5098-54.2-14.541 0-2.9624 3.3038-5.7188 8.9762-8.0176 0.0525 0.0312 0.10375 0.0616 0.15625 0.0929-5.5712 2.2759-8.8125 4.9985-8.8125 7.9248 0 7.9839 24.122 14.455 53.88 14.455 29.756 0 53.879-6.4712 53.879-14.455 0-2.9262-3.24-5.6489-8.8112-7.9248 0.0538-0.0312 0.10375-0.0616 0.15625-0.0929 5.6725 2.2989 8.9762 5.0552 8.9762 8.0176 0 8.0312-24.266 14.541-54.2 14.541" fill="#d4d3d1"/>
   <path id="path5795" d="m319.89 914.54c-29.758 0-53.88-6.4712-53.88-14.455 0-2.9262 3.2412-5.6489 8.8125-7.9248 0.0525 0.0312 0.10375 0.061 0.15625 0.0923-5.47 2.2539-8.6475 4.9439-8.6475 7.8325 0 7.936 23.979 14.37 53.559 14.37 29.579 0 53.559-6.4341 53.559-14.37 0-2.8886-3.1775-5.5786-8.6475-7.8325 0.0525-0.0298 0.10375-0.061 0.15625-0.0923 5.5712 2.2759 8.8112 4.9985 8.8112 7.9248 0 7.9839-24.122 14.455-53.879 14.455" fill="#d3d2d0"/>
   <path id="path5797" d="m319.89 914.45c-29.58 0-53.559-6.4341-53.559-14.37 0-2.8886 3.1775-5.5786 8.6475-7.8325 0.05 0.0297 0.1075 0.064 0.1575 0.0937-5.3688 2.23-8.4838 4.8862-8.4838 7.7388 0 7.8886 23.835 14.284 53.238 14.284 29.402 0 53.238-6.3951 53.238-14.284 0-2.8525-3.115-5.5088-8.4838-7.7388 0.05-0.0298 0.1075-0.064 0.1575-0.0937 5.47 2.2539 8.6475 4.9439 8.6475 7.8325 0 7.936-23.98 14.37-53.559 14.37" fill="#d2d1cf"/>
   <path id="path5799" d="m319.89 914.36c-29.402 0-53.238-6.3951-53.238-14.284 0-2.8525 3.115-5.5088 8.4838-7.7388 0.0525 0.0312 0.10625 0.061 0.15875 0.0922-5.2688 2.2075-8.3225 4.8315-8.3225 7.6465 0 7.8412 23.692 14.197 52.918 14.197 29.225 0 52.918-6.356 52.918-14.197 0-2.815-3.0538-5.439-8.3225-7.6465 0.0525-0.0297 0.10625-0.061 0.15875-0.0922 5.3688 2.23 8.4838 4.8862 8.4838 7.7388 0 7.8886-23.835 14.284-53.238 14.284" fill="#d1d0cf"/>
   <path id="path5801" d="m319.89 914.28c-29.225 0-52.918-6.356-52.918-14.197 0-2.815 3.0538-5.439 8.3225-7.6465 0.055 0.0328 0.10375 0.0615 0.15875 0.0937-5.1675 2.1841-8.16 4.774-8.16 7.5528 0 7.794 23.548 14.111 52.596 14.111 29.049 0 52.596-6.3173 52.596-14.111 0-2.7788-2.9925-5.3686-8.16-7.5528 0.055-0.0322 0.10375-0.061 0.15875-0.0937 5.2688 2.2075 8.3225 4.8315 8.3225 7.6465 0 7.8412-23.692 14.197-52.918 14.197" fill="#d0cfcd"/>
   <path id="path5803" d="m319.89 914.19c-29.049 0-52.596-6.3173-52.596-14.111 0-2.7788 2.9925-5.3686 8.16-7.5528 0.0537 0.0303 0.1075 0.0625 0.16125 0.0928-5.0688 2.1611-8 4.7188-8 7.46 0 7.7461 23.404 14.025 52.275 14.025s52.275-6.2788 52.275-14.025c0-2.7412-2.9312-5.2989-8-7.46 0.0537-0.0303 0.1075-0.0625 0.16125-0.0928 5.1675 2.1841 8.16 4.774 8.16 7.5528 0 7.794-23.548 14.111-52.596 14.111" fill="#cfcecc"/>
   <path id="path5805" d="m319.89 914.1c-28.871 0-52.275-6.2788-52.275-14.025 0-2.7412 2.9312-5.2989 8-7.46 0.0525 0.0312 0.1075 0.0625 0.16 0.0937-4.9688 2.1372-7.84 4.6611-7.84 7.3662 0 7.6988 23.261 13.94 51.955 13.94s51.955-6.2412 51.955-13.94c0-2.7051-2.8712-5.229-7.84-7.3662 0.0525-0.0312 0.1075-0.0625 0.16-0.0937 5.0688 2.1611 8 4.7188 8 7.46 0 7.7461-23.404 14.025-52.275 14.025" fill="#cecdcb"/>
   <path id="path5807" d="m319.89 914.02c-28.694 0-51.955-6.2412-51.955-13.94 0-2.7051 2.8712-5.229 7.84-7.3662 0.0538 0.0299 0.10875 0.0625 0.1625 0.0924-4.87 2.1138-7.6812 4.6064-7.6812 7.2739 0 7.6514 23.118 13.854 51.634 13.854s51.634-6.2021 51.634-13.854c0-2.6675-2.8112-5.1588-7.6812-7.2739 0.0538-0.0299 0.10875-0.0625 0.1625-0.0924 4.9688 2.1372 7.84 4.6611 7.84 7.3662 0 7.6988-23.261 13.94-51.955 13.94" fill="#cdccca"/>
   <path id="path5809" d="m319.89 913.93c-28.516 0-51.634-6.2021-51.634-13.854 0-2.6675 2.8112-5.1601 7.6812-7.2739 0.055 0.0326 0.1075 0.0615 0.1625 0.0937-4.7725 2.0902-7.5238 4.5487-7.5238 7.1801 0 7.6035 22.974 13.768 51.314 13.768s51.312-6.1641 51.312-13.768c0-2.6314-2.7512-5.0899-7.5225-7.1801 0.055-0.0323 0.1075-0.0611 0.1625-0.0937 4.87 2.1151 7.6812 4.6064 7.6812 7.2739 0 7.6514-23.118 13.854-51.634 13.854" fill="#cccbc9"/>
   <path id="path5811" d="m319.89 913.85c-28.34 0-51.314-6.1641-51.314-13.768 0-2.6314 2.7512-5.0899 7.5238-7.1801 0.0537 0.0302 0.11 0.0625 0.16375 0.0927-4.675 2.0674-7.3662 4.4921-7.3662 7.0874 0 7.5561 22.83 13.681 50.992 13.681s50.992-6.125 50.992-13.681c0-2.5938-2.6925-5.02-7.3662-7.0864 0.0537-0.0312 0.11-0.0635 0.16375-0.0937 4.7712 2.0902 7.5225 4.5487 7.5225 7.1801 0 7.6035-22.972 13.768-51.312 13.768" fill="#cbc9c8"/>
   <path id="path5813" d="m319.89 913.76c-28.162 0-50.992-6.125-50.992-13.681 0-2.5952 2.6912-5.02 7.3662-7.0874 0.0562 0.0323 0.10875 0.0625 0.165 0.0937-4.5775 2.0434-7.21 4.436-7.21 6.9936 0 7.5088 22.686 13.595 50.671 13.595s50.671-6.0865 50.671-13.595c0-2.5576-2.6325-4.9502-7.21-6.9936 0.0563-0.0312 0.11-0.0615 0.165-0.0927 4.6738 2.0664 7.3662 4.4926 7.3662 7.0864 0 7.5561-22.83 13.681-50.992 13.681" fill="#cac8c7"/>
   <path id="path5815" d="m319.89 913.68c-27.985 0-50.671-6.0865-50.671-13.595 0-2.5576 2.6325-4.9502 7.21-6.9936 0.055 0.0312 0.10875 0.0625 0.165 0.0937-4.4812 2.02-7.055 4.3784-7.055 6.8999 0 7.4614 22.542 13.509 50.351 13.509 27.808 0 50.351-6.0474 50.351-13.509 0-2.5215-2.5738-4.8799-7.055-6.8999 0.0563-0.0312 0.11-0.0615 0.165-0.0937 4.5775 2.0434 7.21 4.436 7.21 6.9936 0 7.5088-22.686 13.595-50.671 13.595" fill="#c9c7c6"/>
   <path id="path5817" d="m319.89 913.59c-27.809 0-50.351-6.0474-50.351-13.509 0-2.5215 2.5738-4.8799 7.055-6.8999 0.0562 0.0312 0.11 0.0625 0.16625 0.0937-4.385 1.9946-6.9 4.3222-6.9 6.8061 0 7.4136 22.399 13.422 50.03 13.422s50.03-6.0087 50.03-13.422c0-2.4839-2.515-4.8115-6.9-6.8061 0.0563-0.0312 0.11-0.0625 0.16625-0.0937 4.4812 2.02 7.055 4.3784 7.055 6.8999 0 7.4614-22.544 13.509-50.351 13.509" fill="#c8c6c5"/>
   <path id="path5819" d="m319.89 913.5c-27.631 0-50.03-6.0087-50.03-13.422 0-2.4839 2.515-4.8115 6.9-6.8061 0.0538 0.0297 0.11375 0.0635 0.1675 0.0937-4.29 1.9711-6.7475 4.2646-6.7475 6.7124 0 7.3662 22.256 13.337 49.71 13.337s49.709-5.9712 49.709-13.337c0-2.4478-2.4575-4.7412-6.7462-6.7124 0.0562-0.0312 0.11125-0.0625 0.1675-0.0937 4.385 1.9946 6.9 4.3222 6.9 6.8061 0 7.4136-22.399 13.422-50.03 13.422" fill="#c7c5c3"/>
   <path id="path5821" d="m319.89 913.42c-27.454 0-49.71-5.9712-49.71-13.337 0-2.4478 2.4575-4.7412 6.7475-6.7124 0.0587 0.0323 0.11 0.06 0.16875 0.0922-4.195 1.9488-6.595 4.209-6.595 6.6201 0 7.3189 22.112 13.251 49.389 13.251 27.276 0 49.389-5.9326 49.389-13.251 0-2.4111-2.4-4.6714-6.595-6.6186 0.0563-0.0312 0.1125-0.0625 0.16875-0.0937 4.2888 1.9711 6.7462 4.2646 6.7462 6.7124 0 7.3662-22.255 13.337-49.709 13.337" fill="#c6c4c2"/>
   <path id="path5823" d="m319.89 913.33c-27.276 0-49.389-5.9326-49.389-13.251 0-2.4111 2.4-4.6714 6.595-6.6201 0.0562 0.0312 0.1125 0.064 0.16875 0.0937-4.1 1.9239-6.4425 4.1514-6.4425 6.5264 0 7.271 21.968 13.165 49.068 13.165s49.068-5.894 49.068-13.165c0-2.375-2.3425-4.6025-6.4425-6.5264 0.0563-0.0297 0.1125-0.0625 0.16875-0.0922 4.195 1.9472 6.595 4.2075 6.595 6.6186 0 7.3189-22.112 13.251-49.389 13.251" fill="#c4c3c1"/>
   <path id="path5825" d="m319.89 913.25c-27.1 0-49.068-5.894-49.068-13.165 0-2.375 2.3425-4.6025 6.4425-6.5264 0.0563 0.0312 0.115 0.064 0.17125 0.0937-4.0062 1.8999-6.2938 4.0953-6.2938 6.4326 0 7.2236 21.825 13.079 48.748 13.079 26.922 0 48.748-5.855 48.748-13.079 0-2.3374-2.2875-4.5328-6.2938-6.4326 0.0563-0.0297 0.115-0.0625 0.17125-0.0937 4.1 1.9239 6.4425 4.1514 6.4425 6.5264 0 7.271-21.968 13.165-49.068 13.165" fill="#c3c2c0"/>
   <path id="path5827" d="m319.89 913.16c-26.922 0-48.748-5.855-48.748-13.079 0-2.3374 2.2875-4.5328 6.2938-6.4326 0.0563 0.0312 0.115 0.064 0.17125 0.0937-3.9125 1.875-6.1438 4.0376-6.1438 6.3389 0 7.1762 21.681 12.993 48.426 12.993s48.426-5.8164 48.426-12.993c0-2.3012-2.2312-4.4639-6.1438-6.3389 0.0563-0.0297 0.115-0.0625 0.17125-0.0937 4.0062 1.8999 6.2938 4.0953 6.2938 6.4326 0 7.2236-21.825 13.079-48.748 13.079" fill="#c2c1bf"/>
   <path id="path5829" d="m319.89 913.07c-26.745 0-48.426-5.8164-48.426-12.993 0-2.3012 2.2312-4.4639 6.1438-6.3389 0.0587 0.0328 0.11375 0.0625 0.1725 0.0937-3.8212 1.8516-5.9962 3.98-5.9962 6.2451 0 7.1289 21.539 12.906 48.106 12.906 26.568 0 48.105-5.7774 48.105-12.906 0-2.2651-2.175-4.3935-5.995-6.2436 0.0588-0.0328 0.11375-0.0625 0.1725-0.0953 3.9125 1.875 6.1438 4.0376 6.1438 6.3389 0 7.1762-21.681 12.993-48.426 12.993" fill="#c1c0be"/>
   <path id="path5831" d="m319.89 912.99c-26.568 0-48.106-5.7774-48.106-12.906 0-2.2651 2.175-4.3935 5.9962-6.2451 0.0563 0.0312 0.11625 0.064 0.1725 0.0953-3.7275 1.8246-5.8475 3.9214-5.8475 6.1499 0 7.081 21.394 12.82 47.785 12.82s47.785-5.7388 47.785-12.82c0-2.2285-2.12-4.3252-5.8475-6.1499 0.0563-0.0312 0.11625-0.064 0.1725-0.0937 3.82 1.8501 5.995 3.9785 5.995 6.2436 0 7.1289-21.538 12.906-48.105 12.906" fill="#c0bfbd"/>
   <path id="path5833" d="m319.89 912.9c-26.391 0-47.785-5.7388-47.785-12.82 0-2.2285 2.12-4.3252 5.8475-6.1499 0.0588 0.0312 0.11625 0.061 0.175 0.0937-3.6362 1.8012-5.7012 3.8638-5.7012 6.0561 0 7.0328 21.25 12.735 47.464 12.735s47.464-5.7021 47.464-12.735c0-2.1924-2.065-4.2549-5.7012-6.0561 0.0588-0.0312 0.11625-0.0625 0.175-0.0937 3.7275 1.8246 5.8475 3.9214 5.8475 6.1499 0 7.081-21.394 12.82-47.785 12.82" fill="#bfbebc"/>
   <path id="path5835" d="m319.89 912.81c-26.214 0-47.464-5.7021-47.464-12.735 0-2.1924 2.065-4.2549 5.7012-6.0561 0.0587 0.0312 0.11625 0.0625 0.175 0.0937-3.545 1.7759-5.5562 3.8061-5.5562 5.9624 0 6.9849 21.108 12.649 47.144 12.649s47.142-5.664 47.142-12.649c0-2.1562-2.01-4.1865-5.555-5.9624 0.0587-0.0312 0.11625-0.0625 0.175-0.0937 3.6362 1.8012 5.7012 3.8638 5.7012 6.0561 0 7.0328-21.25 12.735-47.464 12.735" fill="#bebdbb"/>
   <path id="path5837" d="m319.89 912.73c-26.036 0-47.144-5.664-47.144-12.649 0-2.1562 2.0112-4.1865 5.5562-5.9624 0.06 0.0312 0.1175 0.0625 0.1775 0.0937-3.4562 1.7524-5.4125 3.7485-5.4125 5.8686 0 6.9375 20.962 12.562 46.822 12.562 25.859 0 46.822-5.625 46.822-12.562 0-2.1201-1.9562-4.1162-5.4125-5.8676 0.06-0.0323 0.1175-0.0635 0.1775-0.0948 3.545 1.7759 5.555 3.8061 5.555 5.9624 0 6.9849-21.106 12.649-47.142 12.649" fill="#bdbcba"/>
   <path id="path5839" d="m319.89 912.64c-25.86 0-46.822-5.625-46.822-12.562 0-2.1201 1.9562-4.1162 5.4125-5.8686 0.0587 0.0323 0.11875 0.0635 0.1775 0.0948-3.3662 1.7265-5.27 3.6899-5.27 5.7739 0 6.8901 20.82 12.476 46.502 12.476s46.501-5.586 46.501-12.476c0-2.084-1.9025-4.0474-5.2688-5.7739 0.0588-0.0312 0.11875-0.0625 0.1775-0.0937 3.4562 1.7514 5.4125 3.7475 5.4125 5.8676 0 6.9375-20.964 12.562-46.822 12.562" fill="#bcbbb9"/>
   <path id="path5841" d="m319.89 912.56c-25.682 0-46.502-5.586-46.502-12.476 0-2.084 1.9038-4.0474 5.27-5.7739 0.0587 0.0312 0.12 0.0625 0.17875 0.0937-3.2775 1.7011-5.1275 3.6328-5.1275 5.6801 0 6.8422 20.676 12.39 46.181 12.39s46.181-5.5479 46.181-12.39c0-2.0464-1.8512-3.979-5.1275-5.6801 0.0588-0.0312 0.12-0.0625 0.17875-0.0937 3.3662 1.7265 5.2688 3.6899 5.2688 5.7739 0 6.8901-20.819 12.476-46.501 12.476" fill="#bbbab8"/>
   <path id="path5843" d="m319.89 912.47c-25.505 0-46.181-5.5479-46.181-12.39 0-2.0474 1.85-3.979 5.1275-5.6801 0.0587 0.0312 0.12 0.0639 0.18 0.0951-3.1888 1.6762-4.9862 3.5738-4.9862 5.585 0 6.7949 20.532 12.304 45.86 12.304s45.86-5.5088 45.86-12.304c0-2.0098-1.7988-3.9088-4.9862-5.585 0.06-0.0312 0.12125-0.0639 0.18-0.0951 3.2762 1.7011 5.1275 3.6337 5.1275 5.6801 0 6.8422-20.676 12.39-46.181 12.39" fill="#bab9b7"/>
   <path id="path5845" d="m319.89 912.38c-25.328 0-45.86-5.5088-45.86-12.304 0-2.0112 1.7975-3.9088 4.9862-5.585 0.0612 0.0327 0.11875 0.0625 0.18125 0.0937-3.1012 1.6514-4.8475 3.5161-4.8475 5.4912 0 6.7475 20.389 12.219 45.54 12.219 25.15 0 45.539-5.4712 45.539-12.219 0-1.9751-1.745-3.8399-4.8462-5.4912 0.0625-0.0312 0.12-0.061 0.18125-0.0937 3.1875 1.6762 4.9862 3.5752 4.9862 5.585 0 6.7949-20.532 12.304-45.86 12.304" fill="#b9b8b6"/>
   <path id="path5847" d="m319.89 912.3c-25.151 0-45.54-5.4712-45.54-12.219 0-1.9751 1.7462-3.8399 4.8475-5.4912 0.0588 0.0312 0.1225 0.0635 0.1825 0.0952-3.0138 1.6245-4.7088 3.457-4.7088 5.396 0 6.7002 20.245 12.132 45.219 12.132s45.219-5.4321 45.219-12.132c0-1.939-1.695-3.7715-4.7088-5.396 0.06-0.0317 0.12375-0.064 0.1825-0.0952 3.1012 1.6514 4.8462 3.5161 4.8462 5.4912 0 6.7475-20.389 12.219-45.539 12.219" fill="#b7b7b5"/>
   <path id="path5849" d="m319.89 912.21c-24.974 0-45.219-5.4321-45.219-12.132 0-1.939 1.695-3.7715 4.7088-5.396 0.0613 0.0323 0.12125 0.062 0.18375 0.0948-2.9275 1.5986-4.5725 3.3989-4.5725 5.3012 0 6.6524 20.102 12.046 44.899 12.046 24.796 0 44.898-5.394 44.898-12.046 0-1.9024-1.6438-3.7026-4.5712-5.3012 0.0625-0.0328 0.1225-0.0625 0.18375-0.0948 3.0138 1.6245 4.7088 3.457 4.7088 5.396 0 6.7002-20.245 12.132-45.219 12.132" fill="#b6b6b4"/>
   <path id="path5851" d="m319.89 912.13c-24.796 0-44.899-5.394-44.899-12.046 0-1.9024 1.645-3.7026 4.5725-5.3012 0.0612 0.0312 0.1225 0.0625 0.185 0.0937-2.8425 1.5751-4.4362 3.3412-4.4362 5.2075 0 6.605 19.958 11.96 44.578 11.96 24.619 0 44.578-5.355 44.578-11.96 0-1.8662-1.595-3.6324-4.4362-5.2075 0.0625-0.0312 0.12375-0.0625 0.185-0.0937 2.9275 1.5986 4.5712 3.3989 4.5712 5.3012 0 6.6524-20.101 12.046-44.898 12.046" fill="#b5b4b3"/>
   <path id="path5853" d="m319.89 912.04c-24.62 0-44.578-5.355-44.578-11.96 0-1.8662 1.5938-3.6324 4.4362-5.2075 0.0588 0.0312 0.12625 0.0649 0.185 0.0952-2.7562 1.5482-4.3 3.2821-4.3 5.1122 0 6.5576 19.814 11.874 44.256 11.874s44.256-5.3159 44.256-11.874c0-1.8301-1.5438-3.564-4.3-5.1122 0.0613-0.0312 0.12375-0.0625 0.185-0.0952 2.8412 1.5751 4.4362 3.3412 4.4362 5.2075 0 6.605-19.959 11.96-44.578 11.96" fill="#b4b3b2"/>
   <path id="path5855" d="m319.89 911.95c-24.442 0-44.256-5.3159-44.256-11.874 0-1.8301 1.5438-3.564 4.3-5.1122 0.065 0.0336 0.1225 0.0625 0.1875 0.0946-2.6725 1.5225-4.1675 3.2236-4.1675 5.0176 0 6.5098 19.671 11.788 43.936 11.788s43.935-5.2778 43.935-11.788c0-1.794-1.4938-3.4951-4.1662-5.0176 0.0625-0.0312 0.125-0.0625 0.1875-0.0946 2.7562 1.5482 4.3 3.2821 4.3 5.1122 0 6.5576-19.814 11.874-44.256 11.874" fill="#b3b2b1"/>
   <path id="path5857" d="m319.89 911.87c-24.265 0-43.936-5.2778-43.936-11.788 0-1.794 1.495-3.4951 4.1675-5.0176 0.0625 0.0312 0.12625 0.064 0.18875 0.0953-2.59 1.4961-4.035 3.1636-4.035 4.9224 0 6.4624 19.528 11.701 43.615 11.701 24.088 0 43.615-5.2388 43.615-11.701 0-1.7588-1.445-3.4262-4.035-4.9224 0.0625-0.0312 0.12625-0.064 0.18875-0.0953 2.6725 1.5225 4.1662 3.2236 4.1662 5.0176 0 6.5098-19.67 11.788-43.935 11.788" fill="#b1b1b0"/>
   <path id="path5859" d="m319.89 911.78c-24.088 0-43.615-5.2388-43.615-11.701 0-1.7588 1.445-3.4262 4.035-4.9224 0.0625 0.0312 0.1275 0.0635 0.19 0.0947-2.5075 1.4702-3.9038 3.105-3.9038 4.8276 0 6.415 19.382 11.616 43.294 11.616 23.91 0 43.294-5.2012 43.294-11.616 0-1.7226-1.3962-3.3574-3.9038-4.8276 0.0625-0.0312 0.1275-0.0635 0.19-0.0947 2.59 1.4961 4.035 3.1636 4.035 4.9224 0 6.4624-19.528 11.701-43.615 11.701" fill="#b0b0af"/>
   <path id="path5861" d="m319.89 911.7c-23.911 0-43.294-5.2012-43.294-11.616 0-1.7226 1.3962-3.3574 3.9038-4.8276 0.065 0.0327 0.12625 0.0625 0.19125 0.0952-2.425 1.4438-3.775 3.0459-3.775 4.7324 0 6.3676 19.24 11.53 42.974 11.53s42.974-5.1622 42.974-11.53c0-1.6865-1.35-3.2886-3.775-4.7324 0.065-0.0312 0.12625-0.0625 0.19125-0.0952 2.5075 1.4702 3.9038 3.105 3.9038 4.8276 0 6.415-19.384 11.616-43.294 11.616" fill="#afafad"/>
   <path id="path5863" d="m319.89 911.61c-23.734 0-42.974-5.1622-42.974-11.53 0-1.6865 1.35-3.2886 3.775-4.7324 0.0625 0.0312 0.13 0.0649 0.1925 0.0961-2.3438 1.416-3.6462 2.9864-3.6462 4.6362 0 6.3199 19.096 11.444 42.652 11.444s42.652-5.124 42.652-11.444c0-1.6499-1.3025-3.2188-3.6462-4.6362 0.0625-0.0312 0.13-0.0649 0.1925-0.0961 2.425 1.4438 3.775 3.0459 3.775 4.7324 0 6.3676-19.24 11.53-42.974 11.53" fill="#aeaeac"/>
   <path id="path5865" d="m319.89 911.52c-23.556 0-42.652-5.124-42.652-11.444 0-1.6499 1.3025-3.2202 3.6462-4.6362 0.0662 0.0312 0.12875 0.0625 0.195 0.0947-2.265 1.3916-3.5212 2.9262-3.5212 4.5415 0 6.2725 18.952 11.357 42.332 11.357 23.379 0 42.331-5.0849 42.331-11.357 0-1.6152-1.255-3.1499-3.52-4.5415 0.0663-0.0322 0.12875-0.0635 0.195-0.0947 2.3438 1.4175 3.6462 2.9864 3.6462 4.6362 0 6.3199-19.096 11.444-42.652 11.444" fill="#adacab"/>
   <path id="path5867" d="m319.89 911.44c-23.38 0-42.332-5.0849-42.332-11.357 0-1.6152 1.2562-3.1499 3.5212-4.5415 0.065 0.0317 0.13 0.064 0.195 0.0952-2.185 1.3652-3.395 2.8676-3.395 4.4462 0 6.2251 18.809 11.271 42.011 11.271 23.201 0 42.011-5.0464 42.011-11.271 0-1.5786-1.21-3.081-3.395-4.4462 0.065-0.0312 0.13-0.0635 0.195-0.0952 2.265 1.3916 3.52 2.9262 3.52 4.5415 0 6.2725-18.952 11.357-42.331 11.357" fill="#acabaa"/>
   <path id="path5869" d="m319.89 911.35c-23.202 0-42.011-5.0464-42.011-11.271 0-1.5786 1.21-3.081 3.395-4.4462 0.065 0.0326 0.13125 0.0639 0.1975 0.0961-2.1075 1.3374-3.2712 2.8076-3.2712 4.3501 0 6.1772 18.665 11.185 41.69 11.185s41.69-5.0078 41.69-11.185c0-1.5425-1.1638-3.0128-3.2712-4.3501 0.0662-0.0322 0.1325-0.0635 0.1975-0.0961 2.185 1.3652 3.395 2.8676 3.395 4.4462 0 6.2251-18.81 11.271-42.011 11.271" fill="#aaaaa9"/>
   <path id="path5871" d="m319.89 911.27c-23.025 0-41.69-5.0078-41.69-11.185 0-1.5425 1.1638-3.0128 3.2712-4.3501 0.065 0.0312 0.1325 0.064 0.1975 0.0953-2.0288 1.311-3.1488 2.7475-3.1488 4.2549 0 6.1299 18.522 11.099 41.37 11.099s41.37-4.9688 41.37-11.099c0-1.5074-1.12-2.9439-3.1488-4.2549 0.065-0.0312 0.1325-0.064 0.1975-0.0953 2.1075 1.3374 3.2712 2.8076 3.2712 4.3501 0 6.1772-18.665 11.185-41.69 11.185" fill="#a9a9a8"/>
   <path id="path5873" d="m319.89 911.18c-22.848 0-41.37-4.9688-41.37-11.099 0-1.5074 1.12-2.9439 3.1488-4.2549 0.0688 0.0322 0.1325 0.0635 0.2 0.0961-1.9512 1.2822-3.0275 2.6875-3.0275 4.1588 0 6.0825 18.378 11.014 41.049 11.014 22.67 0 41.049-4.9311 41.049-11.014 0-1.4712-1.0762-2.875-3.0275-4.1588 0.0675-0.0326 0.13125-0.0639 0.2-0.0961 2.0288 1.311 3.1488 2.7475 3.1488 4.2549 0 6.1299-18.522 11.099-41.37 11.099" fill="#a8a8a7"/>
   <path id="path5875" d="m319.89 911.09c-22.671 0-41.049-4.9311-41.049-11.014 0-1.4712 1.0762-2.8765 3.0275-4.1588 0.0663 0.0312 0.1375 0.065 0.2025 0.0963-1.875 1.2549-2.9062 2.625-2.9062 4.0586 0 6.0415 18.236 10.935 40.725 10.935s40.725-4.8935 40.725-10.935c0-1.4336-1.0312-2.8038-2.9062-4.0586 0.0662-0.0312 0.13625-0.065 0.2025-0.0963 1.9512 1.2838 3.0275 2.6875 3.0275 4.1588 0 6.0825-18.379 11.014-41.049 11.014" fill="#a7a6a5"/>
   <path id="path5877" d="m326.62 900.08c0 0.9975-3.0125 1.8051-6.7275 1.8051s-6.7275-0.80762-6.7275-1.8051c0-0.99612 3.0125-1.8051 6.7275-1.8051s6.7275 0.809 6.7275 1.8051" fill="#100f0d"/>
  </g>
  <g id="g5961" transform="matrix(.125 0 0 -.125 -497.7 923.83)">
   <g id="g5963" clip-path="url(#clipPath5965)">
    <path id="path5977" d="m6768.9 1326.8c0-105.26-86.13-191.39-191.39-191.39h-73.44c-105.26 0-191.39 86.13-191.39 191.39v4335.2c0 105.26 86.13 191.38 191.39 191.38h73.44c105.26 0 191.39-86.12 191.39-191.38v-4335.2" fill="url(#linearGradient5969)"/>
   </g>
  </g>
  <g id="g5979" transform="matrix(.125 0 0 -.125 -497.7 923.83)">
   <g id="g5981" clip-path="url(#clipPath5983)">
    <path id="path5993" d="m6312.6 1400.7v4261.2c0 105.26 86.13 191.38 191.39 191.38h73.44c105.26 0 191.39-86.12 191.39-191.38v-4261.2c-70.08 29.76-147.18 46.22-228.11 46.22s-158.03-16.46-228.11-46.22m105.23 4344c-30.47 0-55.16-24.7-55.16-55.16v-4102.7c0-30.47 24.69-55.16 55.16-55.16 30.46 0 55.16 24.69 55.16 55.16v4102.7c0 30.46-24.7 55.16-55.16 55.16" fill="url(#linearGradient5987)"/>
   </g>
  </g>
  <g id="g5995" transform="matrix(.125 0 0 -.125 -497.7 923.83)">
   <g id="g5997" clip-path="url(#clipPath5999)">
    <path id="path6009" d="m7124.9 862.75c0-322.64-261.55-584.18-584.18-584.18s-584.18 261.54-584.18 584.18c0 322.63 261.55 584.18 584.18 584.18s584.18-261.55 584.18-584.18" fill="url(#radialGradient6035)"/>
   </g>
  </g>
  <g id="g6011" transform="matrix(.125 0 0 -.125 -497.7 923.83)">
   <g id="g6013" clip-path="url(#clipPath6015)">
    <path id="path6025" d="m6883.2 1171.8v2.47c0.01-0.41 0.01-0.82 0.01-1.23s0-0.83-0.01-1.24" fill="url(#radialGradient6035)"/>
   </g>
  </g>
  <g id="g6027" transform="matrix(.125 0 0 -.125 -497.7 923.83)">
   <g id="g6029" clip-path="url(#clipPath6031)">
    <path id="path6041" d="m6766.8 1009.9c71.38 39.79 116.42 98.12 116.42 163.12v-1.24c-0.56-64.5-45.49-122.34-116.42-161.88m116.42 163.12c0 38.88-16.12 75.38-44.35 106.94 27.94-31.23 44.02-67.29 44.35-105.71v-1.23" fill="url(#radialGradient6035)"/>
   </g>
  </g>
  <g id="g6043" transform="matrix(.125 0 0 -.125 -497.7 923.83)">
   <g id="g6045" clip-path="url(#clipPath6047)">
    <g id="g6051" transform="matrix(701.2,0,0,453.2,6191.9,945.9)">
     <image id="image6053" xlink:href="data:image/png;base64,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" transform="matrix(1,0,0,-1,0,1)" height="1" width="1" preserveAspectRatio="none"/>
    </g>
   </g>
  </g>
  <path id="path6055" d="m324.48 176.67h-9.18c-21.738 0-39.422 17.685-39.422 39.422v523.07c-27.341 15.644-44.509 44.775-44.509 76.826 0 48.811 39.71 88.522 88.521 88.522s88.522-39.712 88.522-88.522c0-32.052-17.169-61.182-44.509-76.826v-523.07c0-21.738-17.686-39.422-39.424-39.422m0 15.5c13.158 0 23.924 10.765 23.924 23.922v532.65c26.16 11.106 44.509 37.031 44.509 67.242 0 40.33-32.694 73.022-73.022 73.022-40.329 0-73.022-32.692-73.022-73.022 0-30.211 18.349-56.136 44.509-67.242v-532.65c0-13.158 10.766-23.922 23.924-23.922h9.18" fill="#100f0d"/>
  <g id="g6057" transform="matrix(.125 0 0 -.125 -497.7 923.83)">
   <g id="g6059" clip-path="url(#clipPath6061)">
    <path id="path6075" d="m6577.5 5941.9h-73.44c-154.37 0-279.96-125.59-279.96-279.96v-4205.5c-218.1-116.2-356.1-343.2-356.1-593.65 0-370.96 301.8-672.75 672.8-672.75 370.96 0 672.75 301.79 672.75 672.75 0 250.48-137.96 477.48-356.07 593.7v4205.5c0 154.37-125.59 279.96-279.96 279.96m0-88.58c105.26 0 191.39-86.12 191.39-191.38v-4261.2c209.28-88.85 356.07-296.25 356.07-537.94 0-322.63-261.55-584.18-584.18-584.18s-584.18 261.55-584.18 584.18c0 241.69 146.79 449.09 356.07 537.94v4261.2c0 105.26 86.13 191.38 191.39 191.38h73.44" fill="url(#linearGradient6065)"/>
   </g>
  </g>
  <g id="g6077" transform="matrix(.125 0 0 -.125 -497.7 923.83)">
   <g id="g6079" clip-path="url(#clipPath6081)">
    <path id="path6091" d="m6417.9 1531.7c-30.47 0-55.16 24.69-55.16 55.16v4102.7c0 30.46 24.69 55.16 55.16 55.16 30.46 0 55.16-24.7 55.16-55.16v-4102.7c0-30.47-24.7-55.16-55.16-55.16" fill="url(#linearGradient6085)"/>
   </g>
  </g>
  <g id="g6129" transform="matrix(.125 0 0 -.125 -497.7 923.83)">
   <g id="g6131" clip-path="url(#clipPath6133)">
    <g id="g6137" transform="matrix(661.2,0,0,184.2,6210.9,98.9)">
     <image id="image6139" xlink:href="data:image/png;base64,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" transform="matrix(1,0,0,-1,0,1)" height="1" width="1" preserveAspectRatio="none"/>
    </g>
   </g>
  </g>
 </g>
</svg>
\"],\"markerImageFunction\":\"var res = {\\n url: images[0],\\n size: 40\\n}\\nvar temperature = data[''temperature''];\\nif (typeof temperature !== undefined) {\\n var percent = (temperature + 60)/120;\\n var index = Math.floor(4 * percent);\\n res.url = images[index];\\n}\\nreturn res;\"}],\"fitMapBounds\":true},\"title\":\"OpenStreetMap\"}"}', 'OpenStreetMap' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( '191d156a-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'analogue_gauges', 'speed_gauge_canvas_gauges', '{"type":"latest","sizeX":7,"sizeY":5,"resources":[],"templateHtml":"\n","templateCss":"","controllerScript":"self.onInit = function() {\n self.ctx.gauge = new TbAnalogueRadialGauge(self.ctx, ''radialGauge''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.gauge.update();\n}\n\nself.onResize = function() {\n self.ctx.gauge.resize();\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.gauge.mobileModeChanged();\n}\n\nself.getSettingsSchema = function() {\n return TbAnalogueRadialGauge.settingsSchema;\n}\n\nself.onDestroy = function() {\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Speed\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 50 - 25;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 220) {\\n\\tvalue = 220;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"maxValue\":180,\"startAngle\":45,\"ticksAngle\":270,\"showBorder\":false,\"defaultColor\":\"#e65100\",\"needleCircleSize\":7,\"highlights\":[{\"from\":80,\"to\":120,\"color\":\"#fdd835\"},{\"color\":\"#e57373\",\"from\":120,\"to\":180}],\"showUnitTitle\":false,\"colorPlate\":\"#fff\",\"colorMajorTicks\":\"#444\",\"colorMinorTicks\":\"#666\",\"minorTicks\":2,\"valueInt\":3,\"minValue\":0,\"valueDec\":0,\"highlightsWidth\":15,\"valueBox\":true,\"animation\":true,\"animationDuration\":1500,\"animationRule\":\"linear\",\"colorNeedleShadowUp\":\"rgba(2, 255, 255, 0)\",\"colorNeedleShadowDown\":\"rgba(188, 143, 143, 0.78)\",\"units\":\"MPH\",\"majorTicksCount\":9,\"numbersFont\":{\"family\":\"Roboto\",\"size\":22,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#616161\"},\"titleFont\":{\"family\":\"Roboto\",\"size\":24,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#888\"},\"unitsFont\":{\"family\":\"Roboto\",\"size\":28,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#616161\"},\"valueFont\":{\"size\":32,\"style\":\"normal\",\"weight\":\"normal\",\"shadowColor\":\"rgba(0, 0, 0, 0.49)\",\"color\":\"#444\",\"family\":\"Segment7Standard\"},\"colorValueBoxRect\":\"#888\",\"colorValueBoxRectEnd\":\"#666\",\"colorValueBoxBackground\":\"#babab2\",\"colorValueBoxShadow\":\"rgba(0,0,0,1)\"},\"title\":\"Speed gauge - Canvas Gauges\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'Speed gauge - Canvas Gauges' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( '1c58d1ec-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'pie', '{"type":"latest","sizeX":8,"sizeY":5,"resources":[],"templateHtml":"","templateCss":".legend {\n font-size: 13px;\n line-height: 10px;\n}\n\n.legend table { \n border-spacing: 0px;\n border-collapse: separate;\n}\n\n.pie-label {\n font-size: 12px;\n font-family: ''Roboto'';\n font-weight: bold;\n text-align: center;\n padding: 2px;\n color: white;\n}\n","controllerScript":"self.onInit = function() {\n self.ctx.flot = new TbFlot(self.ctx, ''pie''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.flot.update();\n}\n\nself.onResize = function() {\n self.ctx.flot.resize();\n}\n\nself.onEditModeChanged = function() {\n self.ctx.flot.checkMouseEvents();\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.flot.checkMouseEvents();\n}\n\nself.getSettingsSchema = function() {\n return TbFlot.pieSettingsSchema;\n}\n\nself.getDataKeySettingsSchema = function() {\n return TbFlot.pieDatakeySettingsSchema;\n}\n\nself.onDestroy = function() {\n self.ctx.flot.destroy();\n}\n","settingsSchema":"{}\n","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.6114638304362894,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.9955906536344441,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.9430835931647599,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"radius\":1,\"fontColor\":\"#545454\",\"fontSize\":10,\"decimals\":1,\"legend\":{\"show\":true,\"position\":\"nw\",\"labelBoxBorderColor\":\"#CCCCCC\",\"backgroundColor\":\"#F0F0F0\",\"backgroundOpacity\":0.85},\"innerRadius\":0,\"showLabels\":true,\"stroke\":{\"width\":5},\"tilt\":1,\"animatedPie\":false},\"title\":\"Pie - Flot\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400}}"}', 'Pie - Flot' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( '1f712b86-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'timeseries_bars_flot', '{"type":"timeseries","sizeX":8,"sizeY":5,"resources":[],"templateHtml":"","templateCss":".legend {\n font-size: 13px;\n line-height: 10px;\n}\n\n.legend table { \n border-spacing: 0px;\n border-collapse: separate;\n}\n\n.mouse-events .flot-overlay {\n cursor: crosshair; \n}\n\n","controllerScript":"self.onInit = function() {\n self.ctx.flot = new TbFlot(self.ctx, ''bar''); \n}\n\nself.onDataUpdated = function() {\n self.ctx.flot.update();\n}\n\nself.onResize = function() {\n self.ctx.flot.resize();\n}\n\nself.onEditModeChanged = function() {\n self.ctx.flot.checkMouseEvents();\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.flot.checkMouseEvents();\n}\n\nself.getSettingsSchema = function() {\n return TbFlot.settingsSchema;\n}\n\nself.getDataKeySettingsSchema = function() {\n return TbFlot.datakeySettingsSchema(false);\n}\n\nself.onDestroy = function() {\n self.ctx.flot.destroy();\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{\"showLines\":false,\"fillLines\":false,\"showPoints\":false},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#ffc107\",\"settings\":{\"showLines\":false,\"fillLines\":false,\"showPoints\":false},\"_hash\":0.12775350966079668,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000},\"aggregation\":{\"limit\":200,\"type\":\"AVG\"}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"shadowSize\":4,\"fontColor\":\"#545454\",\"fontSize\":10,\"xaxis\":{\"showLabels\":true,\"color\":\"#545454\"},\"yaxis\":{\"showLabels\":true,\"color\":\"#545454\"},\"grid\":{\"color\":\"#545454\",\"tickColor\":\"#DDDDDD\",\"verticalLines\":true,\"horizontalLines\":true,\"outlineWidth\":1},\"legend\":{\"show\":true,\"position\":\"nw\",\"backgroundColor\":\"#f0f0f0\",\"backgroundOpacity\":0.85,\"labelBoxBorderColor\":\"rgba(1, 1, 1, 0.45)\"},\"decimals\":1,\"stack\":true,\"tooltipIndividual\":false},\"title\":\"Timeseries Bars - Flot\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"mobileHeight\":null}"}', 'Timeseries Bars - Flot' ); -INSERT INTO public.widget_type ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" ) +INSERT INTO widget_type ( id, tenant_id, bundle_alias, alias, descriptor, name ) VALUES ( '229fb296-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'charts', 'basic_timeseries', '{"type":"timeseries","sizeX":8,"sizeY":5,"resources":[],"templateHtml":"","templateCss":".legend {\n font-size: 13px;\n line-height: 10px;\n}\n\n.legend table { \n border-spacing: 0px;\n border-collapse: separate;\n}\n\n.mouse-events .flot-overlay {\n cursor: crosshair; \n}\n\n","controllerScript":"self.onInit = function() {\n self.ctx.flot = new TbFlot(self.ctx); \n}\n\nself.onDataUpdated = function() {\n self.ctx.flot.update();\n}\n\nself.onResize = function() {\n self.ctx.flot.resize();\n}\n\nself.onEditModeChanged = function() {\n self.ctx.flot.checkMouseEvents();\n}\n\nself.onMobileModeChanged = function() {\n self.ctx.flot.checkMouseEvents();\n}\n\nself.getSettingsSchema = function() {\n return TbFlot.settingsSchema;\n}\n\nself.getDataKeySettingsSchema = function() {\n return TbFlot.datakeySettingsSchema(true);\n}\n\nself.onDestroy = function() {\n self.ctx.flot.destroy();\n}\n","settingsSchema":"{}","dataKeySettingsSchema":"{}","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{\"showLines\":true,\"fillLines\":true,\"showPoints\":false},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#ffc107\",\"settings\":{\"showLines\":true,\"fillLines\":false,\"showPoints\":false},\"_hash\":0.12775350966079668,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"shadowSize\":4,\"fontColor\":\"#545454\",\"fontSize\":10,\"xaxis\":{\"showLabels\":true,\"color\":\"#545454\"},\"yaxis\":{\"showLabels\":true,\"color\":\"#545454\"},\"grid\":{\"color\":\"#545454\",\"tickColor\":\"#DDDDDD\",\"verticalLines\":true,\"horizontalLines\":true,\"outlineWidth\":1},\"legend\":{\"show\":true,\"position\":\"nw\",\"backgroundColor\":\"#f0f0f0\",\"backgroundOpacity\":0.85,\"labelBoxBorderColor\":\"rgba(1, 1, 1, 0.45)\"},\"decimals\":1,\"stack\":false,\"tooltipIndividual\":false},\"title\":\"Timeseries - Flot\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"mobileHeight\":null}"}', 'Timeseries - Flot' ); /** System plugins and rules **/ -INSERT INTO public.plugin ( id, tenant_id, name, state, search_text, api_token, plugin_class, public_access, configuration ) +INSERT INTO plugin ( id, tenant_id, name, state, search_text, api_token, plugin_class, public_access, configuration ) VALUES ( '60cb2da2-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'System Telemetry Plugin', 'ACTIVE', 'system telemetry plugin', 'telemetry', 'org.thingsboard.server.extensions.core.plugin.telemetry.TelemetryStoragePlugin', true, '{}' ); -INSERT INTO public.rule ( id, tenant_id, name, plugin_token, state, search_text, weight, filters, processor, action ) +INSERT INTO rule ( id, tenant_id, name, plugin_token, state, search_text, weight, filters, processor, action ) VALUES ( '65abad4c-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'System Telemetry Rule', 'telemetry', 'ACTIVE', 'system telemetry rule', 0, '[{"clazz":"org.thingsboard.server.extensions.core.filter.MsgTypeFilter", "name":"TelemetryFilter", "configuration": {"messageTypes":["POST_TELEMETRY","POST_ATTRIBUTES","GET_ATTRIBUTES"]}}]', @@ -293,7 +293,7 @@ VALUES ( '65abad4c-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080 '{"clazz":"org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction", "name":"TelemetryMsgConverterAction", "configuration":{}}' ); -INSERT INTO public.plugin ( id, tenant_id, name, state, search_text, api_token, plugin_class, public_access, configuration ) +INSERT INTO plugin ( id, tenant_id, name, state, search_text, api_token, plugin_class, public_access, configuration ) VALUES ( '6b3b8994-4611-11e7-a919-92ebcb67fe33', '13814000-1dd2-11b2-8080-808080808080', 'System RPC Plugin', 'ACTIVE', 'system rpc plugin', 'rpc', 'org.thingsboard.server.extensions.core.plugin.rpc.RpcPlugin', true, '{ "defaultTimeout": 20000 diff --git a/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java index daf59f319f..20fae72a3a 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java @@ -22,14 +22,14 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; import org.springframework.test.context.support.DirtiesContextTestExecutionListener; /** * Created by Valerii Sosliuk on 4/22/2017. */ -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @ContextConfiguration(classes = {JpaDaoConfig.class, JpaDbunitTestConfig.class}) @TestPropertySource("classpath:jpa-test.properties") @TestExecutionListeners({ diff --git a/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java index 7c0291cf56..bd1eb756c5 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java @@ -25,8 +25,6 @@ import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.plugin.PluginMetaData; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.service.AbstractServiceTest; -import org.junit.Assert; -import org.junit.Test; import java.util.UUID; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java index a73ee52424..9c230448bf 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java @@ -27,7 +27,7 @@ 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.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; import org.thingsboard.server.common.data.BaseData; import org.thingsboard.server.common.data.Event; @@ -62,7 +62,8 @@ import java.util.Comparator; import java.util.UUID; import java.util.concurrent.ThreadLocalRandom; -@RunWith(SpringJUnit4ClassRunner.class) + +@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) diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/UserServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/UserServiceImplTest.java index b12dac58c7..d52813f4b9 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/UserServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/UserServiceImplTest.java @@ -15,13 +15,11 @@ */ package org.thingsboard.server.dao.service; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.apache.commons.lang3.RandomStringUtils; import org.junit.After; +import org.junit.Assert; import org.junit.Before; +import org.junit.Test; import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.User; @@ -32,11 +30,13 @@ import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.common.data.security.UserCredentials; import org.thingsboard.server.dao.exception.DataValidationException; -import org.junit.Assert; -import org.junit.Test; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; public class UserServiceImplTest extends AbstractServiceTest { - + private IdComparator idComparator = new IdComparator<>(); private TenantId tenantId; @@ -96,7 +96,7 @@ public class UserServiceImplTest extends AbstractServiceTest { Assert.assertNotNull(foundUser); Assert.assertEquals(user, foundUser); } - + @Test public void testFindUserCredentials() { User user = userService.findUserByEmail("sysadmin@thingsboard.org"); @@ -104,7 +104,7 @@ public class UserServiceImplTest extends AbstractServiceTest { UserCredentials userCredentials = userService.findUserCredentialsByUserId(user.getId()); Assert.assertNotNull(userCredentials); } - + @Test public void testSaveUser() { User tenantAdminUser = userService.findUserByEmail("tenant@thingsboard.org"); @@ -124,46 +124,46 @@ public class UserServiceImplTest extends AbstractServiceTest { Assert.assertNotNull(userCredentials.getId()); Assert.assertNotNull(userCredentials.getUserId()); Assert.assertNotNull(userCredentials.getActivateToken()); - + savedUser.setFirstName("Joe"); savedUser.setLastName("Downs"); - + userService.saveUser(savedUser); savedUser = userService.findUserById(savedUser.getId()); Assert.assertEquals("Joe", savedUser.getFirstName()); - Assert.assertEquals("Downs", savedUser.getLastName()); - + Assert.assertEquals("Downs", savedUser.getLastName()); + userService.deleteUser(savedUser.getId()); } - + @Test(expected = DataValidationException.class) public void testSaveUserWithSameEmail() { User tenantAdminUser = userService.findUserByEmail("tenant@thingsboard.org"); tenantAdminUser.setEmail("sysadmin@thingsboard.org"); userService.saveUser(tenantAdminUser); } - + @Test(expected = DataValidationException.class) public void testSaveUserWithInvalidEmail() { User tenantAdminUser = userService.findUserByEmail("tenant@thingsboard.org"); tenantAdminUser.setEmail("tenant_thingsboard.org"); userService.saveUser(tenantAdminUser); } - + @Test(expected = DataValidationException.class) public void testSaveUserWithEmptyEmail() { User tenantAdminUser = userService.findUserByEmail("tenant@thingsboard.org"); tenantAdminUser.setEmail(null); userService.saveUser(tenantAdminUser); } - + @Test(expected = DataValidationException.class) public void testSaveUserWithoutTenant() { User tenantAdminUser = userService.findUserByEmail("tenant@thingsboard.org"); tenantAdminUser.setTenantId(null); userService.saveUser(tenantAdminUser); } - + @Test public void testDeleteUser() { User tenantAdminUser = userService.findUserByEmail("tenant@thingsboard.org"); @@ -184,7 +184,7 @@ public class UserServiceImplTest extends AbstractServiceTest { Assert.assertNull(foundUser); Assert.assertNull(userCredentials); } - + @Test public void testFindTenantAdmins() { User tenantAdminUser = userService.findUserByEmail("tenant@thingsboard.org"); @@ -193,22 +193,22 @@ public class UserServiceImplTest extends AbstractServiceTest { List users = pageData.getData(); Assert.assertEquals(1, users.size()); Assert.assertEquals(tenantAdminUser, users.get(0)); - + Tenant tenant = new Tenant(); tenant.setTitle("Test tenant"); tenant = tenantService.saveTenant(tenant); - + TenantId tenantId = tenant.getId(); - + List tenantAdmins = new ArrayList<>(); - for (int i=0;i<124;i++) { + for (int i = 0; i < 124; i++) { User user = new User(); user.setAuthority(Authority.TENANT_ADMIN); user.setTenantId(tenantId); user.setEmail("testTenant" + i + "@thingsboard.org"); tenantAdmins.add(userService.saveUser(user)); } - + List loadedTenantAdmins = new ArrayList<>(); TextPageLink pageLink = new TextPageLink(33); do { @@ -218,57 +218,57 @@ public class UserServiceImplTest extends AbstractServiceTest { pageLink = pageData.getNextPageLink(); } } while (pageData.hasNext()); - + Collections.sort(tenantAdmins, idComparator); Collections.sort(loadedTenantAdmins, idComparator); - + Assert.assertEquals(tenantAdmins, loadedTenantAdmins); - + tenantService.deleteTenant(tenantId); - + pageLink = new TextPageLink(33); pageData = userService.findTenantAdmins(tenantId, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertTrue(pageData.getData().isEmpty()); - + } - + @Test public void testFindTenantAdminsByEmail() { Tenant tenant = new Tenant(); tenant.setTitle("Test tenant"); tenant = tenantService.saveTenant(tenant); - + TenantId tenantId = tenant.getId(); - - String email1 = "testEmail1"; + + String email1 = "testEmail1"; List tenantAdminsEmail1 = new ArrayList<>(); - - for (int i=0;i<94;i++) { + + for (int i = 0; i < 94; i++) { User user = new User(); user.setAuthority(Authority.TENANT_ADMIN); user.setTenantId(tenantId); - String suffix = RandomStringUtils.randomAlphanumeric((int)(5 + Math.random()*10)); - String email = email1+suffix+ "@thingsboard.org"; + String suffix = RandomStringUtils.randomAlphanumeric((int) (5 + Math.random() * 10)); + String email = email1 + suffix + "@thingsboard.org"; email = i % 2 == 0 ? email.toLowerCase() : email.toUpperCase(); user.setEmail(email); tenantAdminsEmail1.add(userService.saveUser(user)); } - - String email2 = "testEmail2"; + + String email2 = "testEmail2"; List tenantAdminsEmail2 = new ArrayList<>(); - - for (int i=0;i<132;i++) { + + for (int i = 0; i < 132; i++) { User user = new User(); user.setAuthority(Authority.TENANT_ADMIN); user.setTenantId(tenantId); - String suffix = RandomStringUtils.randomAlphanumeric((int)(5 + Math.random()*10)); - String email = email2+suffix+ "@thingsboard.org"; + String suffix = RandomStringUtils.randomAlphanumeric((int) (5 + Math.random() * 10)); + String email = email2 + suffix + "@thingsboard.org"; email = i % 2 == 0 ? email.toLowerCase() : email.toUpperCase(); user.setEmail(email); tenantAdminsEmail2.add(userService.saveUser(user)); } - + List loadedTenantAdminsEmail1 = new ArrayList<>(); TextPageLink pageLink = new TextPageLink(33, email1); TextPageData pageData = null; @@ -279,12 +279,12 @@ public class UserServiceImplTest extends AbstractServiceTest { pageLink = pageData.getNextPageLink(); } } while (pageData.hasNext()); - + Collections.sort(tenantAdminsEmail1, idComparator); Collections.sort(loadedTenantAdminsEmail1, idComparator); - + Assert.assertEquals(tenantAdminsEmail1, loadedTenantAdminsEmail1); - + List loadedTenantAdminsEmail2 = new ArrayList<>(); pageLink = new TextPageLink(16, email2); do { @@ -294,33 +294,33 @@ public class UserServiceImplTest extends AbstractServiceTest { pageLink = pageData.getNextPageLink(); } } while (pageData.hasNext()); - + Collections.sort(tenantAdminsEmail2, idComparator); Collections.sort(loadedTenantAdminsEmail2, idComparator); - + Assert.assertEquals(tenantAdminsEmail2, loadedTenantAdminsEmail2); - + for (User user : loadedTenantAdminsEmail1) { userService.deleteUser(user.getId()); } - + pageLink = new TextPageLink(4, email1); pageData = userService.findTenantAdmins(tenantId, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertEquals(0, pageData.getData().size()); - + for (User user : loadedTenantAdminsEmail2) { userService.deleteUser(user.getId()); } - + pageLink = new TextPageLink(4, email2); pageData = userService.findTenantAdmins(tenantId, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertEquals(0, pageData.getData().size()); - + tenantService.deleteTenant(tenantId); } - + @Test public void testFindCustomerUsers() { User customerUser = userService.findUserByEmail("customer@thingsboard.org"); @@ -330,22 +330,22 @@ public class UserServiceImplTest extends AbstractServiceTest { List users = pageData.getData(); Assert.assertEquals(1, users.size()); Assert.assertEquals(customerUser, users.get(0)); - + Tenant tenant = new Tenant(); tenant.setTitle("Test tenant"); tenant = tenantService.saveTenant(tenant); - + TenantId tenantId = tenant.getId(); - + Customer customer = new Customer(); customer.setTitle("Test customer"); customer.setTenantId(tenantId); customer = customerService.saveCustomer(customer); - + CustomerId customerId = customer.getId(); - + List customerUsers = new ArrayList<>(); - for (int i=0;i<156;i++) { + for (int i = 0; i < 156; i++) { User user = new User(); user.setAuthority(Authority.CUSTOMER_USER); user.setTenantId(tenantId); @@ -353,7 +353,7 @@ public class UserServiceImplTest extends AbstractServiceTest { user.setEmail("testCustomer" + i + "@thingsboard.org"); customerUsers.add(userService.saveUser(user)); } - + List loadedCustomerUsers = new ArrayList<>(); TextPageLink pageLink = new TextPageLink(33); do { @@ -363,65 +363,65 @@ public class UserServiceImplTest extends AbstractServiceTest { pageLink = pageData.getNextPageLink(); } } while (pageData.hasNext()); - + Collections.sort(customerUsers, idComparator); Collections.sort(loadedCustomerUsers, idComparator); - + Assert.assertEquals(customerUsers, loadedCustomerUsers); - + tenantService.deleteTenant(tenantId); - + pageData = userService.findCustomerUsers(tenantId, customerId, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertTrue(pageData.getData().isEmpty()); - + } - + @Test public void testFindCustomerUsersByEmail() { Tenant tenant = new Tenant(); tenant.setTitle("Test tenant"); tenant = tenantService.saveTenant(tenant); - + TenantId tenantId = tenant.getId(); - + Customer customer = new Customer(); customer.setTitle("Test customer"); customer.setTenantId(tenantId); customer = customerService.saveCustomer(customer); - + CustomerId customerId = customer.getId(); - - String email1 = "testEmail1"; + + String email1 = "testEmail1"; List customerUsersEmail1 = new ArrayList<>(); - - for (int i=0;i<124;i++) { + + for (int i = 0; i < 124; i++) { User user = new User(); user.setAuthority(Authority.CUSTOMER_USER); user.setTenantId(tenantId); user.setCustomerId(customerId); - String suffix = RandomStringUtils.randomAlphanumeric((int)(5 + Math.random()*10)); - String email = email1+suffix+ "@thingsboard.org"; + String suffix = RandomStringUtils.randomAlphanumeric((int) (5 + Math.random() * 10)); + String email = email1 + suffix + "@thingsboard.org"; email = i % 2 == 0 ? email.toLowerCase() : email.toUpperCase(); user.setEmail(email); customerUsersEmail1.add(userService.saveUser(user)); } - - String email2 = "testEmail2"; + + String email2 = "testEmail2"; List customerUsersEmail2 = new ArrayList<>(); - - for (int i=0;i<132;i++) { + + for (int i = 0; i < 132; i++) { User user = new User(); user.setAuthority(Authority.CUSTOMER_USER); user.setTenantId(tenantId); user.setCustomerId(customerId); - String suffix = RandomStringUtils.randomAlphanumeric((int)(5 + Math.random()*10)); - String email = email2+suffix+ "@thingsboard.org"; + String suffix = RandomStringUtils.randomAlphanumeric((int) (5 + Math.random() * 10)); + String email = email2 + suffix + "@thingsboard.org"; email = i % 2 == 0 ? email.toLowerCase() : email.toUpperCase(); user.setEmail(email); customerUsersEmail2.add(userService.saveUser(user)); } - + List loadedCustomerUsersEmail1 = new ArrayList<>(); TextPageLink pageLink = new TextPageLink(33, email1); TextPageData pageData = null; @@ -432,12 +432,12 @@ public class UserServiceImplTest extends AbstractServiceTest { pageLink = pageData.getNextPageLink(); } } while (pageData.hasNext()); - + Collections.sort(customerUsersEmail1, idComparator); Collections.sort(loadedCustomerUsersEmail1, idComparator); - + Assert.assertEquals(customerUsersEmail1, loadedCustomerUsersEmail1); - + List loadedCustomerUsersEmail2 = new ArrayList<>(); pageLink = new TextPageLink(16, email2); do { @@ -447,30 +447,30 @@ public class UserServiceImplTest extends AbstractServiceTest { pageLink = pageData.getNextPageLink(); } } while (pageData.hasNext()); - + Collections.sort(customerUsersEmail2, idComparator); Collections.sort(loadedCustomerUsersEmail2, idComparator); - + Assert.assertEquals(customerUsersEmail2, loadedCustomerUsersEmail2); - + for (User user : loadedCustomerUsersEmail1) { userService.deleteUser(user.getId()); } - + pageLink = new TextPageLink(4, email1); pageData = userService.findCustomerUsers(tenantId, customerId, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertEquals(0, pageData.getData().size()); - + for (User user : loadedCustomerUsersEmail2) { userService.deleteUser(user.getId()); } - + pageLink = new TextPageLink(4, email2); pageData = userService.findCustomerUsers(tenantId, customerId, pageLink); Assert.assertFalse(pageData.hasNext()); Assert.assertEquals(0, pageData.getData().size()); - + tenantService.deleteTenant(tenantId); } diff --git a/dao/src/test/resources/application-test.properties b/dao/src/test/resources/application-test.properties index cc41cc7a93..dee5557333 100644 --- a/dao/src/test/resources/application-test.properties +++ b/dao/src/test/resources/application-test.properties @@ -9,4 +9,6 @@ zk.zk_dir=/thingsboard sql.enabled=false -cassandra.enabled=true \ No newline at end of file +cassandra.enabled=true + +updates.enabled=false \ No newline at end of file diff --git a/dao/src/test/resources/jpa-test.properties b/dao/src/test/resources/jpa-test.properties index 54025ab561..06a7296e39 100644 --- a/dao/src/test/resources/jpa-test.properties +++ b/dao/src/test/resources/jpa-test.properties @@ -3,11 +3,10 @@ cassandra.enabled=false sql.enabled=true spring.jpa.show-sql=false -spring.jpa.hibernate.ddl-auto=create-drop - -spring.database.driverClassName=org.postgresql.Driver -spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect -spring.datasource.url=jdbc:postgresql://localhost:5432/thingsboard-test -spring.datasource.username=thingsboard -spring.datasource.password=thingsboard -spring.jpa.generate-ddl=true +spring.jpa.hibernate.ddl-auto=validate + +spring.datasource.driverClassName=org.h2.Driver +spring.datasource.url=jdbc:h2:mem:test;MODE=PostgreSQL +spring.datasource.schema=classpath:postgres/schema.sql +spring.datasource.data=classpath:postgres/system-data.sql;classpath:system-test.sql + diff --git a/extensions/extension-kafka/src/test/java/org/thingsboard/server/extensions/kafka/KafkaDemoClient.java b/extensions/extension-kafka/src/test/java/org/thingsboard/server/extensions/kafka/KafkaDemoClient.java index cd17b7bb10..7d56d540a6 100644 --- a/extensions/extension-kafka/src/test/java/org/thingsboard/server/extensions/kafka/KafkaDemoClient.java +++ b/extensions/extension-kafka/src/test/java/org/thingsboard/server/extensions/kafka/KafkaDemoClient.java @@ -15,6 +15,13 @@ */ package org.thingsboard.server.extensions.kafka; +import kafka.consumer.Consumer; +import kafka.consumer.ConsumerConfig; +import kafka.consumer.ConsumerIterator; +import kafka.consumer.KafkaStream; +import kafka.javaapi.consumer.ConsumerConnector; +import kafka.message.MessageAndMetadata; +import kafka.serializer.StringDecoder; import kafka.server.KafkaConfig; import kafka.server.KafkaServerStartable; import org.apache.zookeeper.server.ServerConfig; @@ -23,8 +30,14 @@ import org.apache.zookeeper.server.quorum.QuorumPeerConfig; import java.io.File; import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Properties; +/** + * Starts build-in ZK and Kafka and prints messages from CONSUMER_TOPIC + */ public class KafkaDemoClient { private static final int ZK_PORT = 2222; @@ -32,17 +45,48 @@ public class KafkaDemoClient { private static final String ZOOKEEPER_CONNECT = HOSTNAME + ":" + ZK_PORT; private static final int KAFKA_PORT = 9092; private static final int BROKER_ID = 1; + private static final String CONSUMER_TOPIC = "test_topic"; public static void main(String[] args) { try { startZkLocal(); startKafkaLocal(); + startConsumer(); } catch (Exception e) { System.out.println("Error running local Kafka broker"); e.printStackTrace(System.out); } } + private static void startConsumer() throws InterruptedException { + ConsumerIterator it = buildConsumer(CONSUMER_TOPIC); + do { + if (it.hasNext()) { + MessageAndMetadata messageAndMetadata = it.next(); + System.out.println(String.format("Kafka message [%s]", messageAndMetadata.message())); + } + Thread.sleep(100); + } while (true); + } + + private static ConsumerIterator buildConsumer(String topic) { + Map topicCountMap = new HashMap<>(); + topicCountMap.put(topic, 1); + ConsumerConfig consumerConfig = new ConsumerConfig(consumerProperties()); + ConsumerConnector consumerConnector = Consumer.createJavaConsumerConnector(consumerConfig); + Map>> consumers = consumerConnector.createMessageStreams(topicCountMap, new StringDecoder(null), new StringDecoder(null)); + KafkaStream stream = consumers.get(topic).get(0); + return stream.iterator(); + } + + private static Properties consumerProperties() { + Properties props = new Properties(); + props.put("zookeeper.connect", ZOOKEEPER_CONNECT); + props.put("group.id", "group1"); + props.put("auto.offset.reset", "smallest"); + return props; + } + private static void startZkLocal() throws Exception { final File zkTmpDir = File.createTempFile("zookeeper", "test"); if (zkTmpDir.delete() && zkTmpDir.mkdir()) { @@ -70,14 +114,18 @@ public class KafkaDemoClient { } } - private static void startKafkaLocal() { - Properties kafkaProperties = new Properties(); - kafkaProperties.setProperty("host.name", HOSTNAME); - kafkaProperties.setProperty("port", String.valueOf(KAFKA_PORT)); - kafkaProperties.setProperty("broker.id", String.valueOf(BROKER_ID)); - kafkaProperties.setProperty("zookeeper.connect", ZOOKEEPER_CONNECT); - KafkaConfig kafkaConfig = new KafkaConfig(kafkaProperties); - KafkaServerStartable kafka = new KafkaServerStartable(kafkaConfig); - kafka.startup(); + private static void startKafkaLocal() throws Exception { + final File kafkaTmpLogsDir = File.createTempFile("zookeeper", "test"); + if (kafkaTmpLogsDir.delete() && kafkaTmpLogsDir.mkdir()) { + Properties kafkaProperties = new Properties(); + kafkaProperties.setProperty("host.name", HOSTNAME); + kafkaProperties.setProperty("port", String.valueOf(KAFKA_PORT)); + kafkaProperties.setProperty("broker.id", String.valueOf(BROKER_ID)); + kafkaProperties.setProperty("zookeeper.connect", ZOOKEEPER_CONNECT); + kafkaProperties.setProperty("log.dirs", kafkaTmpLogsDir.getAbsolutePath()); + KafkaConfig kafkaConfig = new KafkaConfig(kafkaProperties); + KafkaServerStartable kafka = new KafkaServerStartable(kafkaConfig); + kafka.startup(); + } } } \ No newline at end of file diff --git a/extensions/extension-kafka/src/test/resources/logback.xml b/extensions/extension-kafka/src/test/resources/logback.xml new file mode 100644 index 0000000000..815e833ab4 --- /dev/null +++ b/extensions/extension-kafka/src/test/resources/logback.xml @@ -0,0 +1,10 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + \ No newline at end of file diff --git a/tools/test.properties b/tools/test.properties deleted file mode 100644 index 93efc60698..0000000000 --- a/tools/test.properties +++ /dev/null @@ -1,3 +0,0 @@ -deviceCount=1000 -durationMs=5000 -iterationIntervalMs=250 diff --git a/transport/coap/src/test/java/org/thingsboard/server/transport/coap/CoapServerTest.java b/transport/coap/src/test/java/org/thingsboard/server/transport/coap/CoapServerTest.java index 56958ba812..706af80ec9 100644 --- a/transport/coap/src/test/java/org/thingsboard/server/transport/coap/CoapServerTest.java +++ b/transport/coap/src/test/java/org/thingsboard/server/transport/coap/CoapServerTest.java @@ -20,6 +20,16 @@ import org.eclipse.californium.core.CoapClient; import org.eclipse.californium.core.CoapResponse; import org.eclipse.californium.core.coap.CoAP.ResponseCode; import org.eclipse.californium.core.coap.MediaTypeRegistry; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.annotation.DirtiesContext.ClassMode; +import org.springframework.test.context.junit4.SpringRunner; import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DeviceId; @@ -37,21 +47,7 @@ import org.thingsboard.server.common.msg.core.BasicRequest; import org.thingsboard.server.common.msg.core.BasicStatusCodeResponse; import org.thingsboard.server.common.msg.kv.BasicAttributeKVMsg; import org.thingsboard.server.common.msg.session.*; -import org.thingsboard.server.common.msg.session.ex.SessionAuthException; import org.thingsboard.server.common.transport.SessionMsgProcessor; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.thingsboard.server.common.transport.auth.DeviceAuthResult; import org.thingsboard.server.common.transport.auth.DeviceAuthService; @@ -60,8 +56,7 @@ import java.util.List; import java.util.Optional; import java.util.UUID; -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration +@RunWith(SpringRunner.class) @DirtiesContext(classMode = ClassMode.BEFORE_CLASS) @Slf4j public class CoapServerTest { @@ -70,7 +65,6 @@ public class CoapServerTest { private static final String TELEMETRY_POST_MESSAGE = "[{\"key1\":\"value1\"}]"; private static final String TEST_ATTRIBUTES_RESPONSE = "{\"key1\":\"value1\",\"key2\":42}"; private static final String DEVICE1_TOKEN = "Device1Token"; - private static final String DEVICE2_TOKEN = "Device2Token"; @Configuration public static class EchoCoapServerITConfiguration extends CoapServerTestConfiguration { From 73d6eee4fca323d381e6da910a9c1bc3ff4e3923 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Fri, 16 Jun 2017 12:43:12 +0300 Subject: [PATCH 55/69] Moved ConditionalProperty for sql and nosql dao to new annotations --- .../org/thingsboard/server/dao/JpaDaoConfig.java | 5 ++--- .../thingsboard/server/dao/NoSqlDaoConfig.java | 4 ++-- .../server/dao/alarm/CassandraAlarmDao.java | 4 ++-- .../server/dao/annotation/NoSqlDao.java | 7 +++++++ .../thingsboard/server/dao/annotation/SqlDao.java | 7 +++++++ .../server/dao/asset/CassandraAssetDao.java | 4 ++-- .../attributes/CassandraBaseAttributesDao.java | 4 ++-- .../server/dao/cassandra/CassandraCluster.java | 4 ++-- .../CassandraBaseComponentDescriptorDao.java | 6 +++--- .../server/dao/customer/CassandraCustomerDao.java | 15 ++++++--------- .../dao/dashboard/CassandraDashboardDao.java | 4 ++-- .../dao/dashboard/CassandraDashboardInfoDao.java | 4 ++-- .../dao/device/CassandraDeviceCredentialsDao.java | 6 +++--- .../server/dao/device/CassandraDeviceDao.java | 4 ++-- .../server/dao/event/CassandraBaseEventDao.java | 6 +++--- .../server/dao/plugin/CassandraBasePluginDao.java | 4 ++-- .../server/dao/relation/BaseRelationDao.java | 7 ++----- .../server/dao/rule/CassandraBaseRuleDao.java | 4 ++-- .../dao/settings/CassandraAdminSettingsDao.java | 4 ++-- .../server/dao/sql/alarm/AlarmRepository.java | 4 ++-- .../server/dao/sql/alarm/JpaAlarmDao.java | 4 ++-- .../server/dao/sql/asset/AssetRepository.java | 4 ++-- .../server/dao/sql/asset/JpaAssetDao.java | 4 ++-- .../dao/sql/attributes/AttributeKvRepository.java | 4 ++-- .../dao/sql/attributes/JpaAttributeDao.java | 4 ++-- .../component/ComponentDescriptorRepository.java | 4 ++-- .../component/JpaBaseComponentDescriptorDao.java | 4 ++-- .../dao/sql/customer/CustomerRepository.java | 4 ++-- .../server/dao/sql/customer/JpaCustomerDao.java | 4 ++-- .../sql/dashboard/DashboardInfoRepository.java | 4 ++-- .../dao/sql/dashboard/DashboardRepository.java | 4 ++-- .../server/dao/sql/dashboard/JpaDashboardDao.java | 6 ++---- .../dao/sql/dashboard/JpaDashboardInfoDao.java | 4 ++-- .../sql/device/DeviceCredentialsRepository.java | 5 ++--- .../server/dao/sql/device/DeviceRepository.java | 4 ++-- .../dao/sql/device/JpaDeviceCredentialsDao.java | 5 ++--- .../server/dao/sql/device/JpaDeviceDao.java | 4 ++-- .../server/dao/sql/event/EventRepository.java | 4 ++-- .../server/dao/sql/event/JpaBaseEventDao.java | 4 ++-- .../server/dao/sql/plugin/JpaBasePluginDao.java | 4 ++-- .../dao/sql/plugin/PluginMetaDataRepository.java | 4 ++-- .../server/dao/sql/relation/JpaRelationDao.java | 4 ++-- .../dao/sql/relation/RelationRepository.java | 4 ++-- .../server/dao/sql/rule/JpaBaseRuleDao.java | 4 ++-- .../dao/sql/rule/RuleMetaDataRepository.java | 4 ++-- .../dao/sql/settings/JpaAdminSettingsDao.java | 4 ++-- .../server/dao/sql/tenant/JpaTenantDao.java | 4 ++-- .../server/dao/sql/tenant/TenantRepository.java | 4 ++-- .../dao/sql/timeseries/JpaTimeseriesDao.java | 4 ++-- .../dao/sql/timeseries/TsKvLatestRepository.java | 4 ++-- .../server/dao/sql/timeseries/TsKvRepository.java | 4 ++-- .../server/dao/sql/user/JpaUserDao.java | 4 ++-- .../server/dao/sql/user/UserRepository.java | 4 ++-- .../server/dao/sql/widget/JpaWidgetTypeDao.java | 6 ++---- .../dao/sql/widget/JpaWidgetsBundleDao.java | 4 ++-- .../dao/sql/widget/WidgetTypeRepository.java | 5 ++--- .../dao/sql/widget/WidgetsBundleRepository.java | 4 ++-- .../server/dao/tenant/CassandraTenantDao.java | 4 ++-- .../timeseries/CassandraBaseTimeseriesDao.java | 4 ++-- .../dao/user/CassandraUserCredentialsDao.java | 3 ++- .../server/dao/user/CassandraUserDao.java | 4 ++-- .../server/dao/widget/CassandraWidgetTypeDao.java | 4 ++-- .../dao/widget/CassandraWidgetsBundleDao.java | 4 ++-- .../server/dao/JpaDbunitTestConfig.java | 4 ++-- 64 files changed, 145 insertions(+), 144 deletions(-) create mode 100644 dao/src/main/java/org/thingsboard/server/dao/annotation/NoSqlDao.java create mode 100644 dao/src/main/java/org/thingsboard/server/dao/annotation/SqlDao.java diff --git a/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java b/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java index 89f02c7545..7c791cf2ec 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java +++ b/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java @@ -16,13 +16,12 @@ package org.thingsboard.server.dao; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; 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; /** * @author Valerii Sosliuk @@ -33,7 +32,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @EnableJpaRepositories("org.thingsboard.server.dao.sql") @EntityScan("org.thingsboard.server.dao.model.sql") @EnableTransactionManagement -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") +@SqlDao public class JpaDaoConfig { } diff --git a/dao/src/main/java/org/thingsboard/server/dao/NoSqlDaoConfig.java b/dao/src/main/java/org/thingsboard/server/dao/NoSqlDaoConfig.java index 76cc66b5d6..234ae882dd 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/NoSqlDaoConfig.java +++ b/dao/src/main/java/org/thingsboard/server/dao/NoSqlDaoConfig.java @@ -16,11 +16,11 @@ package org.thingsboard.server.dao; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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; @Configuration @EnableAutoConfiguration( @@ -28,6 +28,6 @@ import org.springframework.context.annotation.Configuration; DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class, HibernateJpaAutoConfiguration.class}) -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true") +@NoSqlDao public class NoSqlDaoConfig { } 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 f437751655..d15f38a9c8 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 @@ -23,7 +23,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.alarm.Alarm; @@ -35,6 +34,7 @@ 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.model.ModelConstants; import org.thingsboard.server.dao.model.nosql.AlarmEntity; import org.thingsboard.server.dao.relation.RelationDao; @@ -49,7 +49,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@NoSqlDao public class CassandraAlarmDao extends CassandraAbstractModelDao implements AlarmDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/annotation/NoSqlDao.java b/dao/src/main/java/org/thingsboard/server/dao/annotation/NoSqlDao.java new file mode 100644 index 0000000000..f4ec83bbf8 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/annotation/NoSqlDao.java @@ -0,0 +1,7 @@ +package org.thingsboard.server.dao.annotation; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; + +@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true") +public @interface NoSqlDao { +} diff --git a/dao/src/main/java/org/thingsboard/server/dao/annotation/SqlDao.java b/dao/src/main/java/org/thingsboard/server/dao/annotation/SqlDao.java new file mode 100644 index 0000000000..e5a11b17a3 --- /dev/null +++ b/dao/src/main/java/org/thingsboard/server/dao/annotation/SqlDao.java @@ -0,0 +1,7 @@ +package org.thingsboard.server.dao.annotation; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; + +@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") +public @interface SqlDao { +} 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 d78b93189a..ce8111d54c 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 @@ -23,13 +23,13 @@ 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.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.DaoUtil; +import org.thingsboard.server.dao.annotation.NoSqlDao; import org.thingsboard.server.dao.model.TenantAssetTypeEntity; import org.thingsboard.server.dao.model.nosql.AssetEntity; @@ -41,7 +41,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@NoSqlDao public class CassandraAssetDao extends CassandraAbstractSearchTextDao implements AssetDao { @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java index a98f054391..1dd7a6dc47 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java @@ -22,12 +22,12 @@ 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.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.ModelConstants; import org.thingsboard.server.dao.timeseries.CassandraBaseTimeseriesDao; @@ -48,7 +48,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; */ @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@NoSqlDao public class CassandraBaseAttributesDao extends CassandraAbstractAsyncDao implements AttributesDao { private PreparedStatement saveStmt; diff --git a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java index 6bffb3e3b4..8649122248 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java +++ b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java @@ -25,8 +25,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; +import org.thingsboard.server.dao.annotation.NoSqlDao; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; @@ -38,7 +38,7 @@ import java.util.List; @Component @Slf4j @Data -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true") +@NoSqlDao public class CassandraCluster { private static final String COMMA = ","; diff --git a/dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java b/dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java index 0c7984e254..64ae0c03e9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java @@ -21,7 +21,6 @@ import com.datastax.driver.core.querybuilder.QueryBuilder; import com.datastax.driver.core.querybuilder.Select; import com.datastax.driver.core.utils.UUIDs; import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.ComponentDescriptorId; import org.thingsboard.server.common.data.page.TextPageLink; @@ -30,8 +29,9 @@ 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.DaoUtil; -import org.thingsboard.server.dao.model.nosql.ComponentDescriptorEntity; +import org.thingsboard.server.dao.annotation.NoSqlDao; import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.model.nosql.ComponentDescriptorEntity; import java.util.Arrays; import java.util.List; @@ -46,7 +46,7 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.select; */ @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@NoSqlDao public class CassandraBaseComponentDescriptorDao extends CassandraAbstractSearchTextDao implements ComponentDescriptorDao { @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CassandraCustomerDao.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CassandraCustomerDao.java index 7a1c67db83..c363d330f0 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/customer/CassandraCustomerDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CassandraCustomerDao.java @@ -15,31 +15,28 @@ */ package org.thingsboard.server.dao.customer; -import static com.datastax.driver.core.querybuilder.QueryBuilder.select; -import static org.thingsboard.server.dao.model.ModelConstants.CUSTOMER_BY_TENANT_AND_TITLE_VIEW_NAME; -import static org.thingsboard.server.dao.model.ModelConstants.CUSTOMER_TITLE_PROPERTY; -import static org.thingsboard.server.dao.model.ModelConstants.CUSTOMER_TENANT_ID_PROPERTY; - -import java.util.Optional; import com.datastax.driver.core.querybuilder.Select; import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.DaoUtil; -import org.thingsboard.server.dao.model.nosql.CustomerEntity; +import org.thingsboard.server.dao.annotation.NoSqlDao; import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.model.nosql.CustomerEntity; import java.util.Arrays; import java.util.List; +import java.util.Optional; import java.util.UUID; import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; +import static com.datastax.driver.core.querybuilder.QueryBuilder.select; +import static org.thingsboard.server.dao.model.ModelConstants.*; @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@NoSqlDao public class CassandraCustomerDao extends CassandraAbstractSearchTextDao implements CustomerDao { @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardDao.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardDao.java index c0ea1dc0f4..d323ff857a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardDao.java @@ -15,16 +15,16 @@ */ package org.thingsboard.server.dao.dashboard; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.nosql.DashboardEntity; import static org.thingsboard.server.dao.model.ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME; @Component -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@NoSqlDao public class CassandraDashboardDao extends CassandraAbstractSearchTextDao implements DashboardDao { @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardInfoDao.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardInfoDao.java index 366ec1f82a..61ce9e199b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardInfoDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardInfoDao.java @@ -16,12 +16,12 @@ package org.thingsboard.server.dao.dashboard; import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.DaoUtil; +import org.thingsboard.server.dao.annotation.NoSqlDao; import org.thingsboard.server.dao.model.nosql.DashboardInfoEntity; import java.util.Arrays; @@ -34,7 +34,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@NoSqlDao public class CassandraDashboardInfoDao extends CassandraAbstractSearchTextDao implements DashboardInfoDao { @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceCredentialsDao.java b/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceCredentialsDao.java index 517b8cb019..5ee86706f9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceCredentialsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceCredentialsDao.java @@ -17,13 +17,13 @@ package org.thingsboard.server.dao.device; 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.DeviceCredentials; import org.thingsboard.server.dao.CassandraAbstractModelDao; import org.thingsboard.server.dao.DaoUtil; -import org.thingsboard.server.dao.model.nosql.DeviceCredentialsEntity; +import org.thingsboard.server.dao.annotation.NoSqlDao; import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.model.nosql.DeviceCredentialsEntity; import java.util.UUID; @@ -32,7 +32,7 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.select; @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@NoSqlDao public class CassandraDeviceCredentialsDao extends CassandraAbstractModelDao implements DeviceCredentialsDao { @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceDao.java index 28d97cb933..6b889c18f8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceDao.java @@ -23,13 +23,13 @@ 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.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.DaoUtil; +import org.thingsboard.server.dao.annotation.NoSqlDao; import org.thingsboard.server.dao.model.TenantDeviceTypeEntity; import org.thingsboard.server.dao.model.nosql.DeviceEntity; @@ -41,7 +41,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@NoSqlDao public class CassandraDeviceDao extends CassandraAbstractSearchTextDao implements DeviceDao { @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java index 4d9da2189c..741e251af2 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java @@ -22,7 +22,6 @@ import com.datastax.driver.core.querybuilder.Select; import com.datastax.driver.core.utils.UUIDs; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.Event; import org.thingsboard.server.common.data.id.EntityId; @@ -31,8 +30,9 @@ 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.DaoUtil; -import org.thingsboard.server.dao.model.nosql.EventEntity; +import org.thingsboard.server.dao.annotation.NoSqlDao; import org.thingsboard.server.dao.model.ModelConstants; +import org.thingsboard.server.dao.model.nosql.EventEntity; import java.util.Arrays; import java.util.List; @@ -45,7 +45,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@NoSqlDao public class CassandraBaseEventDao extends CassandraAbstractSearchTimeDao implements EventDao { private final TenantId systemTenantId = new TenantId(NULL_UUID); diff --git a/dao/src/main/java/org/thingsboard/server/dao/plugin/CassandraBasePluginDao.java b/dao/src/main/java/org/thingsboard/server/dao/plugin/CassandraBasePluginDao.java index efcbacd5bb..6126aef9a7 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/plugin/CassandraBasePluginDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/plugin/CassandraBasePluginDao.java @@ -17,7 +17,6 @@ package org.thingsboard.server.dao.plugin; import com.datastax.driver.core.querybuilder.Select; import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.PluginId; import org.thingsboard.server.common.data.id.TenantId; @@ -25,6 +24,7 @@ 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.DaoUtil; +import org.thingsboard.server.dao.annotation.NoSqlDao; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.nosql.PluginMetaDataEntity; @@ -37,7 +37,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@NoSqlDao public class CassandraBasePluginDao extends CassandraAbstractSearchTextDao implements PluginDao { @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java index af76971dd3..14c1cf3faa 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java @@ -19,11 +19,8 @@ import com.datastax.driver.core.*; import com.datastax.driver.core.querybuilder.QueryBuilder; import com.datastax.driver.core.querybuilder.Select; import com.fasterxml.jackson.databind.JsonNode; -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.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.id.EntityId; @@ -33,10 +30,10 @@ 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.model.ModelConstants; import org.thingsboard.server.dao.model.type.RelationTypeGroupCodec; -import javax.annotation.Nullable; import javax.annotation.PostConstruct; import java.util.ArrayList; import java.util.Arrays; @@ -49,7 +46,7 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; */ @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@NoSqlDao public class BaseRelationDao extends CassandraAbstractAsyncDao implements RelationDao { private static final String SELECT_COLUMNS = "SELECT " + diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/CassandraBaseRuleDao.java b/dao/src/main/java/org/thingsboard/server/dao/rule/CassandraBaseRuleDao.java index 962cd59f74..33465cb2d8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/CassandraBaseRuleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/CassandraBaseRuleDao.java @@ -17,7 +17,6 @@ package org.thingsboard.server.dao.rule; import com.datastax.driver.core.querybuilder.Select; import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.RuleId; import org.thingsboard.server.common.data.id.TenantId; @@ -25,6 +24,7 @@ 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.DaoUtil; +import org.thingsboard.server.dao.annotation.NoSqlDao; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.nosql.RuleMetaDataEntity; @@ -37,7 +37,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@NoSqlDao public class CassandraBaseRuleDao extends CassandraAbstractSearchTextDao implements RuleDao { @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/settings/CassandraAdminSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/settings/CassandraAdminSettingsDao.java index a69d30f820..14017d89cb 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/settings/CassandraAdminSettingsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/settings/CassandraAdminSettingsDao.java @@ -17,11 +17,11 @@ package org.thingsboard.server.dao.settings; 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.AdminSettings; import org.thingsboard.server.dao.CassandraAbstractModelDao; import org.thingsboard.server.dao.DaoUtil; +import org.thingsboard.server.dao.annotation.NoSqlDao; import org.thingsboard.server.dao.model.nosql.AdminSettingsEntity; import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; @@ -30,7 +30,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@NoSqlDao public class CassandraAdminSettingsDao extends CassandraAbstractModelDao implements AdminSettingsDao { @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java index 948ee9cede..a7162cdc25 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java @@ -15,10 +15,10 @@ */ package org.thingsboard.server.dao.sql.alarm; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.sql.AlarmEntity; import java.util.UUID; @@ -26,7 +26,7 @@ import java.util.UUID; /** * Created by Valerii Sosliuk on 5/21/2017. */ -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public interface AlarmRepository extends CrudRepository { @Query(nativeQuery = true, value = "SELECT * FROM ALARM WHERE TENANT_ID = :tenantId AND ORIGINATOR_ID = :originatorId " + diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java index d79d8ac849..5517ec1601 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java @@ -21,7 +21,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -37,6 +36,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.model.sql.AlarmEntity; import org.thingsboard.server.dao.relation.RelationDao; import org.thingsboard.server.dao.sql.JpaAbstractDao; @@ -52,7 +52,7 @@ import static org.springframework.transaction.annotation.Propagation.REQUIRES_NE */ @Slf4j @Component -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public class JpaAlarmDao extends JpaAbstractDao implements AlarmDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java index 68bcea42d5..3f5e4915b9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java @@ -15,11 +15,11 @@ */ package org.thingsboard.server.dao.sql.asset; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.sql.AssetEntity; import java.util.List; @@ -28,7 +28,7 @@ import java.util.UUID; /** * Created by Valerii Sosliuk on 5/21/2017. */ -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public interface AssetRepository extends CrudRepository { @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = :tenantId " + diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java index f6296dda91..39f8111109 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java @@ -17,13 +17,13 @@ package org.thingsboard.server.dao.sql.asset; import com.google.common.util.concurrent.ListenableFuture; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; 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.DaoUtil; +import org.thingsboard.server.dao.annotation.SqlDao; import org.thingsboard.server.dao.asset.AssetDao; import org.thingsboard.server.dao.model.sql.AssetEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; @@ -38,7 +38,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; * Created by Valerii Sosliuk on 5/19/2017. */ @Component -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public class JpaAssetDao extends JpaAbstractSearchTextDao implements AssetDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java index a231f8733e..a090049eb1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java @@ -15,15 +15,15 @@ */ package org.thingsboard.server.dao.sql.attributes; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; +import org.thingsboard.server.dao.annotation.SqlDao; import org.thingsboard.server.dao.model.sql.AttributeKvCompositeKey; import org.thingsboard.server.dao.model.sql.AttributeKvEntity; import java.util.List; import java.util.UUID; -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") +@SqlDao public interface AttributeKvRepository extends CrudRepository { List findAllByEntityTypeAndEntityIdAndAttributeType(String entityType, diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java index 32603359d6..cf69004050 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java @@ -19,11 +19,11 @@ import com.google.common.collect.Lists; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.attributes.AttributesDao; import org.thingsboard.server.dao.model.sql.AttributeKvCompositeKey; import org.thingsboard.server.dao.model.sql.AttributeKvEntity; @@ -36,7 +36,7 @@ import java.util.stream.Collectors; @Component @Slf4j -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") +@SqlDao public class JpaAttributeDao extends JpaAbstractDaoListeningExecutorService implements AttributesDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java index 266ae494d9..e86b838213 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java @@ -15,10 +15,10 @@ */ package org.thingsboard.server.dao.sql.component; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.sql.ComponentDescriptorEntity; import java.util.List; @@ -27,7 +27,7 @@ import java.util.UUID; /** * Created by Valerii Sosliuk on 5/6/2017. */ -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public interface ComponentDescriptorRepository extends CrudRepository { ComponentDescriptorEntity findByClazz(String clazz); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java index 405af2ad64..023e7a5a01 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java @@ -17,7 +17,6 @@ package org.thingsboard.server.dao.sql.component; import com.datastax.driver.core.utils.UUIDs; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.ComponentDescriptorId; @@ -26,6 +25,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.component.ComponentDescriptorDao; import org.thingsboard.server.dao.model.sql.ComponentDescriptorEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; @@ -40,7 +40,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; * Created by Valerii Sosliuk on 5/6/2017. */ @Component -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public class JpaBaseComponentDescriptorDao extends JpaAbstractSearchTextDao implements ComponentDescriptorDao { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java index 3ce55c008f..0bf4f13943 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java @@ -15,10 +15,10 @@ */ package org.thingsboard.server.dao.sql.customer; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.sql.CustomerEntity; import java.util.List; @@ -27,7 +27,7 @@ import java.util.UUID; /** * Created by Valerii Sosliuk on 5/6/2017. */ -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public interface CustomerRepository extends CrudRepository { @Query(nativeQuery = true, value = "SELECT * FROM CUSTOMER WHERE TENANT_ID = :tenantId " + diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java index a50526611c..d5ae9aba83 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java @@ -16,12 +16,12 @@ package org.thingsboard.server.dao.sql.customer; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; 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.customer.CustomerDao; import org.thingsboard.server.dao.model.sql.CustomerEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; @@ -36,7 +36,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; * Created by Valerii Sosliuk on 5/6/2017. */ @Component -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public class JpaCustomerDao extends JpaAbstractSearchTextDao implements CustomerDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java index 16bd0a2df7..a4e3412c35 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java @@ -15,10 +15,10 @@ */ package org.thingsboard.server.dao.sql.dashboard; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.sql.DashboardInfoEntity; import java.util.List; @@ -27,7 +27,7 @@ import java.util.UUID; /** * Created by Valerii Sosliuk on 5/6/2017. */ -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public interface DashboardInfoRepository extends CrudRepository { @Query(nativeQuery = true, value = "SELECT * FROM DASHBOARD WHERE TENANT_ID = :tenantId " + diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardRepository.java index 11fae3a51a..9b8c42d06b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardRepository.java @@ -15,8 +15,8 @@ */ package org.thingsboard.server.dao.sql.dashboard; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; +import org.thingsboard.server.dao.annotation.SqlDao; import org.thingsboard.server.dao.model.sql.DashboardEntity; import java.util.UUID; @@ -24,6 +24,6 @@ import java.util.UUID; /** * Created by Valerii Sosliuk on 5/6/2017. */ -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public interface DashboardRepository extends CrudRepository { } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java index 5f14110af4..d40400016e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java @@ -16,23 +16,21 @@ package org.thingsboard.server.dao.sql.dashboard; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.dashboard.DashboardDao; import org.thingsboard.server.dao.model.sql.DashboardEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import java.util.UUID; -import static org.thingsboard.server.dao.model.ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME; - /** * Created by Valerii Sosliuk on 5/6/2017. */ @Component -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public class JpaDashboardDao extends JpaAbstractSearchTextDao implements DashboardDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java index 77401c64c8..d1d2b776d6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java @@ -16,12 +16,12 @@ package org.thingsboard.server.dao.sql.dashboard; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; 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.dashboard.DashboardInfoDao; import org.thingsboard.server.dao.model.sql.DashboardInfoEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; @@ -35,7 +35,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; * Created by Valerii Sosliuk on 5/6/2017. */ @Component -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public class JpaDashboardInfoDao extends JpaAbstractSearchTextDao implements DashboardInfoDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceCredentialsRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceCredentialsRepository.java index 229e6d5422..b3dfcf4e5d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceCredentialsRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceCredentialsRepository.java @@ -15,9 +15,8 @@ */ package org.thingsboard.server.dao.sql.device; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Component; +import org.thingsboard.server.dao.annotation.SqlDao; import org.thingsboard.server.dao.model.sql.DeviceCredentialsEntity; import java.util.UUID; @@ -25,7 +24,7 @@ import java.util.UUID; /** * Created by Valerii Sosliuk on 5/6/2017. */ -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public interface DeviceCredentialsRepository extends CrudRepository { DeviceCredentialsEntity findByDeviceId(UUID deviceId); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java index 0386aa86fc..8102553fd5 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java @@ -15,10 +15,10 @@ */ package org.thingsboard.server.dao.sql.device; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.sql.DeviceEntity; import org.thingsboard.server.dao.model.sql.TenantDeviceTypeEntity; @@ -28,7 +28,7 @@ import java.util.UUID; /** * Created by Valerii Sosliuk on 5/6/2017. */ -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public interface DeviceRepository extends CrudRepository { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java index 0cb3489f5d..97e3363940 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java @@ -16,13 +16,12 @@ package org.thingsboard.server.dao.sql.device; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.device.DeviceCredentialsDao; -import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.sql.DeviceCredentialsEntity; import org.thingsboard.server.dao.sql.JpaAbstractDao; @@ -32,7 +31,7 @@ import java.util.UUID; * Created by Valerii Sosliuk on 5/6/2017. */ @Component -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public class JpaDeviceCredentialsDao extends JpaAbstractDao implements DeviceCredentialsDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java index 455075c945..68f4262d7c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java @@ -17,7 +17,6 @@ package org.thingsboard.server.dao.sql.device; import com.google.common.util.concurrent.ListenableFuture; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.Device; @@ -25,6 +24,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.device.DeviceDao; import org.thingsboard.server.dao.model.sql.DeviceEntity; import org.thingsboard.server.dao.model.sql.TenantDeviceTypeEntity; @@ -38,7 +38,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; * Created by Valerii Sosliuk on 5/6/2017. */ @Component -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public class JpaDeviceDao extends JpaAbstractSearchTextDao implements DeviceDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java index 82ccc62bc7..9719e836f6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java @@ -15,10 +15,10 @@ */ package org.thingsboard.server.dao.sql.event; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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 java.util.UUID; @@ -26,7 +26,7 @@ import java.util.UUID; /** * Created by Valerii Sosliuk on 5/3/2017. */ -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public interface EventRepository extends CrudRepository, JpaSpecificationExecutor { EventEntity findByTenantIdAndEntityTypeAndEntityIdAndEventTypeAndEventUid( diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java index 649a201c15..37ef0582d9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java @@ -19,7 +19,6 @@ import com.datastax.driver.core.utils.UUIDs; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -31,6 +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.event.EventDao; import org.thingsboard.server.dao.model.sql.EventEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTimeDao; @@ -53,7 +53,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; */ @Slf4j @Component -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public class JpaBaseEventDao extends JpaAbstractSearchTimeDao implements EventDao { private final UUID systemTenantId = NULL_UUID; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java index 0463200241..109ea553fb 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java @@ -17,7 +17,6 @@ package org.thingsboard.server.dao.sql.plugin; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.PluginId; @@ -25,6 +24,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.model.sql.PluginMetaDataEntity; import org.thingsboard.server.dao.plugin.PluginDao; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; @@ -40,7 +40,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; */ @Slf4j @Component -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public class JpaBasePluginDao extends JpaAbstractSearchTextDao implements PluginDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/PluginMetaDataRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/PluginMetaDataRepository.java index b21bfae1d1..e05fe81579 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/PluginMetaDataRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/PluginMetaDataRepository.java @@ -15,10 +15,10 @@ */ package org.thingsboard.server.dao.sql.plugin; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.sql.PluginMetaDataEntity; import java.util.List; @@ -27,7 +27,7 @@ import java.util.UUID; /** * Created by Valerii Sosliuk on 5/1/2017. */ -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public interface PluginMetaDataRepository extends CrudRepository { PluginMetaDataEntity findByApiToken(String apiToken); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java index db33808eb8..550424c82a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java @@ -18,7 +18,6 @@ package org.thingsboard.server.dao.sql.relation; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -31,6 +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.model.sql.RelationCompositeKey; import org.thingsboard.server.dao.model.sql.RelationEntity; import org.thingsboard.server.dao.relation.RelationDao; @@ -53,7 +53,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; */ @Slf4j @Component -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public class JpaRelationDao extends JpaAbstractDaoListeningExecutorService implements RelationDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java index d995b854d1..2f0cd7a914 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java @@ -15,16 +15,16 @@ */ package org.thingsboard.server.dao.sql.relation; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.sql.RelationCompositeKey; import org.thingsboard.server.dao.model.sql.RelationEntity; import java.util.List; import java.util.UUID; -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") +@SqlDao public interface RelationRepository extends CrudRepository, JpaSpecificationExecutor { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java index b1f53a93b7..1ad16e2cb6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java @@ -17,7 +17,6 @@ package org.thingsboard.server.dao.sql.rule; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.RuleId; @@ -25,6 +24,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.model.sql.RuleMetaDataEntity; import org.thingsboard.server.dao.rule.RuleDao; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; @@ -40,7 +40,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; */ @Slf4j @Component -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public class JpaBaseRuleDao extends JpaAbstractSearchTextDao implements RuleDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleMetaDataRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleMetaDataRepository.java index 0bf6742672..9336e6965a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleMetaDataRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleMetaDataRepository.java @@ -15,10 +15,10 @@ */ package org.thingsboard.server.dao.sql.rule; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.sql.RuleMetaDataEntity; import java.util.List; @@ -27,7 +27,7 @@ import java.util.UUID; /** * Created by Valerii Sosliuk on 4/30/2017. */ -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public interface RuleMetaDataRepository extends CrudRepository { List findByPluginToken(String pluginToken); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java index e31c5d0569..5433a13337 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java @@ -17,11 +17,11 @@ package org.thingsboard.server.dao.sql.settings; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.sql.AdminSettingsEntity; import org.thingsboard.server.dao.settings.AdminSettingsDao; import org.thingsboard.server.dao.sql.JpaAbstractDao; @@ -30,7 +30,7 @@ import java.util.UUID; @Component @Slf4j -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") +@SqlDao public class JpaAdminSettingsDao extends JpaAbstractDao implements AdminSettingsDao{ @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java index e434431ec3..ddd6f7d430 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java @@ -16,12 +16,12 @@ package org.thingsboard.server.dao.sql.tenant; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; 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.model.sql.TenantEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import org.thingsboard.server.dao.tenant.TenantDao; @@ -35,7 +35,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; * Created by Valerii Sosliuk on 4/30/2017. */ @Component -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public class JpaTenantDao extends JpaAbstractSearchTextDao implements TenantDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java index 8c6a9546c3..10f58b3158 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java @@ -15,10 +15,10 @@ */ package org.thingsboard.server.dao.sql.tenant; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.sql.TenantEntity; import java.util.List; @@ -27,7 +27,7 @@ import java.util.UUID; /** * Created by Valerii Sosliuk on 4/30/2017. */ -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public interface TenantRepository extends CrudRepository { @Query(nativeQuery = true, value = "SELECT * FROM TENANT WHERE REGION = :region " + diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java index f3371f23e4..df37ae74c0 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java @@ -19,12 +19,12 @@ import com.google.common.collect.Lists; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.EntityId; 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.model.sql.TsKvEntity; import org.thingsboard.server.dao.model.sql.TsKvLatestCompositeKey; import org.thingsboard.server.dao.model.sql.TsKvLatestEntity; @@ -35,7 +35,7 @@ import java.util.List; @Component @Slf4j -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") +@SqlDao public class JpaTimeseriesDao extends JpaAbstractDaoListeningExecutorService implements TimeseriesDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvLatestRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvLatestRepository.java index 863064908f..7c447f190b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvLatestRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvLatestRepository.java @@ -15,15 +15,15 @@ */ package org.thingsboard.server.dao.sql.timeseries; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; +import org.thingsboard.server.dao.annotation.SqlDao; import org.thingsboard.server.dao.model.sql.TsKvLatestCompositeKey; import org.thingsboard.server.dao.model.sql.TsKvLatestEntity; import java.util.List; import java.util.UUID; -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") +@SqlDao public interface TsKvLatestRepository extends CrudRepository { List findAllByEntityTypeAndEntityId(String entityType, UUID entityId); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvRepository.java index 6b087847f9..786184e157 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvRepository.java @@ -15,11 +15,11 @@ */ package org.thingsboard.server.dao.sql.timeseries; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; +import org.thingsboard.server.dao.annotation.SqlDao; import org.thingsboard.server.dao.model.sql.TsKvCompositeKey; import org.thingsboard.server.dao.model.sql.TsKvEntity; -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") +@SqlDao public interface TsKvRepository extends CrudRepository { } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java index ec1e6740e3..de2f5f9b5e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java @@ -16,12 +16,12 @@ package org.thingsboard.server.dao.sql.user; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.User; 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.model.sql.UserEntity; import org.thingsboard.server.dao.sql.JpaAbstractDao; import org.thingsboard.server.dao.user.UserDao; @@ -35,7 +35,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; * @author Valerii Sosliuk */ @Component -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public class JpaUserDao extends JpaAbstractDao implements UserDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java index f9d280249c..a0fb882b0b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java @@ -15,10 +15,10 @@ */ package org.thingsboard.server.dao.sql.user; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.sql.UserEntity; import java.util.List; @@ -27,7 +27,7 @@ import java.util.UUID; /** * @author Valerii Sosliuk */ -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public interface UserRepository extends CrudRepository { UserEntity findByEmail(String email); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java index 58f9346239..b4a10813f5 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetTypeDao.java @@ -16,11 +16,11 @@ package org.thingsboard.server.dao.sql.widget; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.sql.WidgetTypeEntity; import org.thingsboard.server.dao.sql.JpaAbstractDao; import org.thingsboard.server.dao.widget.WidgetTypeDao; @@ -28,13 +28,11 @@ import org.thingsboard.server.dao.widget.WidgetTypeDao; import java.util.List; import java.util.UUID; -import static org.thingsboard.server.dao.model.ModelConstants.WIDGET_TYPE_COLUMN_FAMILY_NAME; - /** * Created by Valerii Sosliuk on 4/29/2017. */ @Component -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public class JpaWidgetTypeDao extends JpaAbstractDao implements WidgetTypeDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java index 670bd7fc8f..a3c06f1fb7 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java @@ -16,12 +16,12 @@ package org.thingsboard.server.dao.sql.widget; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; 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.model.sql.WidgetsBundleEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import org.thingsboard.server.dao.widget.WidgetsBundleDao; @@ -35,7 +35,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; * Created by Valerii Sosliuk on 4/23/2017. */ @Component -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public class JpaWidgetsBundleDao extends JpaAbstractSearchTextDao implements WidgetsBundleDao { @Autowired diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetTypeRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetTypeRepository.java index 6161d12284..d85234ba70 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetTypeRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetTypeRepository.java @@ -15,9 +15,8 @@ */ package org.thingsboard.server.dao.sql.widget; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.repository.CrudRepository; -import org.thingsboard.server.common.data.widget.WidgetType; +import org.thingsboard.server.dao.annotation.SqlDao; import org.thingsboard.server.dao.model.sql.WidgetTypeEntity; import java.util.List; @@ -26,7 +25,7 @@ import java.util.UUID; /** * Created by Valerii Sosliuk on 4/29/2017. */ -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public interface WidgetTypeRepository extends CrudRepository { List findByTenantIdAndBundleAlias(UUID tenantId, String bundleAlias); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java index 1998a55cda..34f167d045 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/WidgetsBundleRepository.java @@ -15,10 +15,10 @@ */ package org.thingsboard.server.dao.sql.widget; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.sql.WidgetsBundleEntity; import java.util.List; @@ -27,7 +27,7 @@ import java.util.UUID; /** * Created by Valerii Sosliuk on 4/23/2017. */ -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true", matchIfMissing = false) +@SqlDao public interface WidgetsBundleRepository extends CrudRepository { WidgetsBundleEntity findWidgetsBundleByTenantIdAndAlias(UUID tenantId, String alias); diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/CassandraTenantDao.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/CassandraTenantDao.java index e6e8db453d..97e098b042 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/tenant/CassandraTenantDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/CassandraTenantDao.java @@ -16,12 +16,12 @@ package org.thingsboard.server.dao.tenant; import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.DaoUtil; +import org.thingsboard.server.dao.annotation.NoSqlDao; import org.thingsboard.server.dao.model.nosql.TenantEntity; import java.util.Arrays; @@ -32,7 +32,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@NoSqlDao public class CassandraTenantDao extends CassandraAbstractSearchTextDao implements TenantDao { @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java index bb9a1b571d..4c557e84c1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java @@ -25,12 +25,12 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.model.ModelConstants; import javax.annotation.Nullable; @@ -51,7 +51,7 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; */ @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true") +@NoSqlDao public class CassandraBaseTimeseriesDao extends CassandraAbstractAsyncDao implements TimeseriesDao { @Value("${cassandra.query.min_aggregation_step_ms}") diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserCredentialsDao.java b/dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserCredentialsDao.java index 6f94cab568..7d3b1fbce1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserCredentialsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserCredentialsDao.java @@ -22,6 +22,7 @@ import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.security.UserCredentials; import org.thingsboard.server.dao.CassandraAbstractModelDao; import org.thingsboard.server.dao.DaoUtil; +import org.thingsboard.server.dao.annotation.NoSqlDao; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.nosql.UserCredentialsEntity; @@ -32,7 +33,7 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.select; @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@NoSqlDao public class CassandraUserCredentialsDao extends CassandraAbstractModelDao implements UserCredentialsDao { @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserDao.java b/dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserDao.java index c5f11d16f6..e2f4c5514f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/user/CassandraUserDao.java @@ -17,13 +17,13 @@ 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.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.DaoUtil; +import org.thingsboard.server.dao.annotation.NoSqlDao; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.model.nosql.UserEntity; @@ -36,7 +36,7 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.select; @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@NoSqlDao public class CassandraUserDao extends CassandraAbstractSearchTextDao implements UserDao { @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetTypeDao.java b/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetTypeDao.java index 2f06b017c8..5fcf623ad3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetTypeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetTypeDao.java @@ -17,11 +17,11 @@ package org.thingsboard.server.dao.widget; 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.widget.WidgetType; import org.thingsboard.server.dao.CassandraAbstractModelDao; import org.thingsboard.server.dao.DaoUtil; +import org.thingsboard.server.dao.annotation.NoSqlDao; import org.thingsboard.server.dao.model.nosql.WidgetTypeEntity; import java.util.List; @@ -33,7 +33,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@NoSqlDao public class CassandraWidgetTypeDao extends CassandraAbstractModelDao implements WidgetTypeDao { @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetsBundleDao.java b/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetsBundleDao.java index f4e7a727ce..3aa7bafdba 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetsBundleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/widget/CassandraWidgetsBundleDao.java @@ -17,12 +17,12 @@ package org.thingsboard.server.dao.widget; import com.datastax.driver.core.querybuilder.Select; import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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.DaoUtil; +import org.thingsboard.server.dao.annotation.NoSqlDao; import org.thingsboard.server.dao.model.nosql.WidgetsBundleEntity; import java.util.Arrays; @@ -34,7 +34,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Component @Slf4j -@ConditionalOnProperty(prefix = "cassandra", value = "enabled", havingValue = "true", matchIfMissing = false) +@NoSqlDao public class CassandraWidgetsBundleDao extends CassandraAbstractSearchTextDao implements WidgetsBundleDao { @Override diff --git a/dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java b/dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java index ad4145ab1d..3b925c399b 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java +++ b/dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java @@ -20,9 +20,9 @@ import com.github.springtestdbunit.bean.DatabaseDataSourceConnectionFactoryBean; import org.dbunit.DatabaseUnitException; import org.dbunit.ext.postgresql.PostgresqlDataTypeFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.thingsboard.server.dao.annotation.SqlDao; import javax.sql.DataSource; import java.io.IOException; @@ -32,7 +32,7 @@ import java.sql.SQLException; * Created by Valerii Sosliuk on 5/6/2017. */ @Configuration -@ConditionalOnProperty(prefix = "sql", value = "enabled", havingValue = "true") +@SqlDao public class JpaDbunitTestConfig { @Autowired From 5ab6e886bcd1589961124787cf3233e5d8a0d6d1 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Mon, 19 Jun 2017 10:18:51 +0300 Subject: [PATCH 56/69] JPA Dao misc fixes due to test failures --- .../server/dao/annotation/NoSqlDao.java | 15 + .../server/dao/annotation/SqlDao.java | 15 + .../server/dao/asset/BaseAssetService.java | 5 +- .../dao/customer/CustomerServiceImpl.java | 2 +- .../dao/dashboard/DashboardServiceImpl.java | 4 +- .../server/dao/device/DeviceServiceImpl.java | 4 +- .../server/dao/model/sql/DashboardEntity.java | 13 - .../server/dao/model/sql/DeviceEntity.java | 4 - .../server/dao/model/sql/UserEntity.java | 2 +- .../server/dao/plugin/BasePluginService.java | 3 +- .../server/dao/rule/BaseRuleService.java | 2 +- .../server/dao/service/PaginatedRemover.java | 2 +- .../dao/sql/relation/JpaRelationDao.java | 10 +- .../dao/sql/settings/JpaAdminSettingsDao.java | 2 +- .../server/dao/sql/user/JpaUserDao.java | 22 +- .../server/dao/sql/user/UserRepository.java | 20 +- .../server/dao/tenant/TenantServiceImpl.java | 2 +- .../server/dao/user/UserServiceImpl.java | 10 +- .../dao/widget/WidgetsBundleServiceImpl.java | 2 +- dao/src/main/resources/postgres/schema.sql | 36 +-- .../dao/service/RelationServiceImplTest.java | 2 - .../dao/service/RelationServiceTest.java | 284 ------------------ dao/src/test/resources/jpa-test.properties | 8 +- dao/src/test/resources/system-test.sql | 2 + 24 files changed, 97 insertions(+), 374 deletions(-) delete mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/RelationServiceTest.java create mode 100644 dao/src/test/resources/system-test.sql diff --git a/dao/src/main/java/org/thingsboard/server/dao/annotation/NoSqlDao.java b/dao/src/main/java/org/thingsboard/server/dao/annotation/NoSqlDao.java index f4ec83bbf8..a9092a92c9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/annotation/NoSqlDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/annotation/NoSqlDao.java @@ -1,3 +1,18 @@ +/** + * 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.annotation; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/dao/src/main/java/org/thingsboard/server/dao/annotation/SqlDao.java b/dao/src/main/java/org/thingsboard/server/dao/annotation/SqlDao.java index e5a11b17a3..6d26678378 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/annotation/SqlDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/annotation/SqlDao.java @@ -1,3 +1,18 @@ +/** + * 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.annotation; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 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 a6fea21543..7e9f129a10 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 @@ -39,7 +39,6 @@ import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.dao.customer.CustomerDao; import org.thingsboard.server.dao.entity.AbstractEntityService; import org.thingsboard.server.dao.exception.DataValidationException; -import org.thingsboard.server.dao.model.*; import org.thingsboard.server.dao.relation.EntitySearchDirection; import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.PaginatedRemover; @@ -150,7 +149,7 @@ public class BaseAssetService extends AbstractEntityService implements AssetServ public void deleteAssetsByTenantId(TenantId tenantId) { log.trace("Executing deleteAssetsByTenantId, tenantId [{}]", tenantId); validateId(tenantId, "Incorrect tenantId " + tenantId); - tenantAssetsRemover.removeEntitites(tenantId); + tenantAssetsRemover.removeEntities(tenantId); } @Override @@ -188,7 +187,7 @@ public class BaseAssetService extends AbstractEntityService implements AssetServ log.trace("Executing unassignCustomerAssets, tenantId [{}], customerId [{}]", tenantId, customerId); validateId(tenantId, "Incorrect tenantId " + tenantId); validateId(customerId, "Incorrect customerId " + customerId); - new CustomerAssetsUnassigner(tenantId).removeEntitites(customerId); + new CustomerAssetsUnassigner(tenantId).removeEntities(customerId); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java index 65eb89f9fc..24d1b8a055 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java @@ -135,7 +135,7 @@ public class CustomerServiceImpl extends AbstractEntityService implements Custom public void deleteCustomersByTenantId(TenantId tenantId) { log.trace("Executing deleteCustomersByTenantId, tenantId [{}]", tenantId); Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); - customersByTenantRemover.removeEntitites(tenantId); + customersByTenantRemover.removeEntities(tenantId); } private DataValidator customerValidator = diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java index 523f774909..e1b1587f91 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java @@ -128,7 +128,7 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb public void deleteDashboardsByTenantId(TenantId tenantId) { log.trace("Executing deleteDashboardsByTenantId, tenantId [{}]", tenantId); Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); - tenantDashboardsRemover.removeEntitites(tenantId); + tenantDashboardsRemover.removeEntities(tenantId); } @Override @@ -146,7 +146,7 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb log.trace("Executing unassignCustomerDashboards, tenantId [{}], customerId [{}]", tenantId, customerId); Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); Validator.validateId(customerId, "Incorrect customerId " + customerId); - new CustomerDashboardsUnassigner(tenantId).removeEntitites(customerId); + new CustomerDashboardsUnassigner(tenantId).removeEntities(customerId); } private DataValidator dashboardValidator = 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 458d30a8b3..7535967196 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 @@ -168,7 +168,7 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe public void deleteDevicesByTenantId(TenantId tenantId) { log.trace("Executing deleteDevicesByTenantId, tenantId [{}]", tenantId); validateId(tenantId, "Incorrect tenantId " + tenantId); - tenantDevicesRemover.removeEntitites(tenantId); + tenantDevicesRemover.removeEntities(tenantId); } @Override @@ -207,7 +207,7 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe log.trace("Executing unassignCustomerDevices, tenantId [{}], customerId [{}]", tenantId, customerId); validateId(tenantId, "Incorrect tenantId " + tenantId); validateId(customerId, "Incorrect customerId " + customerId); - new CustomerDevicesUnassigner(tenantId).removeEntitites(customerId); + new CustomerDevicesUnassigner(tenantId).removeEntities(customerId); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java index e7967159f2..82c9fa1722 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java @@ -82,15 +82,6 @@ public final class DashboardEntity implements SearchTextEntity { this.configuration = dashboard.getConfiguration(); } - @Override - public UUID getId() { - return id; - } - - @Override - public void setId(UUID id) { - } - @Override public String getSearchTextSource() { return title; @@ -100,10 +91,6 @@ public final class DashboardEntity implements SearchTextEntity { public void setSearchText(String searchText) { this.searchText = searchText; } - - public String getSearchText() { - return searchText; - } @Override public Dashboard toData() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java index 148e5f163f..02e8c2804a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java @@ -96,10 +96,6 @@ public final class DeviceEntity implements SearchTextEntity { this.searchText = searchText; } - public String getSearchText() { - return searchText; - } - @Override public Device toData() { Device device = new Device(new DeviceId(id)); diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java index d1a1c71cb1..250d91ba63 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java @@ -99,7 +99,7 @@ public class UserEntity implements SearchTextEntity { @Override public String getSearchTextSource() { - return searchText; + return email; } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/plugin/BasePluginService.java b/dao/src/main/java/org/thingsboard/server/dao/plugin/BasePluginService.java index 342ca4aa20..fe9a558ea9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/plugin/BasePluginService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/plugin/BasePluginService.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.dao.plugin; -import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -223,7 +222,7 @@ public class BasePluginService extends AbstractEntityService implements PluginSe @Override public void deletePluginsByTenantId(TenantId tenantId) { Validator.validateId(tenantId, "Incorrect tenant id for delete plugins request."); - tenantPluginRemover.removeEntitites(tenantId); + tenantPluginRemover.removeEntities(tenantId); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleService.java index a5b34a29d1..b356c90e24 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleService.java @@ -265,7 +265,7 @@ public class BaseRuleService extends AbstractEntityService implements RuleServic @Override public void deleteRulesByTenantId(TenantId tenantId) { validateId(tenantId, "Incorrect tenant id for delete rules request."); - tenantRulesRemover.removeEntitites(tenantId); + tenantRulesRemover.removeEntities(tenantId); } private DataValidator ruleValidator = diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/PaginatedRemover.java b/dao/src/main/java/org/thingsboard/server/dao/service/PaginatedRemover.java index 8bdefd967b..c1c89c2992 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/service/PaginatedRemover.java +++ b/dao/src/main/java/org/thingsboard/server/dao/service/PaginatedRemover.java @@ -25,7 +25,7 @@ public abstract class PaginatedRemover> { private static final int DEFAULT_LIMIT = 100; - public void removeEntitites(I id) { + public void removeEntities(I id) { TextPageLink pageLink = new TextPageLink(DEFAULT_LIMIT); boolean hasNext = true; while (hasNext) { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java index 550424c82a..8fca908f85 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java @@ -178,21 +178,21 @@ public class JpaRelationDao extends JpaAbstractDaoListeningExecutorService imple public Predicate toPredicate(Root root, CriteriaQuery criteriaQuery, CriteriaBuilder criteriaBuilder) { List predicates = new ArrayList<>(); if (from != null) { - Predicate fromIdPredicate = criteriaBuilder.equal(root.get(RELATION_FROM_ID_PROPERTY), from.getId()); + Predicate fromIdPredicate = criteriaBuilder.equal(root.get("fromId"), from.getId()); predicates.add(fromIdPredicate); - Predicate fromEntityTypePredicate = criteriaBuilder.equal(root.get(RELATION_FROM_TYPE_PROPERTY), from.getEntityType().name()); + Predicate fromEntityTypePredicate = criteriaBuilder.equal(root.get("fromType"), from.getEntityType().name()); predicates.add(fromEntityTypePredicate); } if (relationType != null) { - Predicate relationTypePredicate = criteriaBuilder.equal(root.get(RELATION_TYPE_PROPERTY), relationType); + Predicate relationTypePredicate = criteriaBuilder.equal(root.get("relationType"), relationType); predicates.add(relationTypePredicate); } if (typeGroup != null) { - Predicate typeGroupPredicate = criteriaBuilder.equal(root.get(RELATION_TYPE_GROUP_PROPERTY), typeGroup); + Predicate typeGroupPredicate = criteriaBuilder.equal(root.get("relationTypeGroup"), typeGroup); predicates.add(typeGroupPredicate); } if (childType != null) { - Predicate childTypePredicate = criteriaBuilder.equal(root.get(RELATION_TO_TYPE_PROPERTY), childType.name()); + Predicate childTypePredicate = criteriaBuilder.equal(root.get("toType"), childType.name()); predicates.add(childTypePredicate); } return criteriaBuilder.and(predicates.toArray(new Predicate[0])); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java index 5433a13337..e4ab2d402d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/settings/JpaAdminSettingsDao.java @@ -31,7 +31,7 @@ import java.util.UUID; @Component @Slf4j @SqlDao -public class JpaAdminSettingsDao extends JpaAbstractDao implements AdminSettingsDao{ +public class JpaAdminSettingsDao extends JpaAbstractDao implements AdminSettingsDao { @Autowired private AdminSettingsRepository adminSettingsRepository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java index de2f5f9b5e..d4308cf7b3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java @@ -20,10 +20,12 @@ import org.springframework.data.repository.CrudRepository; 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.DaoUtil; import org.thingsboard.server.dao.annotation.SqlDao; import org.thingsboard.server.dao.model.sql.UserEntity; import org.thingsboard.server.dao.sql.JpaAbstractDao; +import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import org.thingsboard.server.dao.user.UserDao; import java.util.List; @@ -36,7 +38,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; */ @Component @SqlDao -public class JpaUserDao extends JpaAbstractDao implements UserDao { +public class JpaUserDao extends JpaAbstractSearchTextDao implements UserDao { @Autowired private UserRepository userRepository; @@ -60,20 +62,26 @@ public class JpaUserDao extends JpaAbstractDao implements User public List findTenantAdmins(UUID tenantId, TextPageLink pageLink) { return DaoUtil.convertDataList( userRepository - .findTenantAdmins( - pageLink.getLimit(), + .findUsersByAuthority( tenantId, - pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); + NULL_UUID, + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + pageLink.getTextSearch(), + Authority.TENANT_ADMIN.name(), + pageLink.getLimit())); } @Override public List findCustomerUsers(UUID tenantId, UUID customerId, TextPageLink pageLink) { return DaoUtil.convertDataList( userRepository - .findCustomerUsers( - pageLink.getLimit(), + .findUsersByAuthority( tenantId, customerId, - pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + pageLink.getTextSearch(), + Authority.CUSTOMER_USER.name(), + pageLink.getLimit())); + } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java index a0fb882b0b..128f45f4c5 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java @@ -33,18 +33,14 @@ public interface UserRepository extends CrudRepository { UserEntity findByEmail(String email); @Query(nativeQuery = true, value = "SELECT * FROM TB_USER WHERE TENANT_ID = :tenantId " + - "AND CUSTOMER_ID IS NULL AND AUTHORITY = 'TENANT_ADMIN' " + + "AND CUSTOMER_ID = :customerId AND AUTHORITY = :authority " + + "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:searchText, '%'))" + "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findTenantAdmins(@Param("limit") int limit, - @Param("tenantId") UUID tenantId, - @Param("idOffset") UUID idOffset); - - @Query(nativeQuery = true, value = "SELECT * FROM TB_USER WHERE TENANT_ID = :tenantId " + - "AND CUSTOMER_ID = :customerId AND AUTHORITY = 'CUSTOMER_USER' " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findCustomerUsers(@Param("limit") int limit, - @Param("tenantId") UUID tenantId, - @Param("customerId") UUID customerId, - @Param("idOffset") UUID idOffset); + List findUsersByAuthority(@Param("tenantId") UUID tenantId, + @Param("customerId") UUID customerId, + @Param("idOffset") UUID idOffset, + @Param("searchText") String searchText, + @Param("authority") String authority, + @Param("limit") int limit); } \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java index 7645b28b1b..678e811681 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java @@ -119,7 +119,7 @@ public class TenantServiceImpl extends AbstractEntityService implements TenantSe @Override public void deleteTenants() { log.trace("Executing deleteTenants"); - tenantsRemover.removeEntitites(DEFAULT_TENANT_REGION); + tenantsRemover.removeEntities(DEFAULT_TENANT_REGION); } private DataValidator tenantValidator = diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java index d8782dbc8c..6b75f62a96 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java @@ -15,14 +15,12 @@ */ package org.thingsboard.server.dao.user; -import static org.thingsboard.server.dao.DaoUtil.getData; import static org.thingsboard.server.dao.service.Validator.validateId; import static org.thingsboard.server.dao.service.Validator.validatePageLink; import static org.thingsboard.server.dao.service.Validator.validateString; import java.util.List; -import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.RandomStringUtils; @@ -48,10 +46,6 @@ import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.PaginatedRemover; import org.thingsboard.server.dao.tenant.TenantDao; -import java.util.List; - -import static org.thingsboard.server.dao.service.Validator.*; - @Service @Slf4j public class UserServiceImpl extends AbstractEntityService implements UserService { @@ -193,7 +187,7 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic public void deleteTenantAdmins(TenantId tenantId) { log.trace("Executing deleteTenantAdmins, tenantId [{}]", tenantId); validateId(tenantId, "Incorrect tenantId " + tenantId); - tenantAdminsRemover.removeEntitites(tenantId); + tenantAdminsRemover.removeEntities(tenantId); } @Override @@ -211,7 +205,7 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic log.trace("Executing deleteCustomerUsers, customerId [{}]", customerId); validateId(tenantId, "Incorrect tenantId " + tenantId); validateId(customerId, "Incorrect customerId " + customerId); - new CustomerUsersRemover(tenantId).removeEntitites(customerId); + new CustomerUsersRemover(tenantId).removeEntities(customerId); } private DataValidator userValidator = diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java index 9e90acaf3e..de20ff0ada 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java @@ -145,7 +145,7 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService { public void deleteWidgetsBundlesByTenantId(TenantId tenantId) { log.trace("Executing deleteWidgetsBundlesByTenantId, tenantId [{}]", tenantId); Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); - tenantWidgetsBundleRemover.removeEntitites(tenantId); + tenantWidgetsBundleRemover.removeEntities(tenantId); } private DataValidator widgetsBundleValidator = diff --git a/dao/src/main/resources/postgres/schema.sql b/dao/src/main/resources/postgres/schema.sql index da500209b6..3f77e81f42 100644 --- a/dao/src/main/resources/postgres/schema.sql +++ b/dao/src/main/resources/postgres/schema.sql @@ -17,7 +17,7 @@ CREATE TABLE IF NOT EXISTS admin_settings ( id uuid NOT NULL CONSTRAINT admin_settings_pkey PRIMARY KEY, - json_value varchar, + json_value text, key character varying(255) ); @@ -25,7 +25,7 @@ CREATE TABLE IF NOT EXISTS alarm ( id uuid NOT NULL CONSTRAINT alarm_pkey PRIMARY KEY, ack_ts bigint, clear_ts bigint, - additional_info varchar, + additional_info text, end_ts bigint, originator_id uuid, originator_type integer, @@ -39,7 +39,7 @@ CREATE TABLE IF NOT EXISTS alarm ( CREATE TABLE IF NOT EXISTS asset ( id uuid NOT NULL CONSTRAINT asset_pkey PRIMARY KEY, - additional_info varchar, + additional_info text, customer_id uuid, name character varying(255), search_text character varying(255), @@ -64,7 +64,7 @@ CREATE TABLE IF NOT EXISTS component_descriptor ( id uuid NOT NULL CONSTRAINT component_descriptor_pkey PRIMARY KEY, actions character varying(255), clazz character varying(255), - configuration_descriptor varchar, + configuration_descriptor text, name character varying(255), scope character varying(255), search_text character varying(255), @@ -73,7 +73,7 @@ CREATE TABLE IF NOT EXISTS component_descriptor ( CREATE TABLE IF NOT EXISTS customer ( id uuid NOT NULL CONSTRAINT customer_pkey PRIMARY KEY, - additional_info varchar, + additional_info text, address character varying(255), address2 character varying(255), city character varying(255), @@ -89,7 +89,7 @@ CREATE TABLE IF NOT EXISTS customer ( CREATE TABLE IF NOT EXISTS dashboard ( id uuid NOT NULL CONSTRAINT dashboard_pkey PRIMARY KEY, - configuration varchar, + configuration text, customer_id uuid, search_text character varying(255), tenant_id uuid, @@ -98,7 +98,7 @@ CREATE TABLE IF NOT EXISTS dashboard ( CREATE TABLE IF NOT EXISTS device ( id uuid NOT NULL CONSTRAINT device_pkey PRIMARY KEY, - additional_info varchar, + additional_info text, customer_id uuid, type character varying(255), name character varying(255), @@ -116,7 +116,7 @@ CREATE TABLE IF NOT EXISTS device_credentials ( CREATE TABLE IF NOT EXISTS event ( id uuid NOT NULL CONSTRAINT event_pkey PRIMARY KEY, - body varchar, + body text, entity_id uuid, entity_type character varying(255), event_type character varying(255), @@ -126,10 +126,10 @@ CREATE TABLE IF NOT EXISTS event ( CREATE TABLE IF NOT EXISTS plugin ( id uuid NOT NULL CONSTRAINT plugin_pkey PRIMARY KEY, - additional_info varchar, + additional_info text, api_token character varying(255), plugin_class character varying(255), - configuration varchar, + configuration text, name character varying(255), public_access boolean, search_text character varying(255), @@ -144,18 +144,18 @@ CREATE TABLE IF NOT EXISTS relation ( to_type character varying(255), relation_type_group character varying(255), relation_type character varying(255), - additional_info varchar, + additional_info text, CONSTRAINT relation_unq_key UNIQUE (from_id, from_type, relation_type_group, relation_type, to_id, to_type) ); CREATE TABLE IF NOT EXISTS rule ( id uuid NOT NULL CONSTRAINT rule_pkey PRIMARY KEY, - action varchar, - additional_info varchar, - filters varchar, + action text, + additional_info text, + filters text, name character varying(255), plugin_token character varying(255), - processor varchar, + processor text, search_text character varying(255), state character varying(255), tenant_id uuid, @@ -164,7 +164,7 @@ CREATE TABLE IF NOT EXISTS rule ( CREATE TABLE IF NOT EXISTS tb_user ( id uuid NOT NULL CONSTRAINT tb_user_pkey PRIMARY KEY, - additional_info varchar, + additional_info text, authority character varying(255), customer_id uuid, email character varying(255) UNIQUE, @@ -176,7 +176,7 @@ CREATE TABLE IF NOT EXISTS tb_user ( CREATE TABLE IF NOT EXISTS tenant ( id uuid NOT NULL CONSTRAINT tenant_pkey PRIMARY KEY, - additional_info varchar, + additional_info text, address character varying(255), address2 character varying(255), city character varying(255), @@ -227,7 +227,7 @@ CREATE TABLE IF NOT EXISTS widget_type ( id uuid NOT NULL CONSTRAINT widget_type_pkey PRIMARY KEY, alias character varying(255), bundle_alias character varying(255), - descriptor varchar, + descriptor text, name character varying(255), tenant_id uuid ); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/RelationServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/RelationServiceImplTest.java index f7e47ce526..cb1fbc5d36 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/RelationServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/RelationServiceImplTest.java @@ -16,13 +16,11 @@ package org.thingsboard.server.dao.service; import com.datastax.driver.core.utils.UUIDs; -import com.google.common.util.concurrent.ListenableFuture; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.thingsboard.server.common.data.EntityType; -import org.thingsboard.server.common.data.asset.Asset; import org.thingsboard.server.common.data.id.AssetId; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.relation.EntityRelation; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/RelationServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/RelationServiceTest.java deleted file mode 100644 index 8a082fc1da..0000000000 --- a/dao/src/test/java/org/thingsboard/server/dao/service/RelationServiceTest.java +++ /dev/null @@ -1,284 +0,0 @@ -/** - * 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.service; - -import com.datastax.driver.core.utils.UUIDs; -import com.google.common.util.concurrent.ListenableFuture; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.thingsboard.server.common.data.EntityType; -import org.thingsboard.server.common.data.asset.Asset; -import org.thingsboard.server.common.data.id.AssetId; -import org.thingsboard.server.common.data.id.DeviceId; -import org.thingsboard.server.common.data.relation.EntityRelation; -import org.thingsboard.server.common.data.relation.RelationTypeGroup; -import org.thingsboard.server.dao.exception.DataValidationException; -import org.thingsboard.server.dao.relation.EntityRelationsQuery; -import org.thingsboard.server.dao.relation.EntitySearchDirection; -import org.thingsboard.server.dao.relation.EntityTypeFilter; -import org.thingsboard.server.dao.relation.RelationsSearchParameters; - -import java.util.Collections; -import java.util.List; -import java.util.concurrent.ExecutionException; - -public class RelationServiceTest extends AbstractServiceTest { - - @Before - public void before() { - } - - @After - public void after() { - } - - @Test - public void testSaveRelation() throws ExecutionException, InterruptedException { - AssetId parentId = new AssetId(UUIDs.timeBased()); - AssetId childId = new AssetId(UUIDs.timeBased()); - - EntityRelation relation = new EntityRelation(parentId, childId, EntityRelation.CONTAINS_TYPE); - - Assert.assertTrue(saveRelation(relation)); - - Assert.assertTrue(relationService.checkRelation(parentId, childId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.COMMON).get()); - - Assert.assertFalse(relationService.checkRelation(parentId, childId, "NOT_EXISTING_TYPE", RelationTypeGroup.COMMON).get()); - - Assert.assertFalse(relationService.checkRelation(childId, parentId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.COMMON).get()); - - Assert.assertFalse(relationService.checkRelation(childId, parentId, "NOT_EXISTING_TYPE", RelationTypeGroup.COMMON).get()); - } - - @Test - public void testDeleteRelation() throws ExecutionException, InterruptedException { - AssetId parentId = new AssetId(UUIDs.timeBased()); - AssetId childId = new AssetId(UUIDs.timeBased()); - AssetId subChildId = new AssetId(UUIDs.timeBased()); - - EntityRelation relationA = new EntityRelation(parentId, childId, EntityRelation.CONTAINS_TYPE); - EntityRelation relationB = new EntityRelation(childId, subChildId, EntityRelation.CONTAINS_TYPE); - - saveRelation(relationA); - saveRelation(relationB); - - Assert.assertTrue(relationService.deleteRelation(relationA).get()); - - Assert.assertFalse(relationService.checkRelation(parentId, childId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.COMMON).get()); - - Assert.assertTrue(relationService.checkRelation(childId, subChildId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.COMMON).get()); - - Assert.assertTrue(relationService.deleteRelation(childId, subChildId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.COMMON).get()); - } - - @Test - public void testDeleteEntityRelations() throws ExecutionException, InterruptedException { - AssetId parentId = new AssetId(UUIDs.timeBased()); - AssetId childId = new AssetId(UUIDs.timeBased()); - AssetId subChildId = new AssetId(UUIDs.timeBased()); - - EntityRelation relationA = new EntityRelation(parentId, childId, EntityRelation.CONTAINS_TYPE); - EntityRelation relationB = new EntityRelation(childId, subChildId, EntityRelation.CONTAINS_TYPE); - - saveRelation(relationA); - saveRelation(relationB); - - Assert.assertTrue(relationService.deleteEntityRelations(childId).get()); - - Assert.assertFalse(relationService.checkRelation(parentId, childId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.COMMON).get()); - - Assert.assertFalse(relationService.checkRelation(childId, subChildId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.COMMON).get()); - } - - @Test - public void testFindFrom() throws ExecutionException, InterruptedException { - AssetId parentA = new AssetId(UUIDs.timeBased()); - AssetId parentB = new AssetId(UUIDs.timeBased()); - AssetId childA = new AssetId(UUIDs.timeBased()); - AssetId childB = new AssetId(UUIDs.timeBased()); - - EntityRelation relationA1 = new EntityRelation(parentA, childA, EntityRelation.CONTAINS_TYPE); - EntityRelation relationA2 = new EntityRelation(parentA, childB, EntityRelation.CONTAINS_TYPE); - - EntityRelation relationB1 = new EntityRelation(parentB, childA, EntityRelation.MANAGES_TYPE); - EntityRelation relationB2 = new EntityRelation(parentB, childB, EntityRelation.MANAGES_TYPE); - - saveRelation(relationA1); - saveRelation(relationA2); - - saveRelation(relationB1); - saveRelation(relationB2); - - List relations = relationService.findByFrom(parentA, RelationTypeGroup.COMMON).get(); - Assert.assertEquals(2, relations.size()); - for (EntityRelation relation : relations) { - Assert.assertEquals(EntityRelation.CONTAINS_TYPE, relation.getType()); - Assert.assertEquals(parentA, relation.getFrom()); - Assert.assertTrue(childA.equals(relation.getTo()) || childB.equals(relation.getTo())); - } - - relations = relationService.findByFromAndType(parentA, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.COMMON).get(); - Assert.assertEquals(2, relations.size()); - - relations = relationService.findByFromAndType(parentA, EntityRelation.MANAGES_TYPE, RelationTypeGroup.COMMON).get(); - Assert.assertEquals(0, relations.size()); - - relations = relationService.findByFrom(parentB, RelationTypeGroup.COMMON).get(); - Assert.assertEquals(2, relations.size()); - for (EntityRelation relation : relations) { - Assert.assertEquals(EntityRelation.MANAGES_TYPE, relation.getType()); - Assert.assertEquals(parentB, relation.getFrom()); - Assert.assertTrue(childA.equals(relation.getTo()) || childB.equals(relation.getTo())); - } - - relations = relationService.findByFromAndType(parentB, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.COMMON).get(); - Assert.assertEquals(0, relations.size()); - - relations = relationService.findByFromAndType(parentB, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.COMMON).get(); - Assert.assertEquals(0, relations.size()); - } - - private Boolean saveRelation(EntityRelation relationA1) throws ExecutionException, InterruptedException { - return relationService.saveRelation(relationA1).get(); - } - - @Test - public void testFindTo() throws ExecutionException, InterruptedException { - AssetId parentA = new AssetId(UUIDs.timeBased()); - AssetId parentB = new AssetId(UUIDs.timeBased()); - AssetId childA = new AssetId(UUIDs.timeBased()); - AssetId childB = new AssetId(UUIDs.timeBased()); - - EntityRelation relationA1 = new EntityRelation(parentA, childA, EntityRelation.CONTAINS_TYPE); - EntityRelation relationA2 = new EntityRelation(parentA, childB, EntityRelation.CONTAINS_TYPE); - - EntityRelation relationB1 = new EntityRelation(parentB, childA, EntityRelation.MANAGES_TYPE); - EntityRelation relationB2 = new EntityRelation(parentB, childB, EntityRelation.MANAGES_TYPE); - - saveRelation(relationA1); - saveRelation(relationA2); - - saveRelation(relationB1); - saveRelation(relationB2); - - // Data propagation to views is async - Thread.sleep(3000); - - List relations = relationService.findByTo(childA, RelationTypeGroup.COMMON).get(); - Assert.assertEquals(2, relations.size()); - for (EntityRelation relation : relations) { - Assert.assertEquals(childA, relation.getTo()); - Assert.assertTrue(parentA.equals(relation.getFrom()) || parentB.equals(relation.getFrom())); - } - - relations = relationService.findByToAndType(childA, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.COMMON).get(); - Assert.assertEquals(1, relations.size()); - - relations = relationService.findByToAndType(childB, EntityRelation.MANAGES_TYPE, RelationTypeGroup.COMMON).get(); - Assert.assertEquals(1, relations.size()); - - relations = relationService.findByToAndType(parentA, EntityRelation.MANAGES_TYPE, RelationTypeGroup.COMMON).get(); - Assert.assertEquals(0, relations.size()); - - relations = relationService.findByToAndType(parentB, EntityRelation.MANAGES_TYPE, RelationTypeGroup.COMMON).get(); - Assert.assertEquals(0, relations.size()); - - relations = relationService.findByTo(childB, RelationTypeGroup.COMMON).get(); - Assert.assertEquals(2, relations.size()); - for (EntityRelation relation : relations) { - Assert.assertEquals(childB, relation.getTo()); - Assert.assertTrue(parentA.equals(relation.getFrom()) || parentB.equals(relation.getFrom())); - } - } - - @Test - public void testCyclicRecursiveRelation() throws ExecutionException, InterruptedException { - // A -> B -> C -> A - AssetId assetA = new AssetId(UUIDs.timeBased()); - AssetId assetB = new AssetId(UUIDs.timeBased()); - AssetId assetC = new AssetId(UUIDs.timeBased()); - - EntityRelation relationA = new EntityRelation(assetA, assetB, EntityRelation.CONTAINS_TYPE); - EntityRelation relationB = new EntityRelation(assetB, assetC, EntityRelation.CONTAINS_TYPE); - EntityRelation relationC = new EntityRelation(assetC, assetA, EntityRelation.CONTAINS_TYPE); - - saveRelation(relationA); - saveRelation(relationB); - saveRelation(relationC); - - EntityRelationsQuery query = new EntityRelationsQuery(); - query.setParameters(new RelationsSearchParameters(assetA, EntitySearchDirection.FROM, -1)); - query.setFilters(Collections.singletonList(new EntityTypeFilter(EntityRelation.CONTAINS_TYPE, Collections.singletonList(EntityType.ASSET)))); - List relations = relationService.findByQuery(query).get(); - Assert.assertEquals(3, relations.size()); - Assert.assertTrue(relations.contains(relationA)); - Assert.assertTrue(relations.contains(relationB)); - Assert.assertTrue(relations.contains(relationC)); - } - - @Test - public void testRecursiveRelation() throws ExecutionException, InterruptedException { - // A -> B -> [C,D] - AssetId assetA = new AssetId(UUIDs.timeBased()); - AssetId assetB = new AssetId(UUIDs.timeBased()); - AssetId assetC = new AssetId(UUIDs.timeBased()); - DeviceId deviceD = new DeviceId(UUIDs.timeBased()); - - EntityRelation relationAB = new EntityRelation(assetA, assetB, EntityRelation.CONTAINS_TYPE); - EntityRelation relationBC = new EntityRelation(assetB, assetC, EntityRelation.CONTAINS_TYPE); - EntityRelation relationBD = new EntityRelation(assetB, deviceD, EntityRelation.CONTAINS_TYPE); - - - saveRelation(relationAB); - saveRelation(relationBC); - saveRelation(relationBD); - - EntityRelationsQuery query = new EntityRelationsQuery(); - query.setParameters(new RelationsSearchParameters(assetA, EntitySearchDirection.FROM, -1)); - query.setFilters(Collections.singletonList(new EntityTypeFilter(EntityRelation.CONTAINS_TYPE, Collections.singletonList(EntityType.ASSET)))); - List relations = relationService.findByQuery(query).get(); - Assert.assertEquals(2, relations.size()); - Assert.assertTrue(relations.contains(relationAB)); - Assert.assertTrue(relations.contains(relationBC)); - } - - - @Test(expected = DataValidationException.class) - public void testSaveRelationWithEmptyFrom() throws ExecutionException, InterruptedException { - EntityRelation relation = new EntityRelation(); - relation.setTo(new AssetId(UUIDs.timeBased())); - relation.setType(EntityRelation.CONTAINS_TYPE); - Assert.assertTrue(saveRelation(relation)); - } - - @Test(expected = DataValidationException.class) - public void testSaveRelationWithEmptyTo() throws ExecutionException, InterruptedException { - EntityRelation relation = new EntityRelation(); - relation.setFrom(new AssetId(UUIDs.timeBased())); - relation.setType(EntityRelation.CONTAINS_TYPE); - Assert.assertTrue(saveRelation(relation)); - } - - @Test(expected = DataValidationException.class) - public void testSaveRelationWithEmptyType() throws ExecutionException, InterruptedException { - EntityRelation relation = new EntityRelation(); - relation.setFrom(new AssetId(UUIDs.timeBased())); - relation.setTo(new AssetId(UUIDs.timeBased())); - Assert.assertTrue(saveRelation(relation)); - } -} diff --git a/dao/src/test/resources/jpa-test.properties b/dao/src/test/resources/jpa-test.properties index 06a7296e39..58ca25f1c2 100644 --- a/dao/src/test/resources/jpa-test.properties +++ b/dao/src/test/resources/jpa-test.properties @@ -5,8 +5,6 @@ sql.enabled=true spring.jpa.show-sql=false spring.jpa.hibernate.ddl-auto=validate -spring.datasource.driverClassName=org.h2.Driver -spring.datasource.url=jdbc:h2:mem:test;MODE=PostgreSQL -spring.datasource.schema=classpath:postgres/schema.sql -spring.datasource.data=classpath:postgres/system-data.sql;classpath:system-test.sql - +spring.datasource.url=jdbc:postgresql://localhost:5432/thingsboard +spring.datasource.username=postgres +spring.datasource.password=postgres \ No newline at end of file diff --git a/dao/src/test/resources/system-test.sql b/dao/src/test/resources/system-test.sql new file mode 100644 index 0000000000..57d49ddad9 --- /dev/null +++ b/dao/src/test/resources/system-test.sql @@ -0,0 +1,2 @@ +TRUNCATE TABLE plugin; +TRUNCATE TABLE rule; \ No newline at end of file From 3c47789a3f8343038da2228c33acbfd29845082d Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Mon, 19 Jun 2017 20:28:28 +0300 Subject: [PATCH 57/69] JPA Dao misc fixes due to test failures --- .../dao/model/sql/RelationCompositeKey.java | 2 +- .../server/dao/model/sql/TsKvLatestEntity.java | 14 ++++++++++++-- .../server/dao/sql/event/JpaBaseEventDao.java | 2 +- .../dao/sql/relation/JpaRelationDao.java | 18 +++++++----------- .../dao/sql/relation/RelationRepository.java | 4 ++++ .../dao/sql/timeseries/JpaTimeseriesDao.java | 5 +++-- 6 files changed, 28 insertions(+), 17 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java index 31fc832c30..4333c5ec5b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java @@ -36,8 +36,8 @@ public class RelationCompositeKey implements Serializable { private String fromType; private UUID toId; private String toType; - private String relationTypeGroup; private String relationType; + private String relationTypeGroup; public RelationCompositeKey(EntityRelation relation) { this.fromId = relation.getFrom().getId(); diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestEntity.java index 803b89a64e..9abcdb9280 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestEntity.java @@ -18,7 +18,7 @@ package org.thingsboard.server.dao.model.sql; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import org.thingsboard.server.common.data.kv.TsKvEntry; +import org.thingsboard.server.common.data.kv.*; import org.thingsboard.server.dao.model.ToData; import javax.persistence.*; @@ -63,6 +63,16 @@ public final class TsKvLatestEntity implements ToData { @Override public TsKvEntry toData() { - return null; + KvEntry kvEntry = null; + if (strValue != null) { + kvEntry = new StringDataEntry(key, strValue); + } else if (longValue != null) { + kvEntry = new LongDataEntry(key, longValue); + } else if (doubleValue != null) { + kvEntry = new DoubleDataEntry(key, doubleValue); + } else if (booleanValue != null) { + kvEntry = new BooleanDataEntry(key, booleanValue); + } + return new BasicTsKvEntry(ts, kvEntry); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java index 37ef0582d9..20fba3aea0 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java @@ -100,7 +100,7 @@ public class JpaBaseEventDao extends JpaAbstractSearchTimeDao findEvents(UUID tenantId, EntityId entityId, String eventType, TimePageLink pageLink) { - Specification timeSearchSpec = JpaAbstractSearchTimeDao.getTimeSearchPageSpec(pageLink, ID_PROPERTY); + Specification timeSearchSpec = JpaAbstractSearchTimeDao.getTimeSearchPageSpec(pageLink, "id"); Specification fieldsSpec = getEntityFieldsSpec(tenantId, entityId, eventType); Sort.Direction sortDirection = pageLink.isAscOrder() ? Sort.Direction.ASC : Sort.Direction.DESC; Pageable pageable = new PageRequest(0, pageLink.getLimit(), sortDirection, ID_PROPERTY); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java index 8fca908f85..169bc6d02d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/JpaRelationDao.java @@ -144,29 +144,25 @@ public class JpaRelationDao extends JpaAbstractDaoListeningExecutorService imple @Override public ListenableFuture deleteOutboundRelations(EntityId entity) { - RelationEntity relationEntity = new RelationEntity(); - relationEntity.setFromId(entity.getId()); - relationEntity.setFromType(entity.getEntityType().name()); - return service.submit( () -> { boolean relationExistsBeforeDelete = relationRepository - .findAllByFromIdAndFromType(relationEntity.getFromId(), relationEntity.getFromType()) + .findAllByFromIdAndFromType(entity.getId(), entity.getEntityType().name()) .size() > 0; - relationRepository.delete(relationEntity); + relationRepository.deleteByFromIdAndFromType(entity.getId(), entity.getEntityType().name()); return relationExistsBeforeDelete; }); } @Override public ListenableFuture> findRelations(EntityId from, String relationType, RelationTypeGroup typeGroup, EntityType childType, TimePageLink pageLink) { - Specification timeSearchSpec = JpaAbstractSearchTimeDao.getTimeSearchPageSpec(pageLink, RELATION_TO_ID_PROPERTY); + Specification timeSearchSpec = JpaAbstractSearchTimeDao.getTimeSearchPageSpec(pageLink, "toId"); Specification fieldsSpec = getEntityFieldsSpec(from, relationType, typeGroup, childType); Pageable pageable = new PageRequest(0, pageLink.getLimit(), new Sort( - new Order(ASC, RELATION_TYPE_GROUP_PROPERTY), - new Order(ASC, RELATION_TYPE_PROPERTY), - new Order(ASC, RELATION_TO_TYPE_PROPERTY)) + new Order(ASC, "relationTypeGroup"), + new Order(ASC, "relationType"), + new Order(ASC, "toType")) ); return service.submit(() -> DaoUtil.convertDataList(relationRepository.findAll(where(timeSearchSpec).and(fieldsSpec), pageable).getContent())); @@ -188,7 +184,7 @@ public class JpaRelationDao extends JpaAbstractDaoListeningExecutorService imple predicates.add(relationTypePredicate); } if (typeGroup != null) { - Predicate typeGroupPredicate = criteriaBuilder.equal(root.get("relationTypeGroup"), typeGroup); + Predicate typeGroupPredicate = criteriaBuilder.equal(root.get("relationTypeGroup"), typeGroup.name()); predicates.add(typeGroupPredicate); } if (childType != null) { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java index 2f0cd7a914..5f453b4113 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/relation/RelationRepository.java @@ -21,6 +21,7 @@ import org.thingsboard.server.dao.annotation.SqlDao; import org.thingsboard.server.dao.model.sql.RelationCompositeKey; import org.thingsboard.server.dao.model.sql.RelationEntity; +import javax.transaction.Transactional; import java.util.List; import java.util.UUID; @@ -48,4 +49,7 @@ public interface RelationRepository List findAllByFromIdAndFromType(UUID fromId, String fromType); + + @Transactional + List deleteByFromIdAndFromType(UUID fromId, String fromType); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java index df37ae74c0..7df7605ca0 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java @@ -46,7 +46,8 @@ public class JpaTimeseriesDao extends JpaAbstractDaoListeningExecutorService imp @Override public ListenableFuture> findAllAsync(EntityId entityId, List queries) { - return null; + // TODO - Add implementation + return service.submit(() -> null); } private ListenableFuture> findAllAsync(EntityId entityId, TsKvQuery query) { @@ -92,7 +93,7 @@ public class JpaTimeseriesDao extends JpaAbstractDaoListeningExecutorService imp @Override public ListenableFuture savePartition(EntityId entityId, long tsKvEntryTs, String key, long ttl) { - return null; + return service.submit(() -> null); } @Override From b88ce86638272641f2a83b09ce4cf1e56d62c36c Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Tue, 20 Jun 2017 17:20:00 +0300 Subject: [PATCH 58/69] Data annotation contains toString, equals and hashcode impls --- .../thingsboard/server/dao/cassandra/CassandraCluster.java | 2 +- .../thingsboard/server/dao/device/DeviceSearchQuery.java | 2 +- .../server/dao/model/sql/AdminSettingsEntity.java | 4 ---- .../org/thingsboard/server/dao/model/sql/AlarmEntity.java | 5 ----- .../org/thingsboard/server/dao/model/sql/AssetEntity.java | 5 ----- .../server/dao/model/sql/AttributeKvCompositeKey.java | 6 +++--- .../thingsboard/server/dao/model/sql/AttributeKvEntity.java | 4 ---- .../server/dao/model/sql/ComponentDescriptorEntity.java | 4 ---- .../thingsboard/server/dao/model/sql/CustomerEntity.java | 4 ---- .../thingsboard/server/dao/model/sql/DashboardEntity.java | 4 ---- .../server/dao/model/sql/DashboardInfoEntity.java | 4 ---- .../server/dao/model/sql/DeviceCredentialsEntity.java | 4 ---- .../org/thingsboard/server/dao/model/sql/DeviceEntity.java | 4 ---- .../org/thingsboard/server/dao/model/sql/EventEntity.java | 4 ---- .../server/dao/model/sql/PluginMetaDataEntity.java | 4 ---- .../server/dao/model/sql/RelationCompositeKey.java | 6 +++--- .../thingsboard/server/dao/model/sql/RelationEntity.java | 4 ---- .../server/dao/model/sql/RuleMetaDataEntity.java | 4 ---- .../server/dao/model/sql/TenantDeviceTypeEntity.java | 4 ---- .../org/thingsboard/server/dao/model/sql/TenantEntity.java | 4 ---- .../thingsboard/server/dao/model/sql/TsKvCompositeKey.java | 6 +++--- .../org/thingsboard/server/dao/model/sql/TsKvEntity.java | 4 ---- .../server/dao/model/sql/TsKvLatestCompositeKey.java | 2 -- .../thingsboard/server/dao/model/sql/TsKvLatestEntity.java | 4 ---- .../server/dao/model/sql/UserCredentialsEntity.java | 4 ---- .../org/thingsboard/server/dao/model/sql/UserEntity.java | 6 ------ .../thingsboard/server/dao/model/sql/WidgetTypeEntity.java | 4 ---- .../server/dao/model/sql/WidgetsBundleEntity.java | 4 ---- .../server/dao/sql/widget/JpaWidgetsBundleDaoTest.java | 1 - 29 files changed, 11 insertions(+), 106 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java index 8649122248..e3b6bfa786 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java +++ b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java @@ -35,9 +35,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +@Data @Component @Slf4j -@Data @NoSqlDao public class CassandraCluster { diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceSearchQuery.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceSearchQuery.java index eb9d9dee3d..c57dd93694 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceSearchQuery.java +++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceSearchQuery.java @@ -18,9 +18,9 @@ package org.thingsboard.server.dao.device; import lombok.Data; import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.relation.EntityRelation; -import org.thingsboard.server.dao.relation.RelationsSearchParameters; import org.thingsboard.server.dao.relation.EntityRelationsQuery; import org.thingsboard.server.dao.relation.EntityTypeFilter; +import org.thingsboard.server.dao.relation.RelationsSearchParameters; import javax.annotation.Nullable; import java.util.Collections; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java index 717caf52ff..e268c4577f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java @@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.AdminSettings; @@ -36,8 +34,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Entity @TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ADMIN_SETTINGS_COLUMN_FAMILY_NAME) -@EqualsAndHashCode -@ToString public final class AdminSettingsEntity implements BaseEntity { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java index c6642d6dbd..d9f6623f0b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java @@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.EntityType; @@ -31,7 +29,6 @@ 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.JacksonUtil; import org.thingsboard.server.dao.util.JsonStringType; import javax.persistence.*; @@ -43,8 +40,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Entity @TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ALARM_COLUMN_FAMILY_NAME) -@EqualsAndHashCode -@ToString public final class AlarmEntity implements BaseEntity { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java index 6c05fb7879..bd24fbdd06 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java @@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.asset.Asset; @@ -28,7 +26,6 @@ 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.JacksonUtil; import org.thingsboard.server.dao.util.JsonStringType; import javax.persistence.*; @@ -40,8 +37,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Entity @TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ASSET_COLUMN_FAMILY_NAME) -@EqualsAndHashCode -@ToString public final class AssetEntity implements SearchTextEntity { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java index 830b73575d..7424e1fb89 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java @@ -15,7 +15,9 @@ */ package org.thingsboard.server.dao.model.sql; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.UUID; @@ -23,8 +25,6 @@ import java.util.UUID; @Data @AllArgsConstructor @NoArgsConstructor -@EqualsAndHashCode -@ToString public class AttributeKvCompositeKey implements Serializable { private String entityType; private UUID entityId; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java index dd3f28362f..2ea58afcf2 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java @@ -16,8 +16,6 @@ package org.thingsboard.server.dao.model.sql; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.thingsboard.server.common.data.kv.*; import org.thingsboard.server.dao.model.ToData; @@ -31,8 +29,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Entity @Table(name = "attribute_kv") @IdClass(AttributeKvCompositeKey.class) -@EqualsAndHashCode -@ToString public class AttributeKvEntity implements ToData, Serializable { @Id diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java index 2843762dcd..2da59a7552 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java @@ -17,8 +17,6 @@ package org.thingsboard.server.dao.model.sql; import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.id.ComponentDescriptorId; @@ -36,8 +34,6 @@ import java.util.UUID; @Entity @TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ModelConstants.COMPONENT_DESCRIPTOR_COLUMN_FAMILY_NAME) -@EqualsAndHashCode -@ToString public class ComponentDescriptorEntity implements SearchTextEntity { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java index b9b810f667..12c4980092 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java @@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.Customer; @@ -36,8 +34,6 @@ import java.util.UUID; @Entity @TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ModelConstants.CUSTOMER_COLUMN_FAMILY_NAME) -@EqualsAndHashCode -@ToString public final class CustomerEntity implements SearchTextEntity { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java index 82c9fa1722..2153db2fa8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java @@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.Dashboard; @@ -37,8 +35,6 @@ import java.util.UUID; @Entity @TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME) -@EqualsAndHashCode -@ToString public final class DashboardEntity implements SearchTextEntity { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java index 9a2e5110e3..024c05be63 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java @@ -17,8 +17,6 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.thingsboard.server.common.data.DashboardInfo; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DashboardId; @@ -32,8 +30,6 @@ import java.util.UUID; @Data @Entity @Table(name = ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME) -@EqualsAndHashCode -@ToString public class DashboardInfoEntity implements SearchTextEntity { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java index cf31775c67..cc36fc0159 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java @@ -17,8 +17,6 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.thingsboard.server.common.data.id.DeviceCredentialsId; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.security.DeviceCredentials; @@ -32,8 +30,6 @@ import java.util.UUID; @Data @Entity @Table(name = ModelConstants.DEVICE_CREDENTIALS_COLUMN_FAMILY_NAME) -@EqualsAndHashCode -@ToString public final class DeviceCredentialsEntity implements BaseEntity { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java index 02e8c2804a..06c90658ec 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java @@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.Device; @@ -37,8 +35,6 @@ import java.util.UUID; @Entity @TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ModelConstants.DEVICE_COLUMN_FAMILY_NAME) -@EqualsAndHashCode -@ToString public final class DeviceEntity implements SearchTextEntity { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java index 7384e37e9b..033aaa5fdf 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java @@ -18,9 +18,7 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.EntityType; @@ -39,8 +37,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = EVENT_COLUMN_FAMILY_NAME) @NoArgsConstructor -@EqualsAndHashCode -@ToString public class EventEntity implements BaseEntity { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java index 66617be1d4..3972310d3d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java @@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.id.PluginId; @@ -37,8 +35,6 @@ import java.util.UUID; @Entity @TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ModelConstants.PLUGIN_COLUMN_FAMILY_NAME) -@EqualsAndHashCode -@ToString public class PluginMetaDataEntity implements SearchTextEntity { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java index 4333c5ec5b..21e6635be8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java @@ -15,7 +15,9 @@ */ package org.thingsboard.server.dao.model.sql; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.thingsboard.server.common.data.relation.EntityRelation; import javax.persistence.Transient; @@ -25,8 +27,6 @@ import java.util.UUID; @NoArgsConstructor @AllArgsConstructor @Data -@EqualsAndHashCode -@ToString public class RelationCompositeKey implements Serializable { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java index 78c96d987c..3ee09d42ae 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java @@ -17,8 +17,6 @@ package org.thingsboard.server.dao.model.sql; import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.id.EntityIdFactory; @@ -37,8 +35,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = RELATION_COLUMN_FAMILY_NAME) @IdClass(RelationCompositeKey.class) -@EqualsAndHashCode -@ToString public final class RelationEntity implements ToData { @Id diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java index b1d47c75cb..6191672c9e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java @@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.id.RuleId; @@ -38,8 +36,6 @@ import java.util.UUID; @Entity @TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ModelConstants.RULE_COLUMN_FAMILY_NAME) -@EqualsAndHashCode -@ToString public class RuleMetaDataEntity implements SearchTextEntity { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeEntity.java index db818a0fea..3b717505cc 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeEntity.java @@ -17,15 +17,11 @@ package org.thingsboard.server.dao.model.sql; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import java.util.UUID; @AllArgsConstructor @Data -@EqualsAndHashCode -@ToString public class TenantDeviceTypeEntity { private UUID tenantId; private String type; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java index 327ad26206..755ca8c64c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java @@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.Tenant; @@ -35,8 +33,6 @@ import java.util.UUID; @Entity @TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ModelConstants.TENANT_COLUMN_FAMILY_NAME) -@EqualsAndHashCode -@ToString public final class TenantEntity implements SearchTextEntity { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvCompositeKey.java index 87948df3b1..48fc75c152 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvCompositeKey.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvCompositeKey.java @@ -15,7 +15,9 @@ */ package org.thingsboard.server.dao.model.sql; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import javax.persistence.Transient; import java.io.Serializable; @@ -24,8 +26,6 @@ import java.util.UUID; @Data @AllArgsConstructor @NoArgsConstructor -@EqualsAndHashCode -@ToString public class TsKvCompositeKey implements Serializable{ @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvEntity.java index 7d6901ddfa..603da6f3a4 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvEntity.java @@ -16,8 +16,6 @@ package org.thingsboard.server.dao.model.sql; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.thingsboard.server.common.data.kv.TsKvEntry; import org.thingsboard.server.dao.model.ToData; @@ -30,8 +28,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Entity @Table(name = "ts_kv") @IdClass(TsKvCompositeKey.class) -@EqualsAndHashCode -@ToString public final class TsKvEntity implements ToData { @Id diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestCompositeKey.java index 32b02be80e..ab6006f610 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestCompositeKey.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestCompositeKey.java @@ -24,8 +24,6 @@ import java.util.UUID; @Data @NoArgsConstructor @AllArgsConstructor -@EqualsAndHashCode -@ToString public class TsKvLatestCompositeKey implements Serializable{ @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestEntity.java index 9abcdb9280..b9a4543e23 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestEntity.java @@ -16,8 +16,6 @@ package org.thingsboard.server.dao.model.sql; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.thingsboard.server.common.data.kv.*; import org.thingsboard.server.dao.model.ToData; @@ -30,8 +28,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @Entity @Table(name = "ts_kv_latest") @IdClass(TsKvLatestCompositeKey.class) -@EqualsAndHashCode -@ToString public final class TsKvLatestEntity implements ToData { @Id diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java index 97d2a8c088..999b78b41b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java @@ -17,8 +17,6 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.thingsboard.server.common.data.id.UserCredentialsId; import org.thingsboard.server.common.data.id.UserId; import org.thingsboard.server.common.data.security.UserCredentials; @@ -31,8 +29,6 @@ import java.util.UUID; @Data @Entity @Table(name = ModelConstants.USER_CREDENTIALS_COLUMN_FAMILY_NAME) -@EqualsAndHashCode -@ToString public final class UserCredentialsEntity implements BaseEntity { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java index 250d91ba63..f76b2d8da9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java @@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.User; @@ -41,8 +39,6 @@ import java.util.UUID; @Entity @TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ModelConstants.USER_PG_HIBERNATE_COLUMN_FAMILY_NAME) -@EqualsAndHashCode -@ToString public class UserEntity implements SearchTextEntity { @Transient private static final long serialVersionUID = -271106508790582977L; @@ -117,8 +113,6 @@ public class UserEntity implements SearchTextEntity { this.id = id; } - - @Override public User toData() { User user = new User(new UserId(id)); diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java index 93756536d7..4f96b6445a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java @@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import com.fasterxml.jackson.databind.JsonNode; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.thingsboard.server.common.data.id.TenantId; @@ -36,8 +34,6 @@ import java.util.UUID; @Entity @TypeDef(name = "json", typeClass = JsonStringType.class) @Table(name = ModelConstants.WIDGET_TYPE_COLUMN_FAMILY_NAME) -@EqualsAndHashCode -@ToString public final class WidgetTypeEntity implements BaseEntity { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java index 2e50cd2d16..90b1b71303 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java @@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql; import com.datastax.driver.core.utils.UUIDs; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.WidgetsBundleId; import org.thingsboard.server.common.data.widget.WidgetsBundle; @@ -32,8 +30,6 @@ import java.util.UUID; @Data @Entity @Table(name = ModelConstants.WIDGETS_BUNDLE_COLUMN_FAMILY_NAME) -@EqualsAndHashCode -@ToString public final class WidgetsBundleEntity implements SearchTextEntity { @Transient diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java index 9733d4bb7f..7a89644cd5 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java @@ -60,7 +60,6 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest { @Test @DatabaseSetup(value = "classpath:dbunit/widgets_bundle.xml", type= DatabaseOperation.DELETE_ALL) - // @DatabaseTearDown(value = "classpath:dbunit/empty_dataset.xml", type= DatabaseOperation.DELETE_ALL) public void testFindSystemWidgetsBundles() { createSystemWidgetBundles(30, "WB_"); assertEquals(30, widgetsBundleDao.find().size()); From b91bfddf181bfa1d797f8e79c2d113d90e8b19ef Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Thu, 22 Jun 2017 21:22:08 +0300 Subject: [PATCH 59/69] Separate controller and mqtt suite --- .../ControllerTestSuite.java} | 7 ++-- .../server/mqtt/MqttTestSuite.java | 38 +++++++++++++++++++ 2 files changed, 41 insertions(+), 4 deletions(-) rename application/src/test/java/org/thingsboard/server/{ApplicationServerTestSuite.java => controller/ControllerTestSuite.java} (89%) create mode 100644 application/src/test/java/org/thingsboard/server/mqtt/MqttTestSuite.java diff --git a/application/src/test/java/org/thingsboard/server/ApplicationServerTestSuite.java b/application/src/test/java/org/thingsboard/server/controller/ControllerTestSuite.java similarity index 89% rename from application/src/test/java/org/thingsboard/server/ApplicationServerTestSuite.java rename to application/src/test/java/org/thingsboard/server/controller/ControllerTestSuite.java index 3ce72d24bd..98e558fc0a 100644 --- a/application/src/test/java/org/thingsboard/server/ApplicationServerTestSuite.java +++ b/application/src/test/java/org/thingsboard/server/controller/ControllerTestSuite.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server; +package org.thingsboard.server.controller; import org.cassandraunit.dataset.cql.ClassPathCQLDataSet; import org.junit.ClassRule; @@ -25,9 +25,8 @@ import java.util.Arrays; @RunWith(ClasspathSuite.class) @ClasspathSuite.ClassnameFilters({ - "org.thingsboard.server.controller.*Test", - "org.thingsboard.server.mqtt.*.*Test"}) -public class ApplicationServerTestSuite { + "org.thingsboard.server.controller.*Test"}) +public class ControllerTestSuite { @ClassRule public static CustomCassandraCQLUnit cassandraUnit = diff --git a/application/src/test/java/org/thingsboard/server/mqtt/MqttTestSuite.java b/application/src/test/java/org/thingsboard/server/mqtt/MqttTestSuite.java new file mode 100644 index 0000000000..cf3bc71532 --- /dev/null +++ b/application/src/test/java/org/thingsboard/server/mqtt/MqttTestSuite.java @@ -0,0 +1,38 @@ +/** + * 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.mqtt; + +import org.cassandraunit.dataset.cql.ClassPathCQLDataSet; +import org.junit.ClassRule; +import org.junit.extensions.cpsuite.ClasspathSuite; +import org.junit.runner.RunWith; +import org.thingsboard.server.dao.CustomCassandraCQLUnit; + +import java.util.Arrays; + +@RunWith(ClasspathSuite.class) +@ClasspathSuite.ClassnameFilters({ + "org.thingsboard.server.mqtt.*.*Test"}) +public class MqttTestSuite { + + @ClassRule + public static CustomCassandraCQLUnit cassandraUnit = + new CustomCassandraCQLUnit( + Arrays.asList( + new ClassPathCQLDataSet("cassandra/schema.cql", false, false), + new ClassPathCQLDataSet("cassandra/system-data.cql", false, false)), + "cassandra-test.yaml", 30000l); +} From 6206d5fcb2c13852b5c1cd2a03f126bcf4d233df Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Fri, 23 Jun 2017 18:20:24 +0300 Subject: [PATCH 60/69] Native-query changed to JPA --- .../dao/model/sql/AdminSettingsEntity.java | 2 +- .../server/dao/model/sql/AlarmEntity.java | 2 +- .../server/dao/model/sql/AssetEntity.java | 2 +- .../model/sql/ComponentDescriptorEntity.java | 2 +- .../server/dao/model/sql/CustomerEntity.java | 2 +- .../server/dao/model/sql/DashboardEntity.java | 2 +- .../server/dao/model/sql/DeviceEntity.java | 2 +- .../server/dao/model/sql/EventEntity.java | 2 +- .../dao/model/sql/PluginMetaDataEntity.java | 4 +- .../server/dao/model/sql/RelationEntity.java | 2 +- .../dao/model/sql/RuleMetaDataEntity.java | 8 +-- .../server/dao/model/sql/TenantEntity.java | 2 +- .../server/dao/model/sql/UserEntity.java | 2 +- .../dao/model/sql/WidgetTypeEntity.java | 2 +- .../dao/model/sql/WidgetsBundleEntity.java | 7 --- .../server/dao/sql/alarm/AlarmRepository.java | 16 +++-- .../server/dao/sql/alarm/JpaAlarmDao.java | 16 +++-- .../server/dao/sql/asset/AssetRepository.java | 58 +++++++++--------- .../server/dao/sql/asset/JpaAssetDao.java | 26 ++++---- .../ComponentDescriptorRepository.java | 25 ++++---- .../JpaBaseComponentDescriptorDao.java | 14 +++-- .../dao/sql/customer/CustomerRepository.java | 13 ++-- .../dao/sql/customer/JpaCustomerDao.java | 9 ++- .../dashboard/DashboardInfoRepository.java | 29 ++++----- .../sql/dashboard/JpaDashboardInfoDao.java | 14 +++-- .../dao/sql/device/DeviceRepository.java | 59 ++++++++++--------- .../server/dao/sql/device/JpaDeviceDao.java | 29 ++++----- .../dao/sql/plugin/JpaBasePluginDao.java | 14 +++-- .../sql/plugin/PluginMetaDataRepository.java | 25 ++++---- .../server/dao/sql/rule/JpaBaseRuleDao.java | 14 +++-- .../dao/sql/rule/RuleMetaDataRepository.java | 25 ++++---- .../server/dao/sql/tenant/JpaTenantDao.java | 8 ++- .../dao/sql/tenant/TenantRepository.java | 13 ++-- .../dao/sql/timeseries/JpaTimeseriesDao.java | 33 ++++++++++- .../server/dao/sql/user/JpaUserDao.java | 15 ++--- .../server/dao/sql/user/UserRepository.java | 14 +++-- .../dao/sql/widget/JpaWidgetsBundleDao.java | 20 ++++--- .../sql/widget/WidgetsBundleRepository.java | 37 ++++++------ .../server/dao/sql/alarm/JpaAlarmDaoTest.java | 3 +- dao/src/test/resources/jpa-test.properties | 6 +- 40 files changed, 320 insertions(+), 258 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java index e268c4577f..6c98466b83 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java @@ -47,7 +47,7 @@ public final class AdminSettingsEntity implements BaseEntity { private String key; @Type(type = "json") - @Column(name = ADMIN_SETTINGS_JSON_VALUE_PROPERTY, columnDefinition = "json") + @Column(name = ADMIN_SETTINGS_JSON_VALUE_PROPERTY) private JsonNode jsonValue; public AdminSettingsEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java index d9f6623f0b..2107a5ff36 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java @@ -82,7 +82,7 @@ public final class AlarmEntity implements BaseEntity { private Long clearTs; @Type(type = "json") - @Column(name = ModelConstants.ASSET_ADDITIONAL_INFO_PROPERTY, columnDefinition = "json") + @Column(name = ModelConstants.ASSET_ADDITIONAL_INFO_PROPERTY) private JsonNode details; @Column(name = ALARM_PROPAGATE_PROPERTY) diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java index bd24fbdd06..5d24aeb7bb 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java @@ -62,7 +62,7 @@ public final class AssetEntity implements SearchTextEntity { private String searchText; @Type(type = "json") - @Column(name = ModelConstants.ASSET_ADDITIONAL_INFO_PROPERTY, columnDefinition = "json") + @Column(name = ModelConstants.ASSET_ADDITIONAL_INFO_PROPERTY) private JsonNode additionalInfo; public AssetEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java index 2da59a7552..eee91372eb 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java @@ -58,7 +58,7 @@ public class ComponentDescriptorEntity implements SearchTextEntity { private String email; @Type(type = "json") - @Column(name = ModelConstants.CUSTOMER_ADDITIONAL_INFO_PROPERTY, columnDefinition = "json") + @Column(name = ModelConstants.CUSTOMER_ADDITIONAL_INFO_PROPERTY) private JsonNode additionalInfo; public CustomerEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java index 2153db2fa8..5266b90048 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java @@ -57,7 +57,7 @@ public final class DashboardEntity implements SearchTextEntity { private String searchText; @Type(type = "json") - @Column(name = ModelConstants.DASHBOARD_CONFIGURATION_PROPERTY, columnDefinition = "json") + @Column(name = ModelConstants.DASHBOARD_CONFIGURATION_PROPERTY) private JsonNode configuration; public DashboardEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java index 06c90658ec..f4c8dd2989 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java @@ -60,7 +60,7 @@ public final class DeviceEntity implements SearchTextEntity { private String searchText; @Type(type = "json") - @Column(name = ModelConstants.DEVICE_ADDITIONAL_INFO_PROPERTY, columnDefinition = "json") + @Column(name = ModelConstants.DEVICE_ADDITIONAL_INFO_PROPERTY) private JsonNode additionalInfo; public DeviceEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java index 033aaa5fdf..ff7968718a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java @@ -63,7 +63,7 @@ public class EventEntity implements BaseEntity { private String eventUid; @Type(type = "json") - @Column(name = EVENT_BODY_PROPERTY, columnDefinition = "json") + @Column(name = EVENT_BODY_PROPERTY) private JsonNode body; public EventEntity(Event event) { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java index 3972310d3d..a53c1ab007 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java @@ -63,11 +63,11 @@ public class PluginMetaDataEntity implements SearchTextEntity { private ComponentLifecycleState state; @Type(type = "json") - @Column(name = ModelConstants.PLUGIN_CONFIGURATION_PROPERTY, columnDefinition = "json") + @Column(name = ModelConstants.PLUGIN_CONFIGURATION_PROPERTY) private JsonNode configuration; @Type(type = "json") - @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY, columnDefinition = "json") + @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY) private JsonNode additionalInfo; @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java index 3ee09d42ae..d13a7ef4da 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java @@ -62,7 +62,7 @@ public final class RelationEntity implements ToData { private String relationType; @Type(type = "json") - @Column(name = ADDITIONAL_INFO_PROPERTY, columnDefinition = "json") + @Column(name = ADDITIONAL_INFO_PROPERTY) private JsonNode additionalInfo; public RelationEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java index 6191672c9e..33971c348d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java @@ -64,19 +64,19 @@ public class RuleMetaDataEntity implements SearchTextEntity { private String pluginToken; @Type(type = "json") - @Column(name = ModelConstants.RULE_FILTERS, columnDefinition = "json") + @Column(name = ModelConstants.RULE_FILTERS) private JsonNode filters; @Type(type = "json") - @Column(name = ModelConstants.RULE_PROCESSOR, columnDefinition = "json") + @Column(name = ModelConstants.RULE_PROCESSOR) private JsonNode processor; @Type(type = "json") - @Column(name = ModelConstants.RULE_ACTION, columnDefinition = "json") + @Column(name = ModelConstants.RULE_ACTION) private JsonNode action; @Type(type = "json") - @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY, columnDefinition = "json") + @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY) private JsonNode additionalInfo; public RuleMetaDataEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java index 755ca8c64c..19cfe4b450 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java @@ -76,7 +76,7 @@ public final class TenantEntity implements SearchTextEntity { private String email; @Type(type="json") - @Column(name = ModelConstants.TENANT_ADDITIONAL_INFO_PROPERTY, columnDefinition = "json") + @Column(name = ModelConstants.TENANT_ADDITIONAL_INFO_PROPERTY) private JsonNode additionalInfo; public TenantEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java index f76b2d8da9..ccfaba10d6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java @@ -70,7 +70,7 @@ public class UserEntity implements SearchTextEntity { private String lastName; @Type(type="json") - @Column(name = ModelConstants.USER_ADDITIONAL_INFO_PROPERTY, columnDefinition = "json") + @Column(name = ModelConstants.USER_ADDITIONAL_INFO_PROPERTY) private JsonNode additionalInfo; public UserEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java index 4f96b6445a..38f83cb128 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java @@ -56,7 +56,7 @@ public final class WidgetTypeEntity implements BaseEntity { private String name; @Type(type="json") - @Column(name = ModelConstants.WIDGET_TYPE_DESCRIPTOR_PROPERTY, columnDefinition = "json") + @Column(name = ModelConstants.WIDGET_TYPE_DESCRIPTOR_PROPERTY) private JsonNode descriptor; public WidgetTypeEntity() { diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java index 90b1b71303..c7d62d8037 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java @@ -51,9 +51,6 @@ public final class WidgetsBundleEntity implements SearchTextEntity { - @Query(nativeQuery = true, value = "SELECT * FROM ALARM WHERE TENANT_ID = :tenantId AND ORIGINATOR_ID = :originatorId " + - "AND ORIGINATOR_TYPE = :entityType AND TYPE = :alarmType ORDER BY TYPE ASC, ID DESC LIMIT 1") - AlarmEntity findLatestByOriginatorAndType(@Param("tenantId") UUID tenantId, - @Param("originatorId") UUID originatorId, - @Param("entityType") int entityType, - @Param("alarmType") String alarmType); + @Query("SELECT a FROM AlarmEntity a WHERE a.tenantId = :tenantId AND a.originatorId = :originatorId " + + "AND a.originatorType = :entityType AND a.type = :alarmType ORDER BY a.type ASC, a.id DESC") + List findLatestByOriginatorAndType(@Param("tenantId") UUID tenantId, + @Param("originatorId") UUID originatorId, + @Param("entityType") EntityType entityType, + @Param("alarmType") String alarmType, + Pageable pageable); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java index 5517ec1601..322afe7f67 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java @@ -21,6 +21,7 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -74,12 +75,15 @@ public class JpaAlarmDao extends JpaAbstractDao implements A @Override @Transactional(propagation = REQUIRES_NEW) public ListenableFuture findLatestByOriginatorAndType(TenantId tenantId, EntityId originator, String type) { - return service.submit(() -> - DaoUtil.getData(alarmRepository.findLatestByOriginatorAndType( - tenantId.getId(), - originator.getId(), - originator.getEntityType().ordinal(), - type))); + return service.submit(() -> { + List latest = alarmRepository.findLatestByOriginatorAndType( + tenantId.getId(), + originator.getId(), + originator.getEntityType(), + type, + new PageRequest(0, 1)); + return latest.isEmpty() ? null : DaoUtil.getData(latest.get(0)); + }); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java index 3f5e4915b9..8f86437adb 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java @@ -15,6 +15,8 @@ */ 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; @@ -31,23 +33,23 @@ import java.util.UUID; @SqlDao public interface AssetRepository extends CrudRepository { - @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = :tenantId " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findByTenantId(@Param("limit") int limit, - @Param("tenantId") UUID tenantId, + @Query("SELECT a FROM AssetEntity a WHERE a.tenantId = :tenantId " + + "AND LOWER(a.searchText) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND a.id > :idOffset ORDER BY a.id") + List findByTenantId(@Param("tenantId") UUID tenantId, @Param("textSearch") String textSearch, - @Param("idOffset") UUID idOffset); + @Param("idOffset") UUID idOffset, + Pageable pageable); - @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = :tenantId " + - "AND CUSTOMER_ID = :customerId " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findByTenantIdAndCustomerId(@Param("limit") int limit, - @Param("tenantId") UUID tenantId, + @Query("SELECT a FROM AssetEntity a WHERE a.tenantId = :tenantId " + + "AND a.customerId = :customerId " + + "AND LOWER(a.searchText) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND a.id > :idOffset ORDER BY a.id") + List findByTenantIdAndCustomerId(@Param("tenantId") UUID tenantId, @Param("customerId") UUID customerId, @Param("textSearch") String textSearch, - @Param("idOffset") UUID idOffset); + @Param("idOffset") UUID idOffset, + Pageable pageable); List findByTenantIdAndIdIn(UUID tenantId, List assetIds); @@ -55,27 +57,27 @@ public interface AssetRepository extends CrudRepository { AssetEntity findByTenantIdAndName(UUID tenantId, String name); - @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = :tenantId " + - "AND TYPE = :type " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findByTenantIdAndType(@Param("limit") int limit, - @Param("tenantId") UUID tenantId, + @Query("SELECT a FROM AssetEntity a WHERE a.tenantId = :tenantId " + + "AND a.type = :type " + + "AND LOWER(a.searchText) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND a.id > :idOffset ORDER BY a.id") + List findByTenantIdAndType(@Param("tenantId") UUID tenantId, @Param("type") String type, @Param("textSearch") String textSearch, - @Param("idOffset") UUID idOffset); + @Param("idOffset") UUID idOffset, + Pageable pageable); - @Query(nativeQuery = true, value = "SELECT * FROM ASSET WHERE TENANT_ID = :tenantId " + - "AND CUSTOMER_ID = :customerId AND TYPE = :type " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findByTenantIdAndCustomerIdAndType(@Param("limit") int limit, - @Param("tenantId") UUID tenantId, + @Query("SELECT a FROM AssetEntity a WHERE a.tenantId = :tenantId " + + "AND a.customerId = :customerId AND a.type = :type " + + "AND LOWER(a.searchText) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND a.id > :idOffset ORDER BY a.id") + List findByTenantIdAndCustomerIdAndType(@Param("tenantId") UUID tenantId, @Param("customerId") UUID customerId, @Param("type") String type, @Param("textSearch") String textSearch, - @Param("idOffset") UUID idOffset); + @Param("idOffset") UUID idOffset, + Pageable pageable); - @Query(value = "SELECT NEW org.thingsboard.server.common.data.asset.TenantAssetType(a.type, a.tenantId) FROM AssetEntity a GROUP BY a.tenantId, a.type") + @Query("SELECT NEW org.thingsboard.server.common.data.asset.TenantAssetType(a.type, a.tenantId) FROM AssetEntity a GROUP BY a.tenantId, a.type") List findTenantAssetTypes(); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java index 39f8111109..500b612918 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java @@ -17,6 +17,7 @@ package org.thingsboard.server.dao.sql.asset; import com.google.common.util.concurrent.ListenableFuture; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.asset.Asset; @@ -29,6 +30,7 @@ import org.thingsboard.server.dao.model.sql.AssetEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -58,10 +60,10 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao im public List findAssetsByTenantId(UUID tenantId, TextPageLink pageLink) { return DaoUtil.convertDataList(assetRepository .findByTenantId( - pageLink.getLimit(), tenantId, - pageLink.getTextSearch(), - pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); + Objects.toString(pageLink.getTextSearch(), ""), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + new PageRequest(0, pageLink.getLimit()))); } @Override @@ -74,11 +76,11 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao im public List findAssetsByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink) { return DaoUtil.convertDataList(assetRepository .findByTenantIdAndCustomerId( - pageLink.getLimit(), tenantId, customerId, - pageLink.getTextSearch(), - pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); + Objects.toString(pageLink.getTextSearch(), ""), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + new PageRequest(0, pageLink.getLimit()))); } @Override @@ -97,23 +99,23 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao im public List findAssetsByTenantIdAndType(UUID tenantId, String type, TextPageLink pageLink) { return DaoUtil.convertDataList(assetRepository .findByTenantIdAndType( - pageLink.getLimit(), tenantId, type, - pageLink.getTextSearch(), - pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); + Objects.toString(pageLink.getTextSearch(), ""), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + new PageRequest(0, pageLink.getLimit()))); } @Override public List findAssetsByTenantIdAndCustomerIdAndType(UUID tenantId, UUID customerId, String type, TextPageLink pageLink) { return DaoUtil.convertDataList(assetRepository .findByTenantIdAndCustomerIdAndType( - pageLink.getLimit(), tenantId, customerId, type, - pageLink.getTextSearch(), - pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); + Objects.toString(pageLink.getTextSearch(), ""), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + new PageRequest(0, pageLink.getLimit()))); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java index e86b838213..f15bbbf5ad 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.sql.component; +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; @@ -32,22 +33,22 @@ public interface ComponentDescriptorRepository extends CrudRepository :idOffset ORDER BY ID LIMIT :limit") - List findByType(@Param("limit") int limit, - @Param("type") String type, + @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 findByType(@Param("type") String type, @Param("textSearch") String textSearch, - @Param("idOffset") UUID idOffset); + @Param("idOffset") UUID idOffset, + Pageable pageable); - @Query(nativeQuery = true, value = "SELECT * FROM COMPONENT_DESCRIPTOR WHERE TYPE = :type " + - "AND SCOPE = :scope AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findByScopeAndType(@Param("limit") int limit, - @Param("type") String type, + @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 findByScopeAndType(@Param("type") String type, @Param("scope") String scope, @Param("textSearch") String textSearch, - @Param("idOffset") UUID idOffset); + @Param("idOffset") UUID idOffset, + Pageable pageable); void deleteByClazz(String clazz); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java index 023e7a5a01..e259bba06e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java @@ -17,6 +17,7 @@ package org.thingsboard.server.dao.sql.component; import com.datastax.driver.core.utils.UUIDs; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.ComponentDescriptorId; @@ -31,6 +32,7 @@ import org.thingsboard.server.dao.model.sql.ComponentDescriptorEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -83,21 +85,21 @@ public class JpaBaseComponentDescriptorDao extends JpaAbstractSearchTextDao findByTypeAndPageLink(ComponentType type, TextPageLink pageLink) { return DaoUtil.convertDataList(componentDescriptorRepository .findByType( - pageLink.getLimit(), type.toString(), - pageLink.getTextSearch(), - pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); + Objects.toString(pageLink.getTextSearch(), ""), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + new PageRequest(0, pageLink.getLimit()))); } @Override public List findByScopeAndTypeAndPageLink(ComponentScope scope, ComponentType type, TextPageLink pageLink) { return DaoUtil.convertDataList(componentDescriptorRepository .findByScopeAndType( - pageLink.getLimit(), type.toString(), scope.toString(), - pageLink.getTextSearch(), - pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); + Objects.toString(pageLink.getTextSearch(), ""), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + new PageRequest(0, pageLink.getLimit()))); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java index 0bf4f13943..009f926b2e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.sql.customer; +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; @@ -30,13 +31,13 @@ import java.util.UUID; @SqlDao public interface CustomerRepository extends CrudRepository { - @Query(nativeQuery = true, value = "SELECT * FROM CUSTOMER WHERE TENANT_ID = :tenantId " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findByTenantId(@Param("limit") int limit, - @Param("tenantId") UUID tenantId, + @Query("SELECT c FROM CustomerEntity c WHERE c.tenantId = :tenantId " + + "AND LOWER(c.searchText) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND c.id > :idOffset ORDER BY c.id") + List findByTenantId(@Param("tenantId") UUID tenantId, @Param("textSearch") String textSearch, - @Param("idOffset") UUID idOffset); + @Param("idOffset") UUID idOffset, + Pageable pageable); CustomerEntity findByTenantIdAndTitle(UUID tenantId, String title); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java index d5ae9aba83..de54835c1a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java @@ -16,6 +16,7 @@ package org.thingsboard.server.dao.sql.customer; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.Customer; @@ -27,6 +28,7 @@ import org.thingsboard.server.dao.model.sql.CustomerEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -54,8 +56,11 @@ public class JpaCustomerDao extends JpaAbstractSearchTextDao findCustomersByTenantId(UUID tenantId, TextPageLink pageLink) { - return DaoUtil.convertDataList(customerRepository.findByTenantId(pageLink.getLimit(), tenantId, - pageLink.getTextSearch(), pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); + return DaoUtil.convertDataList(customerRepository.findByTenantId( + tenantId, + Objects.toString(pageLink.getTextSearch(), ""), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + new PageRequest(0, pageLink.getLimit()))); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java index a4e3412c35..2569867096 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.sql.dashboard; +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; @@ -30,20 +31,20 @@ import java.util.UUID; @SqlDao public interface DashboardInfoRepository extends CrudRepository { - @Query(nativeQuery = true, value = "SELECT * FROM DASHBOARD WHERE TENANT_ID = :tenantId " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findByTenantId(@Param("limit") int limit, - @Param("tenantId") UUID tenantId, - @Param("textSearch") String textSearch, - @Param("idOffset") UUID idOffset); + @Query("SELECT di FROM DashboardInfoEntity di WHERE di.tenantId = :tenantId " + + "AND LOWER(di.searchText) LIKE LOWER(CONCAT(:searchText, '%')) " + + "AND di.id > :idOffset ORDER BY di.id") + List findByTenantId(@Param("tenantId") UUID tenantId, + @Param("searchText") String searchText, + @Param("idOffset") UUID idOffset, + Pageable pageable); - @Query(nativeQuery = true, value = "SELECT * FROM DASHBOARD WHERE TENANT_ID = :tenantId " + - "AND CUSTOMER_ID = :customerId AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findByTenantIdAndCustomerId(@Param("limit") int limit, - @Param("tenantId") UUID tenantId, + @Query("SELECT di FROM DashboardInfoEntity di WHERE di.tenantId = :tenantId " + + "AND di.customerId = :customerId AND LOWER(di.searchText) LIKE LOWER(CONCAT(:searchText, '%')) " + + "AND di.id > :idOffset ORDER BY di.id") + List findByTenantIdAndCustomerId(@Param("tenantId") UUID tenantId, @Param("customerId") UUID customerId, - @Param("textSearch") String textSearch, - @Param("idOffset") UUID idOffset); + @Param("searchText") String searchText, + @Param("idOffset") UUID idOffset, + Pageable pageable); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java index d1d2b776d6..c604c7e4ef 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java @@ -16,6 +16,7 @@ package org.thingsboard.server.dao.sql.dashboard; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.DashboardInfo; @@ -27,6 +28,7 @@ import org.thingsboard.server.dao.model.sql.DashboardInfoEntity; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import java.util.List; +import java.util.Objects; import java.util.UUID; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @@ -55,20 +57,20 @@ public class JpaDashboardInfoDao extends JpaAbstractSearchTextDao findDashboardsByTenantId(UUID tenantId, TextPageLink pageLink) { return DaoUtil.convertDataList(dashboardInfoRepository .findByTenantId( - pageLink.getLimit(), tenantId, - pageLink.getTextSearch(), - pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); + Objects.toString(pageLink.getTextSearch(), ""), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + new PageRequest(0, pageLink.getLimit()))); } @Override public List findDashboardsByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink) { return DaoUtil.convertDataList(dashboardInfoRepository .findByTenantIdAndCustomerId( - pageLink.getLimit(), tenantId, customerId, - pageLink.getTextSearch(), - pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); + Objects.toString(pageLink.getTextSearch(), ""), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + new PageRequest(0, pageLink.getLimit()))); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java index 8102553fd5..771ab6982d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.sql.device; +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; @@ -32,47 +33,47 @@ import java.util.UUID; public interface DeviceRepository extends CrudRepository { - @Query(nativeQuery = true, value = "SELECT * FROM DEVICE WHERE TENANT_ID = :tenantId " + - "AND CUSTOMER_ID = :customerId " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:searchText, '%')) " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findByTenantIdAndCustomerId(@Param("limit") int limit, - @Param("tenantId") UUID tenantId, + @Query("SELECT d FROM DeviceEntity d WHERE d.tenantId = :tenantId " + + "AND d.customerId = :customerId " + + "AND LOWER(d.searchText) LIKE LOWER(CONCAT(:searchText, '%')) " + + "AND d.id > :idOffset ORDER BY d.id") + List findByTenantIdAndCustomerId(@Param("tenantId") UUID tenantId, @Param("customerId") UUID customerId, @Param("searchText") String searchText, - @Param("idOffset") UUID idOffset); + @Param("idOffset") UUID idOffset, + Pageable pageable); - @Query(nativeQuery = true, value = "SELECT * FROM DEVICE WHERE TENANT_ID = :tenantId " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findByTenantId(@Param("limit") int limit, - @Param("tenantId") UUID tenantId, + @Query("SELECT d FROM DeviceEntity d WHERE d.tenantId = :tenantId " + + "AND LOWER(d.searchText) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND d.id > :idOffset ORDER BY d.id") + List findByTenantId(@Param("tenantId") UUID tenantId, @Param("textSearch") String textSearch, - @Param("idOffset") UUID idOffset); + @Param("idOffset") UUID idOffset, + Pageable pageable); - @Query(nativeQuery = true, value = "SELECT * FROM DEVICE WHERE TENANT_ID = :tenantId " + - "AND TYPE = :type " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findByTenantIdAndType(@Param("limit") int limit, - @Param("tenantId") UUID tenantId, + @Query("SELECT d FROM DeviceEntity d WHERE d.tenantId = :tenantId " + + "AND d.type = :type " + + "AND LOWER(d.searchText) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND d.id > :idOffset ORDER BY d.id") + List findByTenantIdAndType(@Param("tenantId") UUID tenantId, @Param("type") String type, @Param("textSearch") String textSearch, - @Param("idOffset") UUID idOffset); + @Param("idOffset") UUID idOffset, + Pageable pageable); - @Query(nativeQuery = true, value = "SELECT * FROM DEVICE WHERE TENANT_ID = :tenantId " + - "AND CUSTOMER_ID = :customerId " + - "AND TYPE = :type " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findByTenantIdAndCustomerIdAndType(@Param("limit") int limit, - @Param("tenantId") UUID tenantId, + @Query("SELECT d FROM DeviceEntity d WHERE d.tenantId = :tenantId " + + "AND d.customerId = :customerId " + + "AND d.type = :type " + + "AND LOWER(d.searchText) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND d.id > :idOffset ORDER BY d.id") + List findByTenantIdAndCustomerIdAndType(@Param("tenantId") UUID tenantId, @Param("customerId") UUID customerId, @Param("type") String type, @Param("textSearch") String textSearch, - @Param("idOffset") UUID idOffset); + @Param("idOffset") UUID idOffset, + Pageable pageable); - @Query(value = "SELECT DISTINCT NEW org.thingsboard.server.dao.model.sql.TenantDeviceTypeEntity(d.tenantId, d.type) FROM DeviceEntity d") + @Query("SELECT DISTINCT NEW org.thingsboard.server.dao.model.sql.TenantDeviceTypeEntity(d.tenantId, d.type) FROM DeviceEntity d") List findTenantDeviceTypes(); DeviceEntity findByTenantIdAndName(UUID tenantId, String name); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java index 68f4262d7c..d7130401f0 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java @@ -17,6 +17,7 @@ package org.thingsboard.server.dao.sql.device; import com.google.common.util.concurrent.ListenableFuture; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.Device; @@ -58,11 +59,10 @@ public class JpaDeviceDao extends JpaAbstractSearchTextDao public List findDevicesByTenantId(UUID tenantId, TextPageLink pageLink) { return DaoUtil.convertDataList( deviceRepository.findByTenantId( - pageLink.getLimit(), tenantId, - pageLink.getTextSearch(), - pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset()) - ); + Objects.toString(pageLink.getTextSearch(), ""), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + new PageRequest(0, pageLink.getLimit()))); } @Override @@ -74,12 +74,11 @@ public class JpaDeviceDao extends JpaAbstractSearchTextDao public List findDevicesByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink) { return DaoUtil.convertDataList( deviceRepository.findByTenantIdAndCustomerId( - pageLink.getLimit(), tenantId, customerId, - pageLink.getTextSearch(), - pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset()) - ); + Objects.toString(pageLink.getTextSearch(), ""), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + new PageRequest(0, pageLink.getLimit()))); } @Override @@ -98,25 +97,23 @@ public class JpaDeviceDao extends JpaAbstractSearchTextDao public List findDevicesByTenantIdAndType(UUID tenantId, String type, TextPageLink pageLink) { return DaoUtil.convertDataList( deviceRepository.findByTenantIdAndType( - pageLink.getLimit(), tenantId, type, - pageLink.getTextSearch(), - pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset()) - ); + Objects.toString(pageLink.getTextSearch(), ""), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + new PageRequest(0, pageLink.getLimit()))); } @Override public List findDevicesByTenantIdAndCustomerIdAndType(UUID tenantId, UUID customerId, String type, TextPageLink pageLink) { return DaoUtil.convertDataList( deviceRepository.findByTenantIdAndCustomerIdAndType( - pageLink.getLimit(), tenantId, customerId, type, - pageLink.getTextSearch(), - pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset()) - ); + Objects.toString(pageLink.getTextSearch(), ""), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + new PageRequest(0, pageLink.getLimit()))); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java index 109ea553fb..b824ebd895 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDao.java @@ -17,6 +17,7 @@ package org.thingsboard.server.dao.sql.plugin; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.PluginId; @@ -31,6 +32,7 @@ import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import java.util.Arrays; import java.util.List; +import java.util.Objects; import java.util.UUID; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @@ -96,10 +98,10 @@ public class JpaBasePluginDao extends JpaAbstractSearchTextDao entities = pluginMetaDataRepository .findByTenantIdAndPageLink( - pageLink.getLimit(), tenantId.getId(), - pageLink.getTextSearch(), - pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset()); + Objects.toString(pageLink.getTextSearch(), ""), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + new PageRequest(0, pageLink.getLimit())); if (log.isTraceEnabled()) { log.trace("Search result: [{}]", Arrays.toString(entities.toArray())); } else { @@ -113,11 +115,11 @@ public class JpaBasePluginDao extends JpaAbstractSearchTextDao entities = pluginMetaDataRepository .findAllTenantPluginsByTenantId( - pageLink.getLimit(), tenantId, NULL_UUID, - pageLink.getTextSearch(), - pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset()); + Objects.toString(pageLink.getTextSearch(), ""), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + new PageRequest(0, pageLink.getLimit())); if (log.isTraceEnabled()) { log.trace("Search result: [{}]", Arrays.toString(entities.toArray())); } else { diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/PluginMetaDataRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/PluginMetaDataRepository.java index e05fe81579..7fc454ada0 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/PluginMetaDataRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/plugin/PluginMetaDataRepository.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.sql.plugin; +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; @@ -32,20 +33,20 @@ public interface PluginMetaDataRepository extends CrudRepository :idOffset ORDER BY ID LIMIT :limit") - List findByTenantIdAndPageLink(@Param("limit") int limit, - @Param("tenantId") UUID tenantId, + @Query("SELECT pmd FROM PluginMetaDataEntity pmd WHERE pmd.tenantId = :tenantId " + + "AND LOWER(pmd.searchText) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND pmd.id > :idOffset ORDER BY pmd.id") + List findByTenantIdAndPageLink(@Param("tenantId") UUID tenantId, @Param("textSearch") String textSearch, - @Param("idOffset") UUID idOffset); + @Param("idOffset") UUID idOffset, + Pageable pageable); - @Query(nativeQuery = true, value = "SELECT * FROM PLUGIN WHERE TENANT_ID IN (:tenantId, :nullTenantId) " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findAllTenantPluginsByTenantId(@Param("limit") int limit, - @Param("tenantId") UUID tenantId, + @Query("SELECT pmd FROM PluginMetaDataEntity pmd WHERE pmd.tenantId IN (:tenantId, :nullTenantId) " + + "AND LOWER(pmd.searchText) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND pmd.id > :idOffset ORDER BY pmd.id") + List findAllTenantPluginsByTenantId(@Param("tenantId") UUID tenantId, @Param("nullTenantId") UUID nullTenantId, @Param("textSearch") String textSearch, - @Param("idOffset") UUID idOffset); + @Param("idOffset") UUID idOffset, + Pageable pageable); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java index 1ad16e2cb6..b21b20de1b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDao.java @@ -17,6 +17,7 @@ package org.thingsboard.server.dao.sql.rule; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.RuleId; @@ -31,6 +32,7 @@ import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import java.util.Arrays; import java.util.List; +import java.util.Objects; import java.util.UUID; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @@ -73,10 +75,10 @@ public class JpaBaseRuleDao extends JpaAbstractSearchTextDao entities = ruleMetaDataRepository .findByTenantIdAndPageLink( - pageLink.getLimit(), tenantId.getId(), - pageLink.getTextSearch(), - pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset()); + Objects.toString(pageLink.getTextSearch(), ""), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + new PageRequest(0, pageLink.getLimit())); if (log.isTraceEnabled()) { log.trace("Search result: [{}]", Arrays.toString(entities.toArray())); } else { @@ -91,11 +93,11 @@ public class JpaBaseRuleDao extends JpaAbstractSearchTextDao entities = ruleMetaDataRepository .findAllTenantRulesByTenantId( - pageLink.getLimit(), tenantId, NULL_UUID, - pageLink.getTextSearch(), - pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset()); + Objects.toString(pageLink.getTextSearch(), ""), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + new PageRequest(0, pageLink.getLimit())); if (log.isTraceEnabled()) { log.trace("Search result: [{}]", Arrays.toString(entities.toArray())); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleMetaDataRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleMetaDataRepository.java index 9336e6965a..694a364fed 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleMetaDataRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleMetaDataRepository.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.sql.rule; +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; @@ -32,20 +33,20 @@ public interface RuleMetaDataRepository extends CrudRepository findByPluginToken(String pluginToken); - @Query(nativeQuery = true, value = "SELECT * FROM RULE WHERE TENANT_ID = :tenantId " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findByTenantIdAndPageLink(@Param("limit") int limit, - @Param("tenantId") UUID tenantId, + @Query("SELECT rmd FROM RuleMetaDataEntity rmd WHERE rmd.tenantId = :tenantId " + + "AND LOWER(rmd.searchText) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND rmd.id > :idOffset ORDER BY rmd.id") + List findByTenantIdAndPageLink(@Param("tenantId") UUID tenantId, @Param("textSearch") String textSearch, - @Param("idOffset") UUID idOffset); + @Param("idOffset") UUID idOffset, + Pageable pageable); - @Query(nativeQuery = true, value = "SELECT * FROM RULE WHERE TENANT_ID IN (:tenantId, :nullTenantId) " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findAllTenantRulesByTenantId(@Param("limit") int limit, - @Param("tenantId") UUID tenantId, + @Query("SELECT rmd FROM RuleMetaDataEntity rmd WHERE rmd.tenantId IN (:tenantId, :nullTenantId) " + + "AND LOWER(rmd.searchText) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND rmd.id > :idOffset ORDER BY rmd.id") + List findAllTenantRulesByTenantId(@Param("tenantId") UUID tenantId, @Param("nullTenantId") UUID nullTenantId, @Param("textSearch") String textSearch, - @Param("idOffset") UUID idOffset); + @Param("idOffset") UUID idOffset, + Pageable pageable); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java index ddd6f7d430..4384362dbb 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDao.java @@ -16,6 +16,7 @@ package org.thingsboard.server.dao.sql.tenant; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.Tenant; @@ -27,6 +28,7 @@ import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import org.thingsboard.server.dao.tenant.TenantDao; import java.util.List; +import java.util.Objects; import java.util.UUID; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @@ -55,9 +57,9 @@ public class JpaTenantDao extends JpaAbstractSearchTextDao public List findTenantsByRegion(String region, TextPageLink pageLink) { return DaoUtil.convertDataList(tenantRepository .findByRegionNextPage( - pageLink.getLimit(), region, - pageLink.getTextSearch(), - pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset())); + Objects.toString(pageLink.getTextSearch(), ""), + pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), + new PageRequest(0, pageLink.getLimit()))); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java index 10f58b3158..ffb28e0369 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/tenant/TenantRepository.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.dao.sql.tenant; +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; @@ -30,11 +31,11 @@ import java.util.UUID; @SqlDao public interface TenantRepository extends CrudRepository { - @Query(nativeQuery = true, value = "SELECT * FROM TENANT WHERE REGION = :region " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findByRegionNextPage(@Param("limit") int limit, - @Param("region") String region, + @Query("SELECT t FROM TenantEntity t WHERE t.region = :region " + + "AND LOWER(t.searchText) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND t.id > :idOffset ORDER BY t.id") + List findByRegionNextPage(@Param("region") String region, @Param("textSearch") String textSearch, - @Param("idOffset") UUID idOffset); + @Param("idOffset") UUID idOffset, + Pageable pageable); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java index 7df7605ca0..bc056e1c64 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java @@ -15,12 +15,15 @@ */ package org.thingsboard.server.dao.sql.timeseries; +import com.google.common.base.Function; import com.google.common.collect.Lists; +import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.EntityId; +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; @@ -31,7 +34,9 @@ import org.thingsboard.server.dao.model.sql.TsKvLatestEntity; import org.thingsboard.server.dao.sql.JpaAbstractDaoListeningExecutorService; import org.thingsboard.server.dao.timeseries.TimeseriesDao; +import javax.annotation.Nullable; import java.util.List; +import java.util.stream.Collectors; @Component @Slf4j @@ -46,12 +51,34 @@ public class JpaTimeseriesDao extends JpaAbstractDaoListeningExecutorService imp @Override public ListenableFuture> findAllAsync(EntityId entityId, List queries) { - // TODO - Add implementation - return service.submit(() -> null); + List>> futures = queries + .stream() + .map(query -> findAllAsync(entityId, query)) + .collect(Collectors.toList()); + return Futures.transform(Futures.allAsList(futures), new Function>, List>() { + @Nullable + @Override + public List apply(@Nullable List> results) { + if (results == null || results.isEmpty()) { + return null; + } + return results.stream() + .flatMap(List::stream) + .collect(Collectors.toList()); + } + }, service); } private ListenableFuture> findAllAsync(EntityId entityId, TsKvQuery query) { - return null; + if (query.getAggregation() == Aggregation.NONE) { + return findAllAsyncWithLimit(entityId, query); + } else { + return service.submit(() -> null); + } + } + + private ListenableFuture> findAllAsyncWithLimit(EntityId entityId, TsKvQuery query) { + return service.submit(() -> null); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java index d4308cf7b3..64ea0b4102 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java @@ -16,6 +16,7 @@ package org.thingsboard.server.dao.sql.user; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.User; @@ -24,11 +25,11 @@ 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.model.sql.UserEntity; -import org.thingsboard.server.dao.sql.JpaAbstractDao; import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import org.thingsboard.server.dao.user.UserDao; import java.util.List; +import java.util.Objects; import java.util.UUID; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @@ -66,9 +67,9 @@ public class JpaUserDao extends JpaAbstractSearchTextDao imple tenantId, NULL_UUID, pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), - pageLink.getTextSearch(), - Authority.TENANT_ADMIN.name(), - pageLink.getLimit())); + Objects.toString(pageLink.getTextSearch(), ""), + Authority.TENANT_ADMIN, + new PageRequest(0, pageLink.getLimit()))); } @Override @@ -79,9 +80,9 @@ public class JpaUserDao extends JpaAbstractSearchTextDao imple tenantId, customerId, pageLink.getIdOffset() == null ? NULL_UUID : pageLink.getIdOffset(), - pageLink.getTextSearch(), - Authority.CUSTOMER_USER.name(), - pageLink.getLimit())); + Objects.toString(pageLink.getTextSearch(), ""), + Authority.CUSTOMER_USER, + new PageRequest(0, pageLink.getLimit()))); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java index 128f45f4c5..ebeb612f8c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java @@ -15,9 +15,11 @@ */ package org.thingsboard.server.dao.sql.user; +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.security.Authority; import org.thingsboard.server.dao.annotation.SqlDao; import org.thingsboard.server.dao.model.sql.UserEntity; @@ -32,15 +34,15 @@ public interface UserRepository extends CrudRepository { UserEntity findByEmail(String email); - @Query(nativeQuery = true, value = "SELECT * FROM TB_USER WHERE TENANT_ID = :tenantId " + - "AND CUSTOMER_ID = :customerId AND AUTHORITY = :authority " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:searchText, '%'))" + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") + @Query("SELECT u FROM UserEntity u WHERE u.tenantId = :tenantId " + + "AND u.customerId = :customerId AND u.authority = :authority " + + "AND LOWER(u.searchText) LIKE LOWER(CONCAT(:searchText, '%'))" + + "AND u.id > :idOffset ORDER BY u.id") List findUsersByAuthority(@Param("tenantId") UUID tenantId, @Param("customerId") UUID customerId, @Param("idOffset") UUID idOffset, @Param("searchText") String searchText, - @Param("authority") String authority, - @Param("limit") int limit); + @Param("authority") Authority authority, + Pageable pageable); } \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java index a3c06f1fb7..0e7c0f82b1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDao.java @@ -16,6 +16,7 @@ package org.thingsboard.server.dao.sql.widget; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.page.TextPageLink; @@ -27,6 +28,7 @@ import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; import org.thingsboard.server.dao.widget.WidgetsBundleDao; import java.util.List; +import java.util.Objects; import java.util.UUID; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; @@ -61,10 +63,10 @@ public class JpaWidgetsBundleDao extends JpaAbstractSearchTextDao :idOffset ORDER BY ID LIMIT :limit") - List findSystemWidgetsBundles(@Param("limit") int limit, - @Param("systemTenantId") UUID systemTenantId, + @Query("SELECT wb FROM WidgetsBundleEntity wb WHERE wb.tenantId = :systemTenantId " + + "AND LOWER(wb.searchText) LIKE LOWER(CONCAT(:searchText, '%')) " + + "AND wb.id > :idOffset ORDER BY wb.id") + List findSystemWidgetsBundles(@Param("systemTenantId") UUID systemTenantId, @Param("searchText") String searchText, - @Param("idOffset") UUID idOffset); + @Param("idOffset") UUID idOffset, + Pageable pageable); - @Query(nativeQuery = true, value = "SELECT * FROM WIDGETS_BUNDLE WHERE TENANT_ID = :tenantId " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findTenantWidgetsBundlesByTenantId(@Param("limit") int limit, - @Param("tenantId") UUID tenantId, + @Query("SELECT wb FROM WidgetsBundleEntity wb WHERE wb.tenantId = :tenantId " + + "AND LOWER(wb.searchText) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND wb.id > :idOffset ORDER BY wb.id") + List findTenantWidgetsBundlesByTenantId(@Param("tenantId") UUID tenantId, @Param("textSearch") String textSearch, - @Param("idOffset") UUID idOffset); + @Param("idOffset") UUID idOffset, + Pageable pageable); - @Query(nativeQuery = true, value = "SELECT * FROM WIDGETS_BUNDLE WHERE TENANT_ID IN (:tenantId, :nullTenantId) " + - "AND LOWER(SEARCH_TEXT) LIKE LOWER(CONCAT(:textSearch, '%')) " + - "AND ID > :idOffset ORDER BY ID LIMIT :limit") - List findAllTenantWidgetsBundlesByTenantId(@Param("limit") int limit, - @Param("tenantId") UUID tenantId, + @Query("SELECT wb FROM WidgetsBundleEntity wb WHERE wb.tenantId IN (:tenantId, :nullTenantId) " + + "AND LOWER(wb.searchText) LIKE LOWER(CONCAT(:textSearch, '%')) " + + "AND wb.id > :idOffset ORDER BY wb.id") + List findAllTenantWidgetsBundlesByTenantId(@Param("tenantId") UUID tenantId, @Param("nullTenantId") UUID nullTenantId, @Param("textSearch") String textSearch, - @Param("idOffset") UUID idOffset); + @Param("idOffset") UUID idOffset, + Pageable pageable); } diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java index ad0c9cf602..265185479b 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java @@ -18,6 +18,7 @@ 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; @@ -59,7 +60,7 @@ public class JpaAlarmDaoTest extends AbstractJpaDaoTest { saveAlarm(alarm3Id, tenantId, originator2Id, "TEST_ALARM"); assertEquals(3, alarmDao.find().size()); AlarmEntity alarmEntity = alarmRepository.findLatestByOriginatorAndType( - tenantId, originator1Id, EntityType.DEVICE.ordinal(), "TEST_ALARM"); + tenantId, originator1Id, EntityType.DEVICE, "TEST_ALARM", new PageRequest(0, 1)).get(0); assertNotNull(alarmEntity); ListenableFuture future = alarmDao .findLatestByOriginatorAndType(new TenantId(tenantId), new DeviceId(originator1Id), "TEST_ALARM"); diff --git a/dao/src/test/resources/jpa-test.properties b/dao/src/test/resources/jpa-test.properties index 58ca25f1c2..80ae6ffc29 100644 --- a/dao/src/test/resources/jpa-test.properties +++ b/dao/src/test/resources/jpa-test.properties @@ -7,4 +7,8 @@ spring.jpa.hibernate.ddl-auto=validate spring.datasource.url=jdbc:postgresql://localhost:5432/thingsboard spring.datasource.username=postgres -spring.datasource.password=postgres \ No newline at end of file +spring.datasource.password=postgres + +#spring.datasource.url=jdbc:h2:mem:test;MODE=PostgreSQL +#spring.datasource.schema=classpath:postgres/schema.sql +#spring.datasource.data=classpath:postgres/system-data.sql;classpath:system-test.sql \ No newline at end of file From 5935de07b3aa94deecbd3c58fe2bc6420b033778 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Fri, 23 Jun 2017 19:49:58 +0300 Subject: [PATCH 61/69] Added get ts async implementation --- .../dao/model/sql/AttributeKvEntity.java | 4 +- .../dao/model/sql/TsKvCompositeKey.java | 3 +- .../server/dao/model/sql/TsKvEntity.java | 49 ++++++++++- .../dao/model/sql/TsKvLatestCompositeKey.java | 3 +- .../dao/model/sql/TsKvLatestEntity.java | 4 +- .../dao/sql/attributes/JpaAttributeDao.java | 4 +- .../dao/sql/timeseries/JpaTimeseriesDao.java | 86 +++++++++++++++++-- .../dao/sql/timeseries/TsKvRepository.java | 65 ++++++++++++++ 8 files changed, 204 insertions(+), 14 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java index 2ea58afcf2..c7ba821773 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java @@ -16,6 +16,7 @@ package org.thingsboard.server.dao.model.sql; import lombok.Data; +import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.kv.*; import org.thingsboard.server.dao.model.ToData; @@ -32,8 +33,9 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; public class AttributeKvEntity implements ToData, Serializable { @Id + @Enumerated(EnumType.STRING) @Column(name = ENTITY_TYPE_COLUMN) - private String entityType; + private EntityType entityType; @Id @Column(name = ENTITY_ID_COLUMN) diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvCompositeKey.java index 48fc75c152..57df750f79 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvCompositeKey.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvCompositeKey.java @@ -18,6 +18,7 @@ package org.thingsboard.server.dao.model.sql; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.thingsboard.server.common.data.EntityType; import javax.persistence.Transient; import java.io.Serializable; @@ -31,7 +32,7 @@ public class TsKvCompositeKey implements Serializable{ @Transient private static final long serialVersionUID = -4089175869616037523L; - private String entityType; + private EntityType entityType; private UUID entityId; private String key; private long ts; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvEntity.java index 603da6f3a4..356f3bd4a3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvEntity.java @@ -16,7 +16,8 @@ package org.thingsboard.server.dao.model.sql; import lombok.Data; -import org.thingsboard.server.common.data.kv.TsKvEntry; +import org.thingsboard.server.common.data.EntityType; +import org.thingsboard.server.common.data.kv.*; import org.thingsboard.server.dao.model.ToData; import javax.persistence.*; @@ -30,9 +31,41 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; @IdClass(TsKvCompositeKey.class) public final class TsKvEntity implements ToData { + public TsKvEntity() { + } + + public TsKvEntity(Double avgLongValue, Double avgDoubleValue) { + this.longValue = avgLongValue.longValue(); + this.doubleValue = avgDoubleValue; + } + + public TsKvEntity(Long sumLongValue, Double sumDoubleValue) { + this.longValue = sumLongValue; + this.doubleValue = sumDoubleValue; + } + + public TsKvEntity(String strValue, Long longValue, Double doubleValue) { + this.strValue = strValue; + this.longValue = longValue; + this.doubleValue = doubleValue; + } + + public TsKvEntity(Long booleanValueCount, Long strValueCount, Long longValueCount, Long doubleValueCount) { + if (booleanValueCount != 0) { + this.longValue = booleanValueCount; + } else if (strValueCount != 0) { + this.longValue = strValueCount; + } else if (longValueCount != 0) { + this.longValue = longValueCount; + } else if (doubleValueCount != 0) { + this.longValue = doubleValueCount; + } + } + @Id + @Enumerated(EnumType.STRING) @Column(name = ENTITY_TYPE_COLUMN) - private String entityType; + private EntityType entityType; @Id @Column(name = ENTITY_ID_COLUMN) @@ -60,6 +93,16 @@ public final class TsKvEntity implements ToData { @Override public TsKvEntry toData() { - return null; + KvEntry kvEntry = null; + if (strValue != null) { + kvEntry = new StringDataEntry(key, strValue); + } else if (longValue != null) { + kvEntry = new LongDataEntry(key, longValue); + } else if (doubleValue != null) { + kvEntry = new DoubleDataEntry(key, doubleValue); + } else if (booleanValue != null) { + kvEntry = new BooleanDataEntry(key, booleanValue); + } + return new BasicTsKvEntry(ts, kvEntry); } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestCompositeKey.java index ab6006f610..f7bf3b1281 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestCompositeKey.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestCompositeKey.java @@ -16,6 +16,7 @@ package org.thingsboard.server.dao.model.sql; import lombok.*; +import org.thingsboard.server.common.data.EntityType; import javax.persistence.Transient; import java.io.Serializable; @@ -29,7 +30,7 @@ public class TsKvLatestCompositeKey implements Serializable{ @Transient private static final long serialVersionUID = -4089175869616037523L; - private String entityType; + private EntityType entityType; private UUID entityId; private String key; } \ No newline at end of file diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestEntity.java index b9a4543e23..47a5e006f7 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestEntity.java @@ -16,6 +16,7 @@ package org.thingsboard.server.dao.model.sql; import lombok.Data; +import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.kv.*; import org.thingsboard.server.dao.model.ToData; @@ -31,8 +32,9 @@ import static org.thingsboard.server.dao.model.ModelConstants.*; public final class TsKvLatestEntity implements ToData { @Id + @Enumerated(EnumType.STRING) @Column(name = ENTITY_TYPE_COLUMN) - private String entityType; + private EntityType entityType; @Id @Column(name = ENTITY_ID_COLUMN) diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java index cf69004050..c77d339bd2 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java @@ -83,7 +83,7 @@ public class JpaAttributeDao extends JpaAbstractDaoListeningExecutorService impl @Override public ListenableFuture save(EntityId entityId, String attributeType, AttributeKvEntry attribute) { AttributeKvEntity entity = new AttributeKvEntity(); - entity.setEntityType(entityId.getEntityType().name()); + entity.setEntityType(entityId.getEntityType()); entity.setEntityId(entityId.getId()); entity.setAttributeType(attributeType); entity.setAttributeKey(attribute.getKey()); @@ -104,7 +104,7 @@ public class JpaAttributeDao extends JpaAbstractDaoListeningExecutorService impl .stream() .map(key -> { AttributeKvEntity entityToDelete = new AttributeKvEntity(); - entityToDelete.setEntityType(entityId.getEntityType().name()); + entityToDelete.setEntityType(entityId.getEntityType()); entityToDelete.setEntityId(entityId.getId()); entityToDelete.setAttributeType(attributeType); entityToDelete.setAttributeKey(key); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java index bc056e1c64..7b64a4fdb0 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java @@ -21,6 +21,7 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.kv.Aggregation; @@ -35,6 +36,7 @@ import org.thingsboard.server.dao.sql.JpaAbstractDaoListeningExecutorService; import org.thingsboard.server.dao.timeseries.TimeseriesDao; import javax.annotation.Nullable; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -73,19 +75,93 @@ public class JpaTimeseriesDao extends JpaAbstractDaoListeningExecutorService imp if (query.getAggregation() == Aggregation.NONE) { return findAllAsyncWithLimit(entityId, query); } else { - return service.submit(() -> null); + long stepTs = query.getStartTs(); + List> futures = new ArrayList<>(); + while (stepTs < query.getEndTs()) { + long startTs = stepTs; + long endTs = stepTs + query.getInterval(); + long ts = startTs + (endTs - startTs) / 2; + futures.add(findAndAggregateAsync(entityId, query.getKey(), startTs, endTs, ts, query.getAggregation())); + stepTs = endTs; + } + return Futures.allAsList(futures); + } + } + + private ListenableFuture findAndAggregateAsync(EntityId entityId, String key, long startTs, long endTs, long ts, Aggregation aggregation) { + TsKvEntity entity; + switch (aggregation) { + case AVG: + entity = tsKvRepository.findAvg( + entityId.getId(), + entityId.getEntityType(), + key, + startTs, + endTs); + + break; + case MAX: + entity = tsKvRepository.findMax( + entityId.getId(), + entityId.getEntityType(), + key, + startTs, + endTs); + + break; + case MIN: + entity = tsKvRepository.findMin( + entityId.getId(), + entityId.getEntityType(), + key, + startTs, + endTs); + + break; + case SUM: + entity = tsKvRepository.findSum( + entityId.getId(), + entityId.getEntityType(), + key, + startTs, + endTs); + + break; + case COUNT: + entity = tsKvRepository.findCount( + entityId.getId(), + entityId.getEntityType(), + key, + startTs, + endTs); + + break; + default: + entity = null; + } + if (entity != null){ + entity.setTs(ts); } + return service.submit(() -> DaoUtil.getData(entity)); } private ListenableFuture> findAllAsyncWithLimit(EntityId entityId, TsKvQuery query) { - return service.submit(() -> null); + return service.submit(() -> + DaoUtil.convertDataList( + tsKvRepository.findAllWithLimit( + entityId.getId(), + entityId.getEntityType(), + query.getKey(), + query.getStartTs(), + query.getEndTs(), + new PageRequest(0, query.getLimit())))); } @Override public ListenableFuture findLatest(EntityId entityId, String key) { TsKvLatestCompositeKey compositeKey = new TsKvLatestCompositeKey( - entityId.getEntityType().name(), + entityId.getEntityType(), entityId.getId(), key); return service.submit(() -> @@ -104,7 +180,7 @@ public class JpaTimeseriesDao extends JpaAbstractDaoListeningExecutorService imp @Override public ListenableFuture save(EntityId entityId, TsKvEntry tsKvEntry, long ttl) { TsKvEntity entity = new TsKvEntity(); - entity.setEntityType(entityId.getEntityType().name()); + entity.setEntityType(entityId.getEntityType()); entity.setEntityId(entityId.getId()); entity.setTs(tsKvEntry.getTs()); entity.setKey(tsKvEntry.getKey()); @@ -126,7 +202,7 @@ public class JpaTimeseriesDao extends JpaAbstractDaoListeningExecutorService imp @Override public ListenableFuture saveLatest(EntityId entityId, TsKvEntry tsKvEntry) { TsKvLatestEntity latestEntity = new TsKvLatestEntity(); - latestEntity.setEntityType(entityId.getEntityType().name()); + latestEntity.setEntityType(entityId.getEntityType()); latestEntity.setEntityId(entityId.getId()); latestEntity.setTs(tsKvEntry.getTs()); latestEntity.setKey(tsKvEntry.getKey()); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvRepository.java index 786184e157..a3f59cd260 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvRepository.java @@ -15,11 +15,76 @@ */ package org.thingsboard.server.dao.sql.timeseries; +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.EntityType; import org.thingsboard.server.dao.annotation.SqlDao; import org.thingsboard.server.dao.model.sql.TsKvCompositeKey; import org.thingsboard.server.dao.model.sql.TsKvEntity; +import java.util.List; +import java.util.UUID; + @SqlDao public interface TsKvRepository extends CrudRepository { + + @Query("SELECT tskv FROM TsKvEntity tskv WHERE tskv.entityId = :entityId " + + "AND tskv.entityType = :entityType AND tskv.key = :entityKey " + + "AND tskv.ts > :startTs AND tskv.ts < :endTs ORDER BY tskv.ts DESC") + List findAllWithLimit(@Param("entityId") UUID entityId, + @Param("entityType") EntityType entityType, + @Param("entityKey") String key, + @Param("startTs") long startTs, + @Param("endTs") long endTs, + Pageable pageable); + + @Query("SELECT new TsKvEntity(MAX(tskv.strValue), MAX(tskv.longValue), MAX(tskv.doubleValue)) FROM TsKvEntity tskv " + + "WHERE tskv.entityId = :entityId AND tskv.entityType = :entityType " + + "AND tskv.key = :entityKey AND tskv.ts > :startTs AND tskv.ts < :endTs") + TsKvEntity findMax(@Param("entityId") UUID entityId, + @Param("entityType") EntityType entityType, + @Param("entityKey") String entityKey, + @Param("startTs") long startTs, + @Param("endTs") long endTs); + + @Query("SELECT new TsKvEntity(MIN(tskv.strValue), MIN(tskv.longValue), MIN(tskv.doubleValue)) FROM TsKvEntity tskv " + + "WHERE tskv.entityId = :entityId AND tskv.entityType = :entityType " + + "AND tskv.key = :entityKey AND tskv.ts > :startTs AND tskv.ts < :endTs") + TsKvEntity findMin(@Param("entityId") UUID entityId, + @Param("entityType") EntityType entityType, + @Param("entityKey") String entityKey, + @Param("startTs") long startTs, + @Param("endTs") long endTs); + + + @Query("SELECT new TsKvEntity(COUNT(tskv.booleanValue), COUNT(tskv.strValue), COUNT(tskv.longValue), COUNT(tskv.doubleValue)) FROM TsKvEntity tskv " + + "WHERE tskv.entityId = :entityId AND tskv.entityType = :entityType " + + "AND tskv.key = :entityKey AND tskv.ts > :startTs AND tskv.ts < :endTs") + TsKvEntity findCount(@Param("entityId") UUID entityId, + @Param("entityType") EntityType entityType, + @Param("entityKey") String entityKey, + @Param("startTs") long startTs, + @Param("endTs") long endTs); + + + @Query("SELECT new TsKvEntity(AVG(tskv.longValue), AVG(tskv.doubleValue)) FROM TsKvEntity tskv " + + "WHERE tskv.entityId = :entityId AND tskv.entityType = :entityType " + + "AND tskv.key = :entityKey AND tskv.ts > :startTs AND tskv.ts < :endTs") + TsKvEntity findAvg(@Param("entityId") UUID entityId, + @Param("entityType") EntityType entityType, + @Param("entityKey") String entityKey, + @Param("startTs") long startTs, + @Param("endTs") long endTs); + + + @Query("SELECT new TsKvEntity(SUM(tskv.longValue), SUM(tskv.doubleValue)) FROM TsKvEntity tskv " + + "WHERE tskv.entityId = :entityId AND tskv.entityType = :entityType " + + "AND tskv.key = :entityKey AND tskv.ts > :startTs AND tskv.ts < :endTs") + TsKvEntity findSum(@Param("entityId") UUID entityId, + @Param("entityType") EntityType entityType, + @Param("entityKey") String entityKey, + @Param("startTs") long startTs, + @Param("endTs") long endTs); } From 6048b45e397cd4897018f76333128efe8a5fafad Mon Sep 17 00:00:00 2001 From: mp-loki Date: Sat, 24 Jun 2017 13:29:43 -0400 Subject: [PATCH 62/69] Embedded Postgresql test unit added --- dao/pom.xml | 5 + .../server/dao/CustomPostgresUnit.java | 109 ++++++++++++++++++ .../thingsboard/server/dao/DaoTestSuite.java | 13 +++ dao/src/test/resources/jpa-test.properties | 2 +- .../postgres-embedded-test.properties | 5 + pom.xml | 7 ++ 6 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 dao/src/test/java/org/thingsboard/server/dao/CustomPostgresUnit.java create mode 100644 dao/src/test/resources/postgres-embedded-test.properties diff --git a/dao/pom.xml b/dao/pom.xml index 4cddf8ba91..7686f10033 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -174,6 +174,11 @@ h2 test + + ru.yandex.qatools.embed + postgresql-embedded + test + diff --git a/dao/src/test/java/org/thingsboard/server/dao/CustomPostgresUnit.java b/dao/src/test/java/org/thingsboard/server/dao/CustomPostgresUnit.java new file mode 100644 index 0000000000..c0025ce9d7 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/CustomPostgresUnit.java @@ -0,0 +1,109 @@ +/** + * 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 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; +import java.io.InputStream; +import java.net.URL; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.List; +import java.util.Properties; + +import static ru.yandex.qatools.embed.postgresql.distribution.Version.Main.V9_6; + +/** + * Created by Valerii Sosliuk on 6/24/2017. + */ +@Slf4j +public class CustomPostgresUnit extends ExternalResource { + + private static final String HOST = "host"; + private static final String PORT = "port"; + private static final String DATABASE = "database"; + private static final String USERNAME = "username"; + private static final String PASSWORD = "password"; + + private List sqlFiles; + private Properties properties; + + private EmbeddedPostgres postgres; + + public CustomPostgresUnit(List sqlFiles, String configurationFileName) { + this.sqlFiles = sqlFiles; + this.properties = loadProperties(configurationFileName); + } + + @Override + public void before() { + postgres = new EmbeddedPostgres(V9_6); + load(); + } + + @Override + public void after() { + postgres.stop(); + } + + private void load() { + Connection conn = null; + try { + String url = postgres.start(properties.getProperty(HOST), + Integer.parseInt(properties.getProperty(PORT)), + properties.getProperty(DATABASE), + properties.getProperty(USERNAME), + properties.getProperty(PASSWORD)); + + conn = DriverManager.getConnection(url); + for (String sqlFile : sqlFiles) { + URL sqlFileUrl = Resources.getResource(sqlFile); + String sql = Resources.toString(sqlFileUrl, Charsets.UTF_8); + conn.createStatement().execute(sql); + } + } catch (IOException | SQLException e) { + throw new RuntimeException("Unable to start embedded postgres. Reason: " + e.getMessage(), e); + } finally { + if (conn != null) { + try { + conn.close(); + } catch (SQLException e) { + log.error(e.getMessage(), e); + } + } + } + } + + private Properties loadProperties(String fileName) { + final Properties properties = new Properties(); + try (final InputStream stream = this.getClass().getClassLoader().getResourceAsStream(fileName)) { + properties.load(stream); + return properties; + } catch (IOException e) { + throw new RuntimeException(e.getMessage(), e); + } + } +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java b/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java index 845c4c67c8..9d2b38ed6e 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java +++ b/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java @@ -20,9 +20,16 @@ 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", @@ -41,4 +48,10 @@ public class DaoTestSuite { new ClassPathCQLDataSet("cassandra/system-data.cql", false, false), new ClassPathCQLDataSet("system-test.cql", false, false)), "cassandra-test.yaml", 30000l); + + @ClassRule + public static CustomPostgresUnit postgresUnit = new CustomPostgresUnit( + Arrays.asList("postgres/schema.sql", "postgres/system-data.sql"), + "postgres-embedded-test.properties"); + } diff --git a/dao/src/test/resources/jpa-test.properties b/dao/src/test/resources/jpa-test.properties index 80ae6ffc29..f2ce4b2df9 100644 --- a/dao/src/test/resources/jpa-test.properties +++ b/dao/src/test/resources/jpa-test.properties @@ -5,7 +5,7 @@ sql.enabled=true spring.jpa.show-sql=false spring.jpa.hibernate.ddl-auto=validate -spring.datasource.url=jdbc:postgresql://localhost:5432/thingsboard +spring.datasource.url=jdbc:postgresql://localhost:5433/thingsboard spring.datasource.username=postgres spring.datasource.password=postgres diff --git a/dao/src/test/resources/postgres-embedded-test.properties b/dao/src/test/resources/postgres-embedded-test.properties new file mode 100644 index 0000000000..557aad5905 --- /dev/null +++ b/dao/src/test/resources/postgres-embedded-test.properties @@ -0,0 +1,5 @@ +host: localhost +port: 5433 +database: thingsboard +username: postgres +password: postgres \ No newline at end of file diff --git a/pom.xml b/pom.xml index d09e4ca517..393fbbaea4 100755 --- a/pom.xml +++ b/pom.xml @@ -745,6 +745,13 @@ com.h2database h2 ${h2.version} + test + + + ru.yandex.qatools.embed + postgresql-embedded + 2.2 + test com.sun.winsw From 09858d651535ac73102d692dc7b46f6e91e6928b Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Mon, 26 Jun 2017 10:20:48 +0300 Subject: [PATCH 63/69] Fixed entityType mapping --- .../server/dao/model/sql/AttributeKvCompositeKey.java | 3 ++- .../server/dao/sql/attributes/AttributeKvRepository.java | 3 ++- .../server/dao/sql/attributes/JpaAttributeDao.java | 6 +++--- .../server/dao/sql/timeseries/JpaTimeseriesDao.java | 2 +- .../server/dao/sql/timeseries/TsKvLatestRepository.java | 3 ++- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java index 7424e1fb89..0efda29230 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java @@ -18,6 +18,7 @@ package org.thingsboard.server.dao.model.sql; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.thingsboard.server.common.data.EntityType; import java.io.Serializable; import java.util.UUID; @@ -26,7 +27,7 @@ import java.util.UUID; @AllArgsConstructor @NoArgsConstructor public class AttributeKvCompositeKey implements Serializable { - private String entityType; + private EntityType entityType; private UUID entityId; private String attributeType; private String attributeKey; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java index a090049eb1..9b937f63b7 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java @@ -16,6 +16,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.model.sql.AttributeKvCompositeKey; import org.thingsboard.server.dao.model.sql.AttributeKvEntity; @@ -26,7 +27,7 @@ import java.util.UUID; @SqlDao public interface AttributeKvRepository extends CrudRepository { - List findAllByEntityTypeAndEntityIdAndAttributeType(String entityType, + List findAllByEntityTypeAndEntityIdAndAttributeType(EntityType entityType, UUID entityId, String attributeType); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java index c77d339bd2..82662729bb 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java @@ -46,7 +46,7 @@ public class JpaAttributeDao extends JpaAbstractDaoListeningExecutorService impl public ListenableFuture> find(EntityId entityId, String attributeType, String attributeKey) { AttributeKvCompositeKey compositeKey = new AttributeKvCompositeKey( - entityId.getEntityType().name(), + entityId.getEntityType(), entityId.getId(), attributeType, attributeKey); @@ -61,7 +61,7 @@ public class JpaAttributeDao extends JpaAbstractDaoListeningExecutorService impl .stream() .map(attributeKey -> new AttributeKvCompositeKey( - entityId.getEntityType().name(), + entityId.getEntityType(), entityId.getId(), attributeType, attributeKey)) @@ -75,7 +75,7 @@ public class JpaAttributeDao extends JpaAbstractDaoListeningExecutorService impl return service.submit(() -> DaoUtil.convertDataList(Lists.newArrayList( attributeKvRepository.findAllByEntityTypeAndEntityIdAndAttributeType( - entityId.getEntityType().name(), + entityId.getEntityType(), entityId.getId(), attributeType)))); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java index 7b64a4fdb0..91450551d6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/JpaTimeseriesDao.java @@ -173,7 +173,7 @@ public class JpaTimeseriesDao extends JpaAbstractDaoListeningExecutorService imp return service.submit(() -> DaoUtil.convertDataList(Lists.newArrayList( tsKvLatestRepository.findAllByEntityTypeAndEntityId( - entityId.getEntityType().name(), + entityId.getEntityType(), entityId.getId())))); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvLatestRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvLatestRepository.java index 7c447f190b..b2b7dea02e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvLatestRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/timeseries/TsKvLatestRepository.java @@ -16,6 +16,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.model.sql.TsKvLatestCompositeKey; import org.thingsboard.server.dao.model.sql.TsKvLatestEntity; @@ -26,5 +27,5 @@ import java.util.UUID; @SqlDao public interface TsKvLatestRepository extends CrudRepository { - List findAllByEntityTypeAndEntityId(String entityType, UUID entityId); + List findAllByEntityTypeAndEntityId(EntityType entityType, UUID entityId); } From 1983235b3fbbc21d722aacf36994f696d04afc19 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Mon, 26 Jun 2017 19:19:17 +0300 Subject: [PATCH 64/69] Test fixed. Moving classes into new packages --- .../controller/AbstractControllerTest.java | 2 +- .../thingsboard/server/dao/JpaDaoConfig.java | 2 +- .../server/dao/NoSqlDaoConfig.java | 2 +- .../server/dao/alarm/CassandraAlarmDao.java | 4 +- .../server/dao/asset/CassandraAssetDao.java | 4 +- .../CassandraBaseAttributesDao.java | 4 +- .../dao/cassandra/CassandraCluster.java | 2 +- .../dao/cassandra/CassandraQueryOptions.java | 2 + .../dao/cassandra/CassandraSocketOptions.java | 2 + .../CassandraBaseComponentDescriptorDao.java | 8 ++-- .../dao/customer/CassandraCustomerDao.java | 4 +- .../dao/dashboard/CassandraDashboardDao.java | 4 +- .../dashboard/CassandraDashboardInfoDao.java | 4 +- .../device/CassandraDeviceCredentialsDao.java | 4 +- .../server/dao/device/CassandraDeviceDao.java | 4 +- .../server/dao/event/BaseEventService.java | 3 +- .../dao/event/CassandraBaseEventDao.java | 4 +- .../server/dao/model/nosql/EventEntity.java | 8 ++-- .../dao/model/sql/AdminSettingsEntity.java | 2 +- .../server/dao/model/sql/AlarmEntity.java | 2 +- .../server/dao/model/sql/AssetEntity.java | 2 +- .../model/sql/ComponentDescriptorEntity.java | 2 +- .../server/dao/model/sql/CustomerEntity.java | 2 +- .../server/dao/model/sql/DashboardEntity.java | 2 +- .../server/dao/model/sql/DeviceEntity.java | 2 +- .../server/dao/model/sql/EventEntity.java | 2 +- .../dao/model/sql/PluginMetaDataEntity.java | 2 +- .../server/dao/model/sql/RelationEntity.java | 2 +- .../dao/model/sql/RuleMetaDataEntity.java | 2 +- .../server/dao/model/sql/TenantEntity.java | 2 +- .../server/dao/model/sql/UserEntity.java | 2 +- .../dao/model/sql/WidgetTypeEntity.java | 2 +- .../CassandraAbstractAsyncDao.java | 2 +- .../dao/{ => nosql}/CassandraAbstractDao.java | 2 +- .../CassandraAbstractModelDao.java | 5 ++- .../CassandraAbstractSearchTextDao.java | 2 +- .../CassandraAbstractSearchTimeDao.java | 2 +- .../dao/plugin/CassandraBasePluginDao.java | 4 +- .../server/dao/relation/BaseRelationDao.java | 6 +-- .../server/dao/rule/CassandraBaseRuleDao.java | 4 +- .../settings/CassandraAdminSettingsDao.java | 4 +- .../server/dao/sql/alarm/AlarmRepository.java | 2 +- .../server/dao/sql/alarm/JpaAlarmDao.java | 2 +- .../server/dao/sql/asset/AssetRepository.java | 3 +- .../server/dao/sql/asset/JpaAssetDao.java | 2 +- .../sql/attributes/AttributeKvRepository.java | 2 +- .../dao/sql/attributes/JpaAttributeDao.java | 2 +- .../ComponentDescriptorRepository.java | 10 +++-- .../JpaBaseComponentDescriptorDao.java | 8 ++-- .../dao/sql/customer/CustomerRepository.java | 2 +- .../dao/sql/customer/JpaCustomerDao.java | 2 +- .../dashboard/DashboardInfoRepository.java | 2 +- .../sql/dashboard/DashboardRepository.java | 2 +- .../dao/sql/dashboard/JpaDashboardDao.java | 2 +- .../sql/dashboard/JpaDashboardInfoDao.java | 2 +- .../device/DeviceCredentialsRepository.java | 2 +- .../dao/sql/device/DeviceRepository.java | 2 +- .../sql/device/JpaDeviceCredentialsDao.java | 2 +- .../server/dao/sql/device/JpaDeviceDao.java | 2 +- .../server/dao/sql/event/EventRepository.java | 13 +++++-- .../server/dao/sql/event/JpaBaseEventDao.java | 6 ++- .../dao/sql/plugin/JpaBasePluginDao.java | 2 +- .../sql/plugin/PluginMetaDataRepository.java | 2 +- .../dao/sql/relation/JpaRelationDao.java | 3 +- .../dao/sql/relation/RelationRepository.java | 2 +- .../server/dao/sql/rule/JpaBaseRuleDao.java | 2 +- .../dao/sql/rule/RuleMetaDataRepository.java | 2 +- .../dao/sql/settings/JpaAdminSettingsDao.java | 2 +- .../server/dao/sql/tenant/JpaTenantDao.java | 2 +- .../dao/sql/tenant/TenantRepository.java | 2 +- .../dao/sql/timeseries/JpaTimeseriesDao.java | 2 +- .../sql/timeseries/TsKvLatestRepository.java | 2 +- .../dao/sql/timeseries/TsKvRepository.java | 2 +- .../server/dao/sql/user/JpaUserDao.java | 2 +- .../server/dao/sql/user/UserRepository.java | 2 +- .../dao/sql/widget/JpaWidgetTypeDao.java | 2 +- .../dao/sql/widget/JpaWidgetsBundleDao.java | 2 +- .../dao/sql/widget/WidgetTypeRepository.java | 2 +- .../sql/widget/WidgetsBundleRepository.java | 2 +- .../server/dao/tenant/CassandraTenantDao.java | 4 +- .../CassandraBaseTimeseriesDao.java | 4 +- .../dao/user/CassandraUserCredentialsDao.java | 5 +-- .../server/dao/user/CassandraUserDao.java | 4 +- .../dao/{annotation => util}/NoSqlDao.java | 2 +- .../dao/{annotation => util}/SqlDao.java | 2 +- .../AbstractJsonSqlTypeDescriptor.java | 2 +- .../dao/util/{ => mapping}/JacksonUtil.java | 2 +- .../JsonStringSqlTypeDescriptor.java | 2 +- .../util/{ => mapping}/JsonStringType.java | 2 +- .../{ => mapping}/JsonTypeDescriptor.java | 2 +- .../dao/widget/CassandraWidgetTypeDao.java | 4 +- .../dao/widget/CassandraWidgetsBundleDao.java | 4 +- dao/src/main/resources/postgres/schema.sql | 3 +- .../server/dao/AbstractJpaDaoTest.java | 2 +- .../server/dao/CustomPostgresUnit.java | 4 -- ...estSuite.java => DaoServiceTestSuite.java} | 22 +++-------- .../server/dao/JpaDaoTestSuite.java | 37 +++++++++++++++++++ .../server/dao/JpaDbunitTestConfig.java | 2 +- .../dao/service/AbstractServiceTest.java | 2 - ...java => BaseAdminSettingsServiceTest.java} | 12 +++--- ...iceTest.java => BaseAlarmServiceTest.java} | 13 +------ .../dao/service/BaseAssetServiceTest.java | 2 +- ...Test.java => BaseCustomerServiceTest.java} | 2 +- ...est.java => BaseDashboardServiceTest.java} | 2 +- ...va => BaseDeviceCredentialsCacheTest.java} | 7 +++- ... => BaseDeviceCredentialsServiceTest.java} | 2 +- ...plTest.java => BaseDeviceServiceTest.java} | 3 +- ...Test.java => BaseRelationServiceTest.java} | 2 +- ...plTest.java => BaseTenantServiceTest.java} | 14 +++---- ...ImplTest.java => BaseUserServiceTest.java} | 2 +- ...st.java => BaseWidgetTypeServiceTest.java} | 2 +- ...java => BaseWidgetsBundleServiceTest.java} | 2 +- .../dao/service/DaoServiceNoSqlTest.java | 28 ++++++++++++++ .../server/dao/service/DaoServiceSqlTest.java | 28 ++++++++++++++ .../attributes/BaseAttributesServiceTest.java | 5 ++- .../nosql/AttributesServiceNoSqlTest.java | 23 ++++++++++++ .../sql/AttributesServiceSqlTest.java | 23 ++++++++++++ .../event/BaseEventServiceTest.java | 4 +- .../event/nosql/EventServiceNoSqlTest.java | 23 ++++++++++++ .../event/sql/EventServiceSqlTest.java | 23 ++++++++++++ .../nosql/AdminSettingsServiceNoSqlTest.java | 23 ++++++++++++ .../service/nosql/AlarmServiceNoSqlTest.java | 23 ++++++++++++ .../service/nosql/AssetServiceNoSqlTest.java | 23 ++++++++++++ .../nosql/CustomerServiceNoSqlTest.java | 23 ++++++++++++ .../nosql/DashboardServiceNoSqlTest.java | 23 ++++++++++++ .../nosql/DeviceCredentialCacheNoSqlTest.java | 23 ++++++++++++ .../DeviceCredentialServiceNoSqlTest.java | 23 ++++++++++++ .../service/nosql/DeviceServiceNoSqlTest.java | 23 ++++++++++++ .../nosql/RelationServiceNoSqlTest.java | 23 ++++++++++++ .../service/nosql/TenantServiceNoSqlTest.java | 23 ++++++++++++ .../service/nosql/UserServiceNoSqlTest.java | 23 ++++++++++++ .../nosql/WidgetTypeServiceNoSqlTest.java | 23 ++++++++++++ .../nosql/WidgetsBundleServiceNoSqlTest.java | 23 ++++++++++++ .../plugin/BasePluginServiceTest.java | 4 +- .../plugin/nosql/PluginServiceNoSqlTest.java | 23 ++++++++++++ .../plugin/sql/PluginServiceSqlTest.java | 23 ++++++++++++ .../rule/BaseRuleServiceTest.java | 4 +- .../rule/nosql/RuleServiceNoSqlTest.java | 23 ++++++++++++ .../service/rule/sql/RuleServiceSqlTest.java | 23 ++++++++++++ .../sql/AdminSettingsServiceSqlTest.java | 23 ++++++++++++ .../dao/service/sql/AlarmServiceSqlTest.java | 23 ++++++++++++ .../dao/service/sql/AssetServiceSqlTest.java | 23 ++++++++++++ .../service/sql/CustomerServiceSqlTest.java | 23 ++++++++++++ .../service/sql/DashboardServiceSqlTest.java | 23 ++++++++++++ .../sql/DeviceCredentialsCacheSqlTest.java | 23 ++++++++++++ .../sql/DeviceCredentialsServiceSqlTest.java | 23 ++++++++++++ .../dao/service/sql/DeviceServiceSqlTest.java | 23 ++++++++++++ .../service/sql/RelationServiceSqlTest.java | 23 ++++++++++++ .../dao/service/sql/TenantServiceSqlTest.java | 23 ++++++++++++ .../dao/service/sql/UserServiceSqlTest.java | 23 ++++++++++++ .../service/sql/WidgetTypeServiceSqlTest.java | 23 ++++++++++++ .../sql/WidgetsBundleServiceSqlTest.java | 23 ++++++++++++ .../BaseTimeseriesServiceTest.java} | 4 +- .../nosql/TimeseriesServiceNoSqlTest.java | 23 ++++++++++++ .../sql/TimeseriesServiceSqlTest.java | 23 ++++++++++++ .../JpaBaseComponentDescriptorDaoTest.java | 1 - .../dao/sql/plugin/JpaBasePluginDaoTest.java | 6 +-- .../dao/sql/rule/JpaBaseRuleDaoTest.java | 4 +- .../server/dao/sql/user/JpaUserDaoTest.java | 3 +- .../sql/widget/JpaWidgetsBundleDaoTest.java | 1 - .../resources/application-test.properties | 4 -- dao/src/test/resources/nosql-test.properties | 2 + .../postgres-embedded-test.properties | 2 +- ...pa-test.properties => sql-test.properties} | 3 +- 164 files changed, 1122 insertions(+), 218 deletions(-) rename dao/src/main/java/org/thingsboard/server/dao/{ => nosql}/CassandraAbstractAsyncDao.java (97%) rename dao/src/main/java/org/thingsboard/server/dao/{ => nosql}/CassandraAbstractDao.java (98%) rename dao/src/main/java/org/thingsboard/server/dao/{ => nosql}/CassandraAbstractModelDao.java (98%) rename dao/src/main/java/org/thingsboard/server/dao/{ => nosql}/CassandraAbstractSearchTextDao.java (98%) rename dao/src/main/java/org/thingsboard/server/dao/{ => nosql}/CassandraAbstractSearchTimeDao.java (99%) rename dao/src/main/java/org/thingsboard/server/dao/{annotation => util}/NoSqlDao.java (94%) rename dao/src/main/java/org/thingsboard/server/dao/{annotation => util}/SqlDao.java (94%) rename dao/src/main/java/org/thingsboard/server/dao/util/{ => mapping}/AbstractJsonSqlTypeDescriptor.java (98%) rename dao/src/main/java/org/thingsboard/server/dao/util/{ => mapping}/JacksonUtil.java (97%) rename dao/src/main/java/org/thingsboard/server/dao/util/{ => mapping}/JsonStringSqlTypeDescriptor.java (97%) rename dao/src/main/java/org/thingsboard/server/dao/util/{ => mapping}/JsonStringType.java (96%) rename dao/src/main/java/org/thingsboard/server/dao/util/{ => mapping}/JsonTypeDescriptor.java (98%) rename dao/src/test/java/org/thingsboard/server/dao/{DaoTestSuite.java => DaoServiceTestSuite.java} (64%) create mode 100644 dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java rename dao/src/test/java/org/thingsboard/server/dao/service/{AdminSettingsServiceImplTest.java => BaseAdminSettingsServiceTest.java} (98%) rename dao/src/test/java/org/thingsboard/server/dao/service/{AlarmServiceTest.java => BaseAlarmServiceTest.java} (92%) rename dao/src/test/java/org/thingsboard/server/dao/service/{CustomerServiceImplTest.java => BaseCustomerServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{DashboardServiceImplTest.java => BaseDashboardServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{DeviceCredentialsCacheTest.java => BaseDeviceCredentialsCacheTest.java} (97%) rename dao/src/test/java/org/thingsboard/server/dao/service/{DeviceCredentialsServiceImplTest.java => BaseDeviceCredentialsServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{DeviceServiceImplTest.java => BaseDeviceServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{RelationServiceImplTest.java => BaseRelationServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{TenantServiceImplTest.java => BaseTenantServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{UserServiceImplTest.java => BaseUserServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{WidgetTypeServiceImplTest.java => BaseWidgetTypeServiceTest.java} (99%) rename dao/src/test/java/org/thingsboard/server/dao/service/{WidgetsBundleServiceImplTest.java => BaseWidgetsBundleServiceTest.java} (99%) create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceNoSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceSqlTest.java rename dao/src/test/java/org/thingsboard/server/dao/{ => service}/attributes/BaseAttributesServiceTest.java (95%) create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/attributes/nosql/AttributesServiceNoSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/attributes/sql/AttributesServiceSqlTest.java rename dao/src/test/java/org/thingsboard/server/dao/{ => service}/event/BaseEventServiceTest.java (98%) create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/event/nosql/EventServiceNoSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/event/sql/EventServiceSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/nosql/AdminSettingsServiceNoSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/nosql/AlarmServiceNoSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/nosql/AssetServiceNoSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/nosql/CustomerServiceNoSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/nosql/DashboardServiceNoSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialCacheNoSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialServiceNoSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceServiceNoSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/nosql/RelationServiceNoSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/nosql/TenantServiceNoSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/nosql/UserServiceNoSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetTypeServiceNoSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetsBundleServiceNoSqlTest.java rename dao/src/test/java/org/thingsboard/server/dao/{ => service}/plugin/BasePluginServiceTest.java (97%) create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/plugin/nosql/PluginServiceNoSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/plugin/sql/PluginServiceSqlTest.java rename dao/src/test/java/org/thingsboard/server/dao/{ => service}/rule/BaseRuleServiceTest.java (98%) create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/rule/nosql/RuleServiceNoSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/rule/sql/RuleServiceSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/AdminSettingsServiceSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmServiceSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetServiceSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/CustomerServiceSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/DashboardServiceSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsServiceSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceServiceSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationServiceSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantServiceSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/UserServiceSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetTypeServiceSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetsBundleServiceSqlTest.java rename dao/src/test/java/org/thingsboard/server/dao/{timeseries/TimeseriesServiceTest.java => service/timeseries/BaseTimeseriesServiceTest.java} (98%) create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlTest.java create mode 100644 dao/src/test/java/org/thingsboard/server/dao/service/timeseries/sql/TimeseriesServiceSqlTest.java create mode 100644 dao/src/test/resources/nosql-test.properties rename dao/src/test/resources/{jpa-test.properties => sql-test.properties} (93%) diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java index ca02138d2a..f973aaf825 100644 --- a/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java +++ b/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"}) diff --git a/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java b/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java index 7c791cf2ec..5e4d5c17e3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java +++ b/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 diff --git a/dao/src/main/java/org/thingsboard/server/dao/NoSqlDaoConfig.java b/dao/src/main/java/org/thingsboard/server/dao/NoSqlDaoConfig.java index 234ae882dd..904d390657 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/NoSqlDaoConfig.java +++ b/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( 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 d15f38a9c8..83578eb29a 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 @@ -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; 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 ce8111d54c..c2025b9f7d 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 @@ -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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java index 1dd7a6dc47..247463fbe4 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/attributes/CassandraBaseAttributesDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java index e3b6bfa786..e180d140ad 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraQueryOptions.java b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraQueryOptions.java index 27ac661231..1d29910c58 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraQueryOptions.java +++ b/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}") diff --git a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraSocketOptions.java b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraSocketOptions.java index b4cb7ba120..5c8f196f05 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraSocketOptions.java +++ b/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}") diff --git a/dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java b/dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java index 64ae0c03e9..d39b7f8bab 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/component/CassandraBaseComponentDescriptorDao.java +++ b/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 findByTypeAndPageLink(ComponentType type, TextPageLink pageLink) { log.debug("Try to find component by type [{}] and pageLink [{}]", type, pageLink); List 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 findByScopeAndTypeAndPageLink(ComponentScope scope, ComponentType type, TextPageLink pageLink) { log.debug("Try to find component by scope [{}] and type [{}] and pageLink [{}]", scope, type, pageLink); List 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())); diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CassandraCustomerDao.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CassandraCustomerDao.java index c363d330f0..cdb49f8b26 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/customer/CassandraCustomerDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardDao.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardDao.java index d323ff857a..07a7d350b6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardInfoDao.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardInfoDao.java index 61ce9e199b..7d1ae35ecf 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/CassandraDashboardInfoDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceCredentialsDao.java b/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceCredentialsDao.java index 5ee86706f9..f1e1dd9bb1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceCredentialsDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceDao.java index 6b889c18f8..c465eeaee0 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/CassandraDeviceDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java b/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java index c5c4e478d8..4e47f3a152 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java +++ b/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 result = eventDao.saveIfNotExists(event); - return result.isPresent() ? Optional.of(result.get()) : Optional.empty(); + return eventDao.saveIfNotExists(event); } @Override diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java index 741e251af2..26eb84757a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/EventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/EventEntity.java index 8224fb83d0..55945731b1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/EventEntity.java +++ b/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 */ diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java index 6c98466b83..82453ad1de 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java index 2107a5ff36..6159d9f6cb 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java index 5d24aeb7bb..8f0792c9c3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java index eee91372eb..67c94dafee 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java index 66466523ab..557a94cb3b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java index 5266b90048..6f7f8c649b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java index f4c8dd2989..3c8ca33f77 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java index ff7968718a..1ed365dfa3 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java index a53c1ab007..d8b42b9e68 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java index d13a7ef4da..b31d45aebc 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java index 33971c348d..6f768b1172 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java index 19cfe4b450..633e5e5fa8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java index ccfaba10d6..dbedffd573 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java index 38f83cb128..0e09123915 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractAsyncDao.java b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractAsyncDao.java similarity index 97% rename from dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractAsyncDao.java rename to dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractAsyncDao.java index d61218f012..0d64badcea 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractAsyncDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractDao.java similarity index 98% rename from dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractDao.java rename to dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractDao.java index 8bb44bf4af..4e4d9ca5f9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractModelDao.java b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractModelDao.java similarity index 98% rename from dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractModelDao.java rename to dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractModelDao.java index 5d372b1ecd..b7335d7942 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractModelDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTextDao.java b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractSearchTextDao.java similarity index 98% rename from dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTextDao.java rename to dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractSearchTextDao.java index 89c3583040..7b7f99dd4a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTextDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTimeDao.java b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractSearchTimeDao.java similarity index 99% rename from dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTimeDao.java rename to dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraAbstractSearchTimeDao.java index bc6b3e779b..86bbe9419b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/CassandraAbstractSearchTimeDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/plugin/CassandraBasePluginDao.java b/dao/src/main/java/org/thingsboard/server/dao/plugin/CassandraBasePluginDao.java index 6126aef9a7..991751e69e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/plugin/CassandraBasePluginDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java index 14c1cf3faa..72f159ea2a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/CassandraBaseRuleDao.java b/dao/src/main/java/org/thingsboard/server/dao/rule/CassandraBaseRuleDao.java index 33465cb2d8..c14bb4e632 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/rule/CassandraBaseRuleDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/settings/CassandraAdminSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/settings/CassandraAdminSettingsDao.java index 14017d89cb..c7ca062acd 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/settings/CassandraAdminSettingsDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java index c89fef6c63..1b129b5585 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java index 322afe7f67..5f902bfa6c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java index 8f86437adb..bc6a4d74e1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/AssetRepository.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java index 500b612918..fe5a169e3b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java index 9b937f63b7..872c249f38 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/AttributeKvRepository.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java index 82662729bb..ac6568257f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/attributes/JpaAttributeDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java index f15bbbf5ad..8be6b9551e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/component/ComponentDescriptorRepository.java +++ b/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 :idOffset ORDER BY cd.id") - List findByType(@Param("type") String type, + List findByType(@Param("type") ComponentType type, @Param("textSearch") String textSearch, @Param("idOffset") UUID idOffset, Pageable pageable); @@ -44,8 +46,8 @@ public interface ComponentDescriptorRepository extends CrudRepository :idOffset ORDER BY cd.id") - List findByScopeAndType(@Param("type") String type, - @Param("scope") String scope, + List findByScopeAndType(@Param("type") ComponentType type, + @Param("scope") ComponentScope scope, @Param("textSearch") String textSearch, @Param("idOffset") UUID idOffset, Pageable pageable); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java index e259bba06e..ae2a6ed6d7 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDao.java +++ b/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 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 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()))); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java index 009f926b2e..7e6c85901f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java index de54835c1a..27d5925992 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java index 2569867096..654915f74a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardInfoRepository.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardRepository.java index 9b8c42d06b..509fd174ec 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/DashboardRepository.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java index d40400016e..b40c99a7ab 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java index c604c7e4ef..9fe613a7e8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardInfoDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceCredentialsRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceCredentialsRepository.java index b3dfcf4e5d..3e117c0a26 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceCredentialsRepository.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java index 771ab6982d..56eb5e8b8b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java index 97e3363940..6ffa5349d6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceCredentialsDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java index d7130401f0..ff7be31028 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java index 9719e836f6..3fbfae2e92 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java +++ b/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, JpaSpecificationExecutor { - 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); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java index 20fba3aea0..b68585f8bc 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java +++ b/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 findEvents(UUID tenantId, EntityId entityId, TimePageLink pageLink) { return findEvents(tenantId, entityId, null, pageLink); } + @Override public List findEvents(UUID tenantId, EntityId entityId, String eventType, TimePageLink pageLink) { Specification timeSearchSpec = JpaAbstractSearchTimeDao.getTimeSearchPageSpec(pageLink, "id"); @@ -119,7 +120,8 @@ public class JpaBaseEventDao extends JpaAbstractSearchTimeDao idComparator = new IdComparator<>(); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/CustomerServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseCustomerServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/CustomerServiceImplTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/BaseCustomerServiceTest.java index 96fdc477ad..d3f2d8f1a4 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/CustomerServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseCustomerServiceTest.java @@ -32,7 +32,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class CustomerServiceImplTest extends AbstractServiceTest { +public abstract class BaseCustomerServiceTest extends AbstractServiceTest { private IdComparator idComparator = new IdComparator<>(); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceImplTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java index 949198c553..f0ed0b3474 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDashboardServiceTest.java @@ -37,7 +37,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class DashboardServiceImplTest extends AbstractServiceTest { +public abstract class BaseDashboardServiceTest extends AbstractServiceTest { private IdComparator idComparator = new IdComparator<>(); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsCacheTest.java similarity index 97% rename from dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsCacheTest.java index 66b4f2bfbc..31b599a154 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsCacheTest.java @@ -17,7 +17,10 @@ package org.thingsboard.server.dao.service; import com.hazelcast.core.HazelcastInstance; import org.apache.commons.lang3.RandomStringUtils; -import org.junit.*; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import org.springframework.aop.framework.Advised; import org.springframework.aop.support.AopUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -38,7 +41,7 @@ import java.util.UUID; import static org.mockito.Mockito.*; @TestPropertySource(properties = {"cache.enabled = true"}) -public class DeviceCredentialsCacheTest extends AbstractServiceTest { +public abstract class BaseDeviceCredentialsCacheTest extends AbstractServiceTest { private static final String CREDENTIALS_ID_1 = RandomStringUtils.randomAlphanumeric(20); private static final String CREDENTIALS_ID_2 = RandomStringUtils.randomAlphanumeric(20); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsServiceImplTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsServiceTest.java index 4d9ef9f43d..88ed553b61 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceCredentialsServiceTest.java @@ -30,7 +30,7 @@ import org.thingsboard.server.common.data.security.DeviceCredentials; import org.thingsboard.server.common.data.security.DeviceCredentialsType; import org.thingsboard.server.dao.exception.DataValidationException; -public class DeviceCredentialsServiceImplTest extends AbstractServiceTest { +public abstract class BaseDeviceCredentialsServiceTest extends AbstractServiceTest { private TenantId tenantId; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceImplTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java index 420ba6a252..addaf8fa53 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java @@ -36,11 +36,10 @@ import org.thingsboard.server.dao.exception.DataValidationException; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.concurrent.Executors; import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; -public class DeviceServiceImplTest extends AbstractServiceTest { +public abstract class BaseDeviceServiceTest extends AbstractServiceTest { private IdComparator idComparator = new IdComparator<>(); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/RelationServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/RelationServiceImplTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationServiceTest.java index cb1fbc5d36..515888b21c 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/RelationServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseRelationServiceTest.java @@ -35,7 +35,7 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutionException; -public class RelationServiceImplTest extends AbstractServiceTest { +public abstract class BaseRelationServiceTest extends AbstractServiceTest { @Before public void before() { diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceImplTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantServiceTest.java index 5c35a71cbe..b8220d3fff 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseTenantServiceTest.java @@ -15,19 +15,19 @@ */ package org.thingsboard.server.dao.service; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.apache.commons.lang3.RandomStringUtils; +import org.junit.Assert; +import org.junit.Test; import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.page.TextPageData; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.dao.exception.DataValidationException; -import org.junit.Assert; -import org.junit.Test; -public class TenantServiceImplTest extends AbstractServiceTest { +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public abstract class BaseTenantServiceTest extends AbstractServiceTest { private IdComparator idComparator = new IdComparator<>(); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/UserServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseUserServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/UserServiceImplTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/BaseUserServiceTest.java index d52813f4b9..9e4f7f3dd7 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/UserServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseUserServiceTest.java @@ -35,7 +35,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class UserServiceImplTest extends AbstractServiceTest { +public abstract class BaseUserServiceTest extends AbstractServiceTest { private IdComparator idComparator = new IdComparator<>(); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/WidgetTypeServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetTypeServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/WidgetTypeServiceImplTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetTypeServiceTest.java index 8f0a9f710f..4066f77054 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/WidgetTypeServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetTypeServiceTest.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class WidgetTypeServiceImplTest extends AbstractServiceTest { +public abstract class BaseWidgetTypeServiceTest extends AbstractServiceTest { private IdComparator idComparator = new IdComparator<>(); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/WidgetsBundleServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetsBundleServiceTest.java similarity index 99% rename from dao/src/test/java/org/thingsboard/server/dao/service/WidgetsBundleServiceImplTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetsBundleServiceTest.java index 6345567832..8f3e87df6c 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/WidgetsBundleServiceImplTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseWidgetsBundleServiceTest.java @@ -33,7 +33,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class WidgetsBundleServiceImplTest extends AbstractServiceTest { +public abstract class BaseWidgetsBundleServiceTest extends AbstractServiceTest { private IdComparator idComparator = new IdComparator<>(); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceNoSqlTest.java new file mode 100644 index 0000000000..6d16d1b6af --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceNoSqlTest.java @@ -0,0 +1,28 @@ +/** + * 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.service; + +import org.springframework.test.context.TestPropertySource; + +import java.lang.annotation.*; + +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +@Inherited +@Documented +@TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:application-test.properties", "classpath:nosql-test.properties"}) +public @interface DaoServiceNoSqlTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceSqlTest.java new file mode 100644 index 0000000000..4ad7bdabce --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceSqlTest.java @@ -0,0 +1,28 @@ +/** + * 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.service; + +import org.springframework.test.context.TestPropertySource; + +import java.lang.annotation.*; + +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +@Inherited +@Documented +@TestPropertySource(locations = {"classpath:application-test.properties", "classpath:sql-test.properties"}) +public @interface DaoServiceSqlTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/attributes/BaseAttributesServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/BaseAttributesServiceTest.java similarity index 95% rename from dao/src/test/java/org/thingsboard/server/dao/attributes/BaseAttributesServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/attributes/BaseAttributesServiceTest.java index 61b5329ffc..3a67574439 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/attributes/BaseAttributesServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/BaseAttributesServiceTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.attributes; +package org.thingsboard.server.dao.service.attributes; import com.datastax.driver.core.utils.UUIDs; import org.junit.Assert; @@ -26,6 +26,7 @@ import org.thingsboard.server.common.data.kv.AttributeKvEntry; import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry; import org.thingsboard.server.common.data.kv.KvEntry; import org.thingsboard.server.common.data.kv.StringDataEntry; +import org.thingsboard.server.dao.attributes.AttributesService; import org.thingsboard.server.dao.service.AbstractServiceTest; import java.util.Collections; @@ -35,7 +36,7 @@ import java.util.Optional; /** * @author Andrew Shvayka */ -public class BaseAttributesServiceTest extends AbstractServiceTest { +public abstract class BaseAttributesServiceTest extends AbstractServiceTest { @Autowired private AttributesService attributesService; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/attributes/nosql/AttributesServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/nosql/AttributesServiceNoSqlTest.java new file mode 100644 index 0000000000..2a2d57a444 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/nosql/AttributesServiceNoSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.attributes.nosql; + +import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.attributes.BaseAttributesServiceTest; + +@DaoServiceNoSqlTest +public class AttributesServiceNoSqlTest extends BaseAttributesServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/attributes/sql/AttributesServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/sql/AttributesServiceSqlTest.java new file mode 100644 index 0000000000..9cedb3a431 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/sql/AttributesServiceSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.attributes.sql; + +import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.attributes.BaseAttributesServiceTest; + +@DaoServiceSqlTest +public class AttributesServiceSqlTest extends BaseAttributesServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/event/BaseEventServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java similarity index 98% rename from dao/src/test/java/org/thingsboard/server/dao/event/BaseEventServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java index e2c473f82c..7c99bf3005 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/event/BaseEventServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.event; +package org.thingsboard.server.dao.service.event; import com.datastax.driver.core.utils.UUIDs; import org.junit.Assert; @@ -35,7 +35,7 @@ import java.time.Month; import java.time.ZoneOffset; import java.util.Optional; -public class BaseEventServiceTest extends AbstractServiceTest { +public abstract class BaseEventServiceTest extends AbstractServiceTest { @Test public void saveEvent() throws Exception { diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/event/nosql/EventServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/event/nosql/EventServiceNoSqlTest.java new file mode 100644 index 0000000000..36a87096e9 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/event/nosql/EventServiceNoSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.event.nosql; + +import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.event.BaseEventServiceTest; + +@DaoServiceNoSqlTest +public class EventServiceNoSqlTest extends BaseEventServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/event/sql/EventServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/event/sql/EventServiceSqlTest.java new file mode 100644 index 0000000000..a0d63699d9 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/event/sql/EventServiceSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.event.sql; + +import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.event.BaseEventServiceTest; + +@DaoServiceSqlTest +public class EventServiceSqlTest extends BaseEventServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AdminSettingsServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AdminSettingsServiceNoSqlTest.java new file mode 100644 index 0000000000..8f1dc1f600 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AdminSettingsServiceNoSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.nosql; + +import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.BaseAdminSettingsServiceTest; + +@DaoServiceNoSqlTest +public class AdminSettingsServiceNoSqlTest extends BaseAdminSettingsServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AlarmServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AlarmServiceNoSqlTest.java new file mode 100644 index 0000000000..5444dda2a9 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AlarmServiceNoSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.nosql; + +import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.BaseAlarmServiceTest; + +@DaoServiceNoSqlTest +public class AlarmServiceNoSqlTest extends BaseAlarmServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AssetServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AssetServiceNoSqlTest.java new file mode 100644 index 0000000000..9a426d227a --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AssetServiceNoSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.nosql; + +import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.BaseAssetServiceTest; + +@DaoServiceNoSqlTest +public class AssetServiceNoSqlTest extends BaseAssetServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/CustomerServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/CustomerServiceNoSqlTest.java new file mode 100644 index 0000000000..0981463813 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/CustomerServiceNoSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.nosql; + +import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.BaseCustomerServiceTest; + +@DaoServiceNoSqlTest +public class CustomerServiceNoSqlTest extends BaseCustomerServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DashboardServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DashboardServiceNoSqlTest.java new file mode 100644 index 0000000000..b5972194cc --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DashboardServiceNoSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.nosql; + +import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.BaseDashboardServiceTest; + +@DaoServiceNoSqlTest +public class DashboardServiceNoSqlTest extends BaseDashboardServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialCacheNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialCacheNoSqlTest.java new file mode 100644 index 0000000000..8cebc1b549 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialCacheNoSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.nosql; + +import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.BaseDeviceCredentialsCacheTest; + +@DaoServiceNoSqlTest +public class DeviceCredentialCacheNoSqlTest extends BaseDeviceCredentialsCacheTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialServiceNoSqlTest.java new file mode 100644 index 0000000000..b0dcd10801 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialServiceNoSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.nosql; + +import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.BaseDeviceCredentialsServiceTest; + +@DaoServiceNoSqlTest +public class DeviceCredentialServiceNoSqlTest extends BaseDeviceCredentialsServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceServiceNoSqlTest.java new file mode 100644 index 0000000000..bffbc67e0f --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceServiceNoSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.nosql; + +import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.BaseDeviceServiceTest; + +@DaoServiceNoSqlTest +public class DeviceServiceNoSqlTest extends BaseDeviceServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/RelationServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/RelationServiceNoSqlTest.java new file mode 100644 index 0000000000..3f39797215 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/RelationServiceNoSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.nosql; + +import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.BaseRelationServiceTest; + +@DaoServiceNoSqlTest +public class RelationServiceNoSqlTest extends BaseRelationServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/TenantServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/TenantServiceNoSqlTest.java new file mode 100644 index 0000000000..f977ee41b8 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/TenantServiceNoSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.nosql; + +import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.BaseTenantServiceTest; + +@DaoServiceNoSqlTest +public class TenantServiceNoSqlTest extends BaseTenantServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/UserServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/UserServiceNoSqlTest.java new file mode 100644 index 0000000000..4fe536ccae --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/UserServiceNoSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.nosql; + +import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.BaseUserServiceTest; + +@DaoServiceNoSqlTest +public class UserServiceNoSqlTest extends BaseUserServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetTypeServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetTypeServiceNoSqlTest.java new file mode 100644 index 0000000000..d959184eb1 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetTypeServiceNoSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.nosql; + +import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.BaseWidgetTypeServiceTest; + +@DaoServiceNoSqlTest +public class WidgetTypeServiceNoSqlTest extends BaseWidgetTypeServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetsBundleServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetsBundleServiceNoSqlTest.java new file mode 100644 index 0000000000..498a96efd3 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetsBundleServiceNoSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.nosql; + +import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.BaseWidgetsBundleServiceTest; + +@DaoServiceNoSqlTest +public class WidgetsBundleServiceNoSqlTest extends BaseWidgetsBundleServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/plugin/BasePluginServiceTest.java similarity index 97% rename from dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/plugin/BasePluginServiceTest.java index bd1eb756c5..64ef250660 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/plugin/BasePluginServiceTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.plugin; +package org.thingsboard.server.dao.service.plugin; import com.datastax.driver.core.utils.UUIDs; import lombok.extern.slf4j.Slf4j; @@ -29,7 +29,7 @@ import org.thingsboard.server.dao.service.AbstractServiceTest; import java.util.UUID; @Slf4j -public class BasePluginServiceTest extends AbstractServiceTest { +public abstract class BasePluginServiceTest extends AbstractServiceTest { @Test public void savePlugin() throws Exception { diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/plugin/nosql/PluginServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/plugin/nosql/PluginServiceNoSqlTest.java new file mode 100644 index 0000000000..15b6ddaed2 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/plugin/nosql/PluginServiceNoSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.plugin.nosql; + +import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.plugin.BasePluginServiceTest; + +@DaoServiceNoSqlTest +public class PluginServiceNoSqlTest extends BasePluginServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/plugin/sql/PluginServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/plugin/sql/PluginServiceSqlTest.java new file mode 100644 index 0000000000..addeffe64e --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/plugin/sql/PluginServiceSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.plugin.sql; + +import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.plugin.BasePluginServiceTest; + +@DaoServiceSqlTest +public class PluginServiceSqlTest extends BasePluginServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/rule/BaseRuleServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/rule/BaseRuleServiceTest.java similarity index 98% rename from dao/src/test/java/org/thingsboard/server/dao/rule/BaseRuleServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/rule/BaseRuleServiceTest.java index f62f26c2fb..1650b710b6 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/rule/BaseRuleServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/rule/BaseRuleServiceTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.rule; +package org.thingsboard.server.dao.service.rule; import com.datastax.driver.core.utils.UUIDs; import org.junit.Assert; @@ -29,7 +29,7 @@ import org.thingsboard.server.dao.service.AbstractServiceTest; import java.util.List; import java.util.concurrent.ThreadLocalRandom; -public class BaseRuleServiceTest extends AbstractServiceTest { +public abstract class BaseRuleServiceTest extends AbstractServiceTest { @Test public void saveRule() throws Exception { diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/rule/nosql/RuleServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/rule/nosql/RuleServiceNoSqlTest.java new file mode 100644 index 0000000000..1fc6886cd9 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/rule/nosql/RuleServiceNoSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.rule.nosql; + +import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.rule.BaseRuleServiceTest; + +@DaoServiceNoSqlTest +public class RuleServiceNoSqlTest extends BaseRuleServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/rule/sql/RuleServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/rule/sql/RuleServiceSqlTest.java new file mode 100644 index 0000000000..b3a810f068 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/rule/sql/RuleServiceSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.rule.sql; + +import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.rule.BaseRuleServiceTest; + +@DaoServiceSqlTest +public class RuleServiceSqlTest extends BaseRuleServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AdminSettingsServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AdminSettingsServiceSqlTest.java new file mode 100644 index 0000000000..901a9cf6e6 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AdminSettingsServiceSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.sql; + +import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.BaseAdminSettingsServiceTest; + +@DaoServiceSqlTest +public class AdminSettingsServiceSqlTest extends BaseAdminSettingsServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmServiceSqlTest.java new file mode 100644 index 0000000000..85bef2bbaa --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmServiceSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.sql; + +import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.BaseAlarmServiceTest; + +@DaoServiceSqlTest +public class AlarmServiceSqlTest extends BaseAlarmServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetServiceSqlTest.java new file mode 100644 index 0000000000..30cc8feec1 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetServiceSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.sql; + +import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.BaseAssetServiceTest; + +@DaoServiceSqlTest +public class AssetServiceSqlTest extends BaseAssetServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/CustomerServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/CustomerServiceSqlTest.java new file mode 100644 index 0000000000..559281b239 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/CustomerServiceSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.sql; + +import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.BaseCustomerServiceTest; + +@DaoServiceSqlTest +public class CustomerServiceSqlTest extends BaseCustomerServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DashboardServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DashboardServiceSqlTest.java new file mode 100644 index 0000000000..5af38f62c0 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DashboardServiceSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.sql; + +import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.BaseDashboardServiceTest; + +@DaoServiceSqlTest +public class DashboardServiceSqlTest extends BaseDashboardServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheSqlTest.java new file mode 100644 index 0000000000..b6fd8e802c --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.sql; + +import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.BaseDeviceCredentialsCacheTest; + +@DaoServiceSqlTest +public class DeviceCredentialsCacheSqlTest extends BaseDeviceCredentialsCacheTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsServiceSqlTest.java new file mode 100644 index 0000000000..fbc0cd6b37 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsServiceSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.sql; + +import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.BaseDeviceCredentialsServiceTest; + +@DaoServiceSqlTest +public class DeviceCredentialsServiceSqlTest extends BaseDeviceCredentialsServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceServiceSqlTest.java new file mode 100644 index 0000000000..4a030d508a --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceServiceSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.sql; + +import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.BaseDeviceServiceTest; + +@DaoServiceSqlTest +public class DeviceServiceSqlTest extends BaseDeviceServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationServiceSqlTest.java new file mode 100644 index 0000000000..8c8e178c68 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationServiceSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.sql; + +import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.BaseRelationServiceTest; + +@DaoServiceSqlTest +public class RelationServiceSqlTest extends BaseRelationServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantServiceSqlTest.java new file mode 100644 index 0000000000..6f05d5379b --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantServiceSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.sql; + +import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.BaseTenantServiceTest; + +@DaoServiceSqlTest +public class TenantServiceSqlTest extends BaseTenantServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/UserServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/UserServiceSqlTest.java new file mode 100644 index 0000000000..27c69998fd --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/UserServiceSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.sql; + +import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.BaseUserServiceTest; + +@DaoServiceSqlTest +public class UserServiceSqlTest extends BaseUserServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetTypeServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetTypeServiceSqlTest.java new file mode 100644 index 0000000000..5c9656fdd1 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetTypeServiceSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.sql; + +import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.BaseWidgetTypeServiceTest; + +@DaoServiceSqlTest +public class WidgetTypeServiceSqlTest extends BaseWidgetTypeServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetsBundleServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetsBundleServiceSqlTest.java new file mode 100644 index 0000000000..3e6dcdedad --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetsBundleServiceSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.sql; + +import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.BaseWidgetsBundleServiceTest; + +@DaoServiceSqlTest +public class WidgetsBundleServiceSqlTest extends BaseWidgetsBundleServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/TimeseriesServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/BaseTimeseriesServiceTest.java similarity index 98% rename from dao/src/test/java/org/thingsboard/server/dao/timeseries/TimeseriesServiceTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/timeseries/BaseTimeseriesServiceTest.java index 793b5037b6..9782058bad 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/TimeseriesServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/BaseTimeseriesServiceTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.server.dao.timeseries; +package org.thingsboard.server.dao.service.timeseries; import com.datastax.driver.core.utils.UUIDs; import lombok.extern.slf4j.Slf4j; @@ -37,7 +37,7 @@ import static org.junit.Assert.assertNotNull; */ @Slf4j -public class TimeseriesServiceTest extends AbstractServiceTest { +public abstract class BaseTimeseriesServiceTest extends AbstractServiceTest { private static final String STRING_KEY = "stringKey"; private static final String LONG_KEY = "longKey"; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlTest.java new file mode 100644 index 0000000000..56b1b47781 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.timeseries.nosql; + +import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.timeseries.BaseTimeseriesServiceTest; + +@DaoServiceNoSqlTest +public class TimeseriesServiceNoSqlTest extends BaseTimeseriesServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/sql/TimeseriesServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/sql/TimeseriesServiceSqlTest.java new file mode 100644 index 0000000000..5e92e55217 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/sql/TimeseriesServiceSqlTest.java @@ -0,0 +1,23 @@ +/** + * 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.service.timeseries.sql; + +import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.timeseries.BaseTimeseriesServiceTest; + +@DaoServiceSqlTest +public class TimeseriesServiceSqlTest extends BaseTimeseriesServiceTest { +} diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDaoTest.java index ce115c59e3..38b088db26 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/component/JpaBaseComponentDescriptorDaoTest.java @@ -18,7 +18,6 @@ package org.thingsboard.server.dao.sql.component; import com.datastax.driver.core.utils.UUIDs; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.id.ComponentDescriptorId; import org.thingsboard.server.common.data.page.TextPageLink; import org.thingsboard.server.common.data.plugin.ComponentDescriptor; diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDaoTest.java index 542f26fa16..8833135302 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/plugin/JpaBasePluginDaoTest.java @@ -16,9 +16,7 @@ package org.thingsboard.server.dao.sql.plugin; import com.datastax.driver.core.utils.UUIDs; -import com.github.springtestdbunit.annotation.DatabaseOperation; import com.github.springtestdbunit.annotation.DatabaseSetup; -import com.github.springtestdbunit.annotation.DatabaseTearDown; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.thingsboard.server.common.data.id.PluginId; @@ -71,7 +69,7 @@ public class JpaBasePluginDaoTest extends AbstractJpaDaoTest { assertEquals(40, rules1.size()); List rules2 = pluginDao.findAllTenantPluginsByTenantId(tenantId1, - new TextPageLink(40, "name_", rules1.get(39).getId().getId(), null)); + new TextPageLink(40, "name_", rules1.get(19).getId().getId(), null)); assertEquals(20, rules2.size()); List rules3 = pluginDao.findAllTenantPluginsByTenantId(tenantId1, @@ -80,7 +78,7 @@ public class JpaBasePluginDaoTest extends AbstractJpaDaoTest { } private void createTenantsAndSystemPlugins(UUID tenantId1, UUID tenantId2, String namePrefix) { - for (int i = 0; i < 30; i++) { + for (int i = 0; i < 40; i++) { createPlugin(tenantId1, namePrefix, i); createPlugin(tenantId2, namePrefix, i); createPlugin(null, namePrefix, i); diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDaoTest.java index d613faccf9..04bc4c7206 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaBaseRuleDaoTest.java @@ -113,7 +113,7 @@ public class JpaBaseRuleDaoTest extends AbstractJpaDaoTest { assertEquals(40, rules1.size()); List rules2 = ruleDao.findAllTenantRulesByTenantId(tenantId1, - new TextPageLink(40, "name_", rules1.get(39).getId().getId(), null)); + new TextPageLink(40, "name_", rules1.get(19).getId().getId(), null)); assertEquals(20, rules2.size()); List rules3 = ruleDao.findAllTenantRulesByTenantId(tenantId1, @@ -129,7 +129,7 @@ public class JpaBaseRuleDaoTest extends AbstractJpaDaoTest { } private void createTenantsAndSystemRules(UUID tenantId1, UUID tenantId2, String namePrefix, String pluginToken) { - for (int i = 0; i < 30; i++) { + for (int i = 0; i < 40; i++) { createRule(tenantId1, namePrefix, pluginToken, i); createRule(tenantId2, namePrefix, pluginToken, i); createRule(null, namePrefix, pluginToken, i); diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java index 4b4691867d..745d672eb1 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java @@ -35,6 +35,7 @@ import java.util.List; import java.util.UUID; import static org.junit.Assert.*; +import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; /** * Created by Valerii Sosliuk on 4/18/2017. @@ -120,7 +121,7 @@ public class JpaUserDaoTest extends AbstractJpaDaoTest { private void create30Adminsand60Users(UUID tenantId, UUID customerId) { // Create 30 tenant admins and 60 customer users for (int i = 0; i < 30; i++) { - saveUser(tenantId, null); + saveUser(tenantId, NULL_UUID); saveUser(tenantId, customerId); saveUser(tenantId, customerId); } diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java index 7a89644cd5..46fc7edf27 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java @@ -19,7 +19,6 @@ import com.datastax.driver.core.utils.UUIDs; import com.github.springtestdbunit.annotation.DatabaseOperation; import com.github.springtestdbunit.annotation.DatabaseSetup; import com.github.springtestdbunit.annotation.DatabaseTearDown; -import org.junit.Ignore; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.thingsboard.server.common.data.id.TenantId; diff --git a/dao/src/test/resources/application-test.properties b/dao/src/test/resources/application-test.properties index dee5557333..d87a181d0a 100644 --- a/dao/src/test/resources/application-test.properties +++ b/dao/src/test/resources/application-test.properties @@ -7,8 +7,4 @@ zk.enabled=false zk.url=localhost:2181 zk.zk_dir=/thingsboard -sql.enabled=false - -cassandra.enabled=true - updates.enabled=false \ No newline at end of file diff --git a/dao/src/test/resources/nosql-test.properties b/dao/src/test/resources/nosql-test.properties new file mode 100644 index 0000000000..3c02a6f31f --- /dev/null +++ b/dao/src/test/resources/nosql-test.properties @@ -0,0 +1,2 @@ +sql.enabled=false +cassandra.enabled=true \ No newline at end of file diff --git a/dao/src/test/resources/postgres-embedded-test.properties b/dao/src/test/resources/postgres-embedded-test.properties index 557aad5905..a7279b9996 100644 --- a/dao/src/test/resources/postgres-embedded-test.properties +++ b/dao/src/test/resources/postgres-embedded-test.properties @@ -1,5 +1,5 @@ host: localhost port: 5433 -database: thingsboard +database: thingsboard-test username: postgres password: postgres \ No newline at end of file diff --git a/dao/src/test/resources/jpa-test.properties b/dao/src/test/resources/sql-test.properties similarity index 93% rename from dao/src/test/resources/jpa-test.properties rename to dao/src/test/resources/sql-test.properties index f2ce4b2df9..3c66279d72 100644 --- a/dao/src/test/resources/jpa-test.properties +++ b/dao/src/test/resources/sql-test.properties @@ -1,11 +1,10 @@ cassandra.enabled=false - sql.enabled=true spring.jpa.show-sql=false spring.jpa.hibernate.ddl-auto=validate -spring.datasource.url=jdbc:postgresql://localhost:5433/thingsboard +spring.datasource.url=jdbc:postgresql://localhost:5433/thingsboard-test spring.datasource.username=postgres spring.datasource.password=postgres From f6e7668ebaf0831796cb43466a5ed8cea0b2b549 Mon Sep 17 00:00:00 2001 From: mp-loki Date: Mon, 26 Jun 2017 20:34:50 -0400 Subject: [PATCH 65/69] JPA Dao tests fixed --- .../server/dao/JpaDaoTestSuite.java | 2 +- .../dao/sql/event/JpaBaseEventDaoTest.java | 70 +++++++++++++------ .../server/dao/sql/user/JpaUserDaoTest.java | 4 +- .../sql/widget/JpaWidgetsBundleDaoTest.java | 2 + .../resources/dbunit/user_credentials.xml | 10 --- 5 files changed, 55 insertions(+), 33 deletions(-) diff --git a/dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java b/dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java index cb24b3a9fb..7b880fa295 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java +++ b/dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java @@ -25,7 +25,7 @@ import java.util.Arrays; @RunWith(ClasspathSuite.class) @ClassnameFilters({ // "org.thingsboard.server.dao.sql.alarm.", - "org.thingsboard.server.dao.sql.alarm.JpaAlarmDaoTest" + "org.thingsboard.server.dao.sql.*Test", }) public class JpaDaoTestSuite { diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java index b0af98013c..3c414cd626 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java @@ -37,6 +37,7 @@ import java.util.Optional; import java.util.UUID; import static org.junit.Assert.*; +import static org.thingsboard.server.common.data.DataConstants.ALARM; import static org.thingsboard.server.common.data.DataConstants.STATS; /** @@ -50,7 +51,6 @@ public class JpaBaseEventDaoTest extends AbstractJpaDaoTest { private EventDao eventDao; @Test - @DatabaseSetup("classpath:dbunit/empty_dataset.xml") public void testSaveIfNotExists() { UUID eventId = UUIDs.timeBased(); UUID tenantId = UUIDs.timeBased(); @@ -58,7 +58,7 @@ public class JpaBaseEventDaoTest extends AbstractJpaDaoTest { Event event = getEvent(eventId, tenantId, entityId); Optional optEvent1 = eventDao.saveIfNotExists(event); assertTrue("Optional is expected to be non-empty", optEvent1.isPresent()); - assertEquals(optEvent1.get(), event); + assertEquals(event, optEvent1.get()); Optional optEvent2 = eventDao.saveIfNotExists(event); assertFalse("Optional is expected to be empty", optEvent2.isPresent()); } @@ -77,16 +77,12 @@ public class JpaBaseEventDaoTest extends AbstractJpaDaoTest { } @Test - @DatabaseSetup("classpath:dbunit/empty_dataset.xml") public void findEventsByEntityIdAndPageLink() { UUID tenantId = UUIDs.timeBased(); UUID entityId1 = UUIDs.timeBased(); UUID entityId2 = UUIDs.timeBased(); long startTime = System.currentTimeMillis(); long endTime = createEventsTwoEntities(tenantId, entityId1, entityId2, startTime, 20); - List allEvents = eventDao.find(); - - assertEquals(20, allEvents.size()); TimePageLink pageLink1 = new TimePageLink(30, null, null, true); List events1 = eventDao.findEvents(tenantId, new DeviceId(entityId1), pageLink1); @@ -111,31 +107,65 @@ public class JpaBaseEventDaoTest extends AbstractJpaDaoTest { } - private long createEventsTwoEntities(UUID tenantId, UUID entityId1, UUID entityId2, long startTime, int count) { - // Generate #count events for two entities with timestamps from an hour ago till now + @Test + public void findEventsByEntityIdAndEventTypeAndPageLink() { + UUID tenantId = UUIDs.timeBased(); + UUID entityId1 = UUIDs.timeBased(); + UUID entityId2 = UUIDs.timeBased(); + long startTime = System.currentTimeMillis(); + long endTime = createEventsTwoEntitiesTwoTypes(tenantId, entityId1, entityId2, startTime, 20); - // Distribute events uniformly - long step = HOUR_MILLISECONDS / count; - long timestamp = startTime; + TimePageLink pageLink1 = new TimePageLink(30, null, null, true); + List events1 = eventDao.findEvents(tenantId, new DeviceId(entityId1), ALARM, pageLink1); + assertEquals(5, events1.size()); + + TimePageLink pageLink2 = new TimePageLink(30, startTime, null, true); + List events2 = eventDao.findEvents(tenantId, new DeviceId(entityId1), ALARM, pageLink2); + assertEquals(5, events2.size()); + + TimePageLink pageLink3 = new TimePageLink(30, startTime, endTime, true); + List events3 = eventDao.findEvents(tenantId, new DeviceId(entityId1), ALARM, pageLink3); + assertEquals(5, events3.size()); + + TimePageLink pageLink4 = new TimePageLink(4, startTime, endTime, true); + List events4 = eventDao.findEvents(tenantId, new DeviceId(entityId1), ALARM, pageLink4); + assertEquals(4, events4.size()); + + UUID idOffset = events3.get(2).getId().getId(); + TimePageLink pageLink5 = new TimePageLink(10, startTime, endTime, true, idOffset); + List events5 = eventDao.findEvents(tenantId, new DeviceId(entityId1), ALARM, pageLink5); + assertEquals(2, events5.size()); + } + + private long createEventsTwoEntitiesTwoTypes(UUID tenantId, UUID entityId1, UUID entityId2, long startTime, int count) { + for (int i = 0; i < count / 2; i++) { + String type = i % 2 == 0 ? STATS : ALARM; + UUID eventId1 = UUIDs.timeBased(); + Event event1 = getEvent(eventId1, tenantId, entityId1, type); + eventDao.save(event1); + UUID eventId2 = UUIDs.timeBased(); + Event event2 = getEvent(eventId2, tenantId, entityId2, type); + eventDao.save(event2); + } + return System.currentTimeMillis(); + } + + private long createEventsTwoEntities(UUID tenantId, UUID entityId1, UUID entityId2, long startTime, int count) { for (int i = 0; i < count / 2; i++) { - //UUID eventId1 = UUIDs.startOf(timestamp); UUID eventId1 = UUIDs.timeBased(); Event event1 = getEvent(eventId1, tenantId, entityId1); eventDao.save(event1); - timestamp += step; - //UUID eventId2 = UUIDs.startOf(timestamp); UUID eventId2 = UUIDs.timeBased(); Event event2 = getEvent(eventId2, tenantId, entityId2); eventDao.save(event2); - timestamp += step; } return System.currentTimeMillis(); } - @Test - @DatabaseSetup("classpath:dbunit/empty_dataset.xml") - public void findEventsByEntityIdAndEventTypeAndPageLink() { - + private Event getEvent(UUID eventId, UUID tenantId, UUID entityId, String type) { + Event event = getEvent(eventId, tenantId, entityId); + event.setType(type); + return event; } private Event getEvent(UUID eventId, UUID tenantId, UUID entityId) { @@ -144,7 +174,7 @@ public class JpaBaseEventDaoTest extends AbstractJpaDaoTest { event.setTenantId(new TenantId(tenantId)); EntityId deviceId = new DeviceId(entityId); event.setEntityId(deviceId); - event.setUid(entityId.toString()); + event.setUid(event.getId().getId().toString()); event.setType(STATS); ObjectMapper mapper = new ObjectMapper(); try { diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java index 745d672eb1..37407d5bf1 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserDaoTest.java @@ -132,10 +132,10 @@ public class JpaUserDaoTest extends AbstractJpaDaoTest { UUID id = UUIDs.timeBased(); user.setId(new UserId(id)); user.setTenantId(new TenantId(tenantId)); - if (customerId == null) { + user.setCustomerId(new CustomerId(customerId)); + if (customerId == NULL_UUID) { user.setAuthority(Authority.TENANT_ADMIN); } else { - user.setCustomerId(new CustomerId(customerId)); user.setAuthority(Authority.CUSTOMER_USER); } String idString = id.toString(); diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java index 46fc7edf27..1bd4d54e10 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java @@ -32,6 +32,7 @@ import java.util.List; import java.util.UUID; import static org.junit.Assert.*; +import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; /** * Created by Valerii Sosliuk on 4/23/2017. @@ -160,6 +161,7 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest { WidgetsBundle widgetsBundle = new WidgetsBundle(); widgetsBundle.setAlias(prefix + i); widgetsBundle.setTitle(prefix + i); + widgetsBundle.setTenantId(new TenantId(NULL_UUID)); widgetsBundle.setId(new WidgetsBundleId(UUIDs.timeBased())); widgetsBundleDao.save(widgetsBundle); } diff --git a/dao/src/test/resources/dbunit/user_credentials.xml b/dao/src/test/resources/dbunit/user_credentials.xml index 76a2138a14..7b74de0337 100644 --- a/dao/src/test/resources/dbunit/user_credentials.xml +++ b/dao/src/test/resources/dbunit/user_credentials.xml @@ -15,14 +15,4 @@ activate_token="ACTIVATE_TOKEN_2" reset_token="RESET_TOKEN_2" /> - \ No newline at end of file From ca8eaf70fc60c986c097af1ae9f94729061af33b Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Tue, 27 Jun 2017 14:21:58 +0300 Subject: [PATCH 66/69] Splitted nosql and sql suites --- ...ite.java => NoSqlDaoServiceTestSuite.java} | 9 ++--- .../server/dao/SqlDaoServiceTestSuite.java | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+), 7 deletions(-) rename dao/src/test/java/org/thingsboard/server/dao/{DaoServiceTestSuite.java => NoSqlDaoServiceTestSuite.java} (81%) create mode 100644 dao/src/test/java/org/thingsboard/server/dao/SqlDaoServiceTestSuite.java diff --git a/dao/src/test/java/org/thingsboard/server/dao/DaoServiceTestSuite.java b/dao/src/test/java/org/thingsboard/server/dao/NoSqlDaoServiceTestSuite.java similarity index 81% rename from dao/src/test/java/org/thingsboard/server/dao/DaoServiceTestSuite.java rename to dao/src/test/java/org/thingsboard/server/dao/NoSqlDaoServiceTestSuite.java index bf649e2186..d5e2199d2b 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/DaoServiceTestSuite.java +++ b/dao/src/test/java/org/thingsboard/server/dao/NoSqlDaoServiceTestSuite.java @@ -25,9 +25,9 @@ import java.util.Arrays; @RunWith(ClasspathSuite.class) @ClassnameFilters({ - "org.thingsboard.server.dao.service.*Test" + "org.thingsboard.server.dao.service.*ServiceNoSqlTest" }) -public class DaoServiceTestSuite { +public class NoSqlDaoServiceTestSuite { @ClassRule public static CustomCassandraCQLUnit cassandraUnit = @@ -37,9 +37,4 @@ public class DaoServiceTestSuite { new ClassPathCQLDataSet("system-test.cql", false, false)), "cassandra-test.yaml", 30000L); - @ClassRule - public static CustomPostgresUnit postgresUnit = new CustomPostgresUnit( - Arrays.asList("postgres/schema.sql", "postgres/system-data.sql", "system-test.sql"), - "postgres-embedded-test.properties"); - } diff --git a/dao/src/test/java/org/thingsboard/server/dao/SqlDaoServiceTestSuite.java b/dao/src/test/java/org/thingsboard/server/dao/SqlDaoServiceTestSuite.java new file mode 100644 index 0000000000..6853cb47b1 --- /dev/null +++ b/dao/src/test/java/org/thingsboard/server/dao/SqlDaoServiceTestSuite.java @@ -0,0 +1,36 @@ +/** + * 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.service.*ServiceSqlTest" +}) +public class SqlDaoServiceTestSuite { + + @ClassRule + public static CustomPostgresUnit postgresUnit = new CustomPostgresUnit( + Arrays.asList("postgres/schema.sql", "postgres/system-data.sql", "system-test.sql"), + "postgres-embedded-test.properties"); + +} From 0c2342239da70c9fe8a9052077ef5433a3e40718 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Tue, 27 Jun 2017 16:51:15 +0300 Subject: [PATCH 67/69] Changed default folder for docker containers --- docker/docker-compose.yml | 4 ++-- docker/tb-cassandra-schema/Dockerfile | 11 +++++------ docker/tb-cassandra-schema/Makefile | 2 +- docker/tb-cassandra-schema/install-schema.sh | 6 +++--- docker/tb-cassandra-schema/tb-cassandra-schema.yaml | 2 +- docker/tb/Dockerfile | 8 +++----- docker/tb/run-application.sh | 2 +- docker/tb/tb.yaml | 2 +- 8 files changed, 17 insertions(+), 20 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index fa11fec6bf..988a2db6d0 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -25,7 +25,7 @@ services: - "5683:5683/udp" env_file: - tb.env - entrypoint: ./run-application.sh + entrypoint: /run-application.sh tb-cassandra-schema: image: "thingsboard/tb-cassandra-schema:1.2.4" environment: @@ -33,7 +33,7 @@ services: - ADD_SYSTEM_DATA=${ADD_SYSTEM_DATA} - ADD_DEMO_DATA=${ADD_DEMO_DATA} - CASSANDRA_URL=${CASSANDRA_URL} - entrypoint: ./install-schema.sh + entrypoint: /install-schema.sh cassandra: image: "cassandra:3.9" ports: diff --git a/docker/tb-cassandra-schema/Dockerfile b/docker/tb-cassandra-schema/Dockerfile index d1675714c1..e78042da75 100644 --- a/docker/tb-cassandra-schema/Dockerfile +++ b/docker/tb-cassandra-schema/Dockerfile @@ -16,14 +16,13 @@ FROM cassandra:3.9 -ADD install-schema.sh /root/install-schema.sh +ADD install-schema.sh /install-schema.sh RUN apt-get update \ && apt-get install -y nmap \ - && chmod +x /root/install-schema.sh + && chmod +x /install-schema.sh -ADD schema.cql /root/schema.cql -ADD demo-data.cql /root/demo-data.cql -ADD system-data.cql /root/system-data.cql +ADD schema.cql /schema.cql +ADD demo-data.cql /demo-data.cql +ADD system-data.cql /system-data.cql -WORKDIR /root diff --git a/docker/tb-cassandra-schema/Makefile b/docker/tb-cassandra-schema/Makefile index 23d460ad39..72af77b756 100644 --- a/docker/tb-cassandra-schema/Makefile +++ b/docker/tb-cassandra-schema/Makefile @@ -11,4 +11,4 @@ build: push: build docker push ${PROJECT}/${APP}:${VERSION} - docker push ${PROJECT}/${APP}:latest + docker push ${PROJECT}/${APP}:latest diff --git a/docker/tb-cassandra-schema/install-schema.sh b/docker/tb-cassandra-schema/install-schema.sh index 128bd16e5e..0845a73a47 100644 --- a/docker/tb-cassandra-schema/install-schema.sh +++ b/docker/tb-cassandra-schema/install-schema.sh @@ -24,7 +24,7 @@ done if [ "$CREATE_SCHEMA" == "true" ]; then echo "Creating 'Thingsboard' keyspace..." - cqlsh $CASSANDRA_URL -f /root/schema.cql + cqlsh $CASSANDRA_URL -f /schema.cql if [ "$?" -eq 0 ]; then echo "'Thingsboard' keyspace was successfully created!" else @@ -34,7 +34,7 @@ fi if [ "$ADD_SYSTEM_DATA" == "true" ]; then echo "Adding system data..." - cqlsh $CASSANDRA_URL -f /root/system-data.cql + cqlsh $CASSANDRA_URL -f /system-data.cql if [ "$?" -eq 0 ]; then echo "System data was successfully added!" else @@ -44,7 +44,7 @@ fi if [ "$ADD_DEMO_DATA" == "true" ]; then echo "Adding demo data..." - cqlsh $CASSANDRA_URL -f /root/demo-data.cql + cqlsh $CASSANDRA_URL -f /demo-data.cql if [ "$?" -eq 0 ]; then echo "Demo data was successfully added!" else diff --git a/docker/tb-cassandra-schema/tb-cassandra-schema.yaml b/docker/tb-cassandra-schema/tb-cassandra-schema.yaml index 7b46a2e9f2..b86cb90dde 100644 --- a/docker/tb-cassandra-schema/tb-cassandra-schema.yaml +++ b/docker/tb-cassandra-schema/tb-cassandra-schema.yaml @@ -35,5 +35,5 @@ spec: command: - sh - -c - - ./install-schema.sh + - /install-schema.sh restartPolicy: Never \ No newline at end of file diff --git a/docker/tb/Dockerfile b/docker/tb/Dockerfile index c2e2d7b631..b2a3da6e06 100644 --- a/docker/tb/Dockerfile +++ b/docker/tb/Dockerfile @@ -16,9 +16,7 @@ FROM openjdk:8-jre -ADD run-application.sh /root/run-application.sh -ADD thingsboard.deb /root/thingsboard.deb +ADD run-application.sh /run-application.sh +ADD thingsboard.deb /thingsboard.deb -RUN chmod +x /root/run-application.sh - -WORKDIR /root +RUN chmod +x /run-application.sh diff --git a/docker/tb/run-application.sh b/docker/tb/run-application.sh index c5df758eda..4824133a28 100755 --- a/docker/tb/run-application.sh +++ b/docker/tb/run-application.sh @@ -16,7 +16,7 @@ # -dpkg -i /root/thingsboard.deb +dpkg -i /thingsboard.deb reachable=0 while [ $reachable -eq 0 ]; diff --git a/docker/tb/tb.yaml b/docker/tb/tb.yaml index 15ed1939d5..45f987f04f 100644 --- a/docker/tb/tb.yaml +++ b/docker/tb/tb.yaml @@ -112,7 +112,7 @@ spec: command: - sh - -c - - ./run-application.sh + - /run-application.sh livenessProbe: httpGet: path: /login From bdb6d2589b0a11ab069df2b878ad155a082955d6 Mon Sep 17 00:00:00 2001 From: mp-loki Date: Tue, 27 Jun 2017 19:14:49 -0400 Subject: [PATCH 68/69] SystemTestSuite split to Sql and NoSql. Dao Test annotations renamed --- application/pom.xml | 5 ++++ ...piTest.java => BaseHttpDeviceApiTest.java} | 2 +- ...stSuite.java => SystemNoSqlTestSuite.java} | 4 ++-- .../server/system/SystemSqlTestSuite.java | 23 +++++++++++++++++++ .../system/nosql/DeviceApiNoSqlTest.java | 12 ++++++++++ .../server/system/sql/DeviceApiSqlTest.java | 11 +++++++++ dao/pom.xml | 5 ---- .../org/thingsboard/server/dao/DaoUtil.java | 4 +++- ...erviceNoSqlTest.java => DaoNoSqlTest.java} | 2 +- ...DaoServiceSqlTest.java => DaoSqlTest.java} | 2 +- .../nosql/AttributesServiceNoSqlTest.java | 4 ++-- .../sql/AttributesServiceSqlTest.java | 4 ++-- .../event/nosql/EventServiceNoSqlTest.java | 4 ++-- .../event/sql/EventServiceSqlTest.java | 4 ++-- .../nosql/AdminSettingsServiceNoSqlTest.java | 4 ++-- .../service/nosql/AlarmServiceNoSqlTest.java | 4 ++-- .../service/nosql/AssetServiceNoSqlTest.java | 4 ++-- .../nosql/CustomerServiceNoSqlTest.java | 4 ++-- .../nosql/DashboardServiceNoSqlTest.java | 4 ++-- .../nosql/DeviceCredentialCacheNoSqlTest.java | 4 ++-- .../DeviceCredentialServiceNoSqlTest.java | 4 ++-- .../service/nosql/DeviceServiceNoSqlTest.java | 4 ++-- .../nosql/RelationServiceNoSqlTest.java | 4 ++-- .../service/nosql/TenantServiceNoSqlTest.java | 4 ++-- .../service/nosql/UserServiceNoSqlTest.java | 4 ++-- .../nosql/WidgetTypeServiceNoSqlTest.java | 4 ++-- .../nosql/WidgetsBundleServiceNoSqlTest.java | 4 ++-- .../plugin/nosql/PluginServiceNoSqlTest.java | 4 ++-- .../plugin/sql/PluginServiceSqlTest.java | 4 ++-- .../rule/nosql/RuleServiceNoSqlTest.java | 4 ++-- .../service/rule/sql/RuleServiceSqlTest.java | 4 ++-- .../sql/AdminSettingsServiceSqlTest.java | 4 ++-- .../dao/service/sql/AlarmServiceSqlTest.java | 4 ++-- .../dao/service/sql/AssetServiceSqlTest.java | 4 ++-- .../service/sql/CustomerServiceSqlTest.java | 4 ++-- .../service/sql/DashboardServiceSqlTest.java | 4 ++-- .../sql/DeviceCredentialsCacheSqlTest.java | 4 ++-- .../sql/DeviceCredentialsServiceSqlTest.java | 4 ++-- .../dao/service/sql/DeviceServiceSqlTest.java | 4 ++-- .../service/sql/RelationServiceSqlTest.java | 4 ++-- .../dao/service/sql/TenantServiceSqlTest.java | 4 ++-- .../dao/service/sql/UserServiceSqlTest.java | 4 ++-- .../service/sql/WidgetTypeServiceSqlTest.java | 4 ++-- .../sql/WidgetsBundleServiceSqlTest.java | 4 ++-- .../nosql/TimeseriesServiceNoSqlTest.java | 4 ++-- .../sql/TimeseriesServiceSqlTest.java | 4 ++-- pom.xml | 7 ------ 47 files changed, 131 insertions(+), 90 deletions(-) rename application/src/test/java/org/thingsboard/server/system/{HttpDeviceApiTest.java => BaseHttpDeviceApiTest.java} (97%) rename application/src/test/java/org/thingsboard/server/system/{SystemTestSuite.java => SystemNoSqlTestSuite.java} (96%) create mode 100644 application/src/test/java/org/thingsboard/server/system/SystemSqlTestSuite.java create mode 100644 application/src/test/java/org/thingsboard/server/system/nosql/DeviceApiNoSqlTest.java create mode 100644 application/src/test/java/org/thingsboard/server/system/sql/DeviceApiSqlTest.java rename dao/src/test/java/org/thingsboard/server/dao/service/{DaoServiceNoSqlTest.java => DaoNoSqlTest.java} (96%) rename dao/src/test/java/org/thingsboard/server/dao/service/{DaoServiceSqlTest.java => DaoSqlTest.java} (96%) diff --git a/application/pom.xml b/application/pom.xml index 28716d0823..a4602d4b5d 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -251,6 +251,11 @@ spring-test-dbunit test + + ru.yandex.qatools.embed + postgresql-embedded + test + diff --git a/application/src/test/java/org/thingsboard/server/system/HttpDeviceApiTest.java b/application/src/test/java/org/thingsboard/server/system/BaseHttpDeviceApiTest.java similarity index 97% rename from application/src/test/java/org/thingsboard/server/system/HttpDeviceApiTest.java rename to application/src/test/java/org/thingsboard/server/system/BaseHttpDeviceApiTest.java index af8b50fc48..680fa9492d 100644 --- a/application/src/test/java/org/thingsboard/server/system/HttpDeviceApiTest.java +++ b/application/src/test/java/org/thingsboard/server/system/BaseHttpDeviceApiTest.java @@ -35,7 +35,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. /** * @author Andrew Shvayka */ -public class HttpDeviceApiTest extends AbstractControllerTest { +public abstract class BaseHttpDeviceApiTest extends AbstractControllerTest { private static final AtomicInteger idSeq = new AtomicInteger(new Random(System.currentTimeMillis()).nextInt()); diff --git a/application/src/test/java/org/thingsboard/server/system/SystemTestSuite.java b/application/src/test/java/org/thingsboard/server/system/SystemNoSqlTestSuite.java similarity index 96% rename from application/src/test/java/org/thingsboard/server/system/SystemTestSuite.java rename to application/src/test/java/org/thingsboard/server/system/SystemNoSqlTestSuite.java index fac12e76a0..54c3bc70fd 100644 --- a/application/src/test/java/org/thingsboard/server/system/SystemTestSuite.java +++ b/application/src/test/java/org/thingsboard/server/system/SystemNoSqlTestSuite.java @@ -27,8 +27,8 @@ import java.util.Arrays; * @author Andrew Shvayka */ @RunWith(ClasspathSuite.class) -@ClasspathSuite.ClassnameFilters({"org.thingsboard.server.system.*Test"}) -public class SystemTestSuite { +@ClasspathSuite.ClassnameFilters({"org.thingsboard.server.system.*NoSqlTest"}) +public class SystemNoSqlTestSuite { @ClassRule public static CustomCassandraCQLUnit cassandraUnit = diff --git a/application/src/test/java/org/thingsboard/server/system/SystemSqlTestSuite.java b/application/src/test/java/org/thingsboard/server/system/SystemSqlTestSuite.java new file mode 100644 index 0000000000..72982a863e --- /dev/null +++ b/application/src/test/java/org/thingsboard/server/system/SystemSqlTestSuite.java @@ -0,0 +1,23 @@ +package org.thingsboard.server.system; + +import org.junit.ClassRule; +import org.junit.extensions.cpsuite.ClasspathSuite; +import org.junit.runner.RunWith; +import org.thingsboard.server.dao.CustomPostgresUnit; + +import java.util.Arrays; + +/** + * Created by Valerii Sosliuk on 6/27/2017. + */ +@RunWith(ClasspathSuite.class) +@ClasspathSuite.ClassnameFilters({"org.thingsboard.server.system.sql.*SqlTest"}) +public class SystemSqlTestSuite { + + @ClassRule + public static CustomPostgresUnit postgresUnit = new CustomPostgresUnit( + Arrays.asList("postgres/schema.sql", "postgres/system-data.sql"), + "postgres-embedded-test.properties"); + + +} diff --git a/application/src/test/java/org/thingsboard/server/system/nosql/DeviceApiNoSqlTest.java b/application/src/test/java/org/thingsboard/server/system/nosql/DeviceApiNoSqlTest.java new file mode 100644 index 0000000000..f8a172484d --- /dev/null +++ b/application/src/test/java/org/thingsboard/server/system/nosql/DeviceApiNoSqlTest.java @@ -0,0 +1,12 @@ +package org.thingsboard.server.system.nosql; + +import org.thingsboard.server.dao.service.DaoNoSqlTest; +import org.thingsboard.server.dao.util.NoSqlDao; +import org.thingsboard.server.system.BaseHttpDeviceApiTest; + +/** + * Created by Valerii Sosliuk on 6/27/2017. + */ +@DaoNoSqlTest +public class DeviceApiNoSqlTest extends BaseHttpDeviceApiTest { +} diff --git a/application/src/test/java/org/thingsboard/server/system/sql/DeviceApiSqlTest.java b/application/src/test/java/org/thingsboard/server/system/sql/DeviceApiSqlTest.java new file mode 100644 index 0000000000..2df56e8268 --- /dev/null +++ b/application/src/test/java/org/thingsboard/server/system/sql/DeviceApiSqlTest.java @@ -0,0 +1,11 @@ +package org.thingsboard.server.system.sql; + +import org.thingsboard.server.dao.service.DaoSqlTest; +import org.thingsboard.server.system.BaseHttpDeviceApiTest; + +/** + * Created by Valerii Sosliuk on 6/27/2017. + */ +@DaoSqlTest +public class DeviceApiSqlTest extends BaseHttpDeviceApiTest{ +} diff --git a/dao/pom.xml b/dao/pom.xml index 7686f10033..2bb77511bb 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -169,11 +169,6 @@ spring-test test - - com.h2database - h2 - test - ru.yandex.qatools.embed postgresql-embedded diff --git a/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java b/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java index 42823a1e68..3392ef7f3c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java +++ b/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java @@ -30,7 +30,9 @@ public abstract class DaoUtil { if (toDataList != null && !toDataList.isEmpty()) { list = new ArrayList<>(); for (ToData object : toDataList) { - list.add(object.toData()); + if (object != null) { + list.add(object.toData()); + } } } return list; diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DaoNoSqlTest.java similarity index 96% rename from dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceNoSqlTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/DaoNoSqlTest.java index 6d16d1b6af..e369bb42ff 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DaoNoSqlTest.java @@ -24,5 +24,5 @@ import java.lang.annotation.*; @Inherited @Documented @TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:application-test.properties", "classpath:nosql-test.properties"}) -public @interface DaoServiceNoSqlTest { +public @interface DaoNoSqlTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DaoSqlTest.java similarity index 96% rename from dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceSqlTest.java rename to dao/src/test/java/org/thingsboard/server/dao/service/DaoSqlTest.java index 4ad7bdabce..4034235f22 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/DaoServiceSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/DaoSqlTest.java @@ -24,5 +24,5 @@ import java.lang.annotation.*; @Inherited @Documented @TestPropertySource(locations = {"classpath:application-test.properties", "classpath:sql-test.properties"}) -public @interface DaoServiceSqlTest { +public @interface DaoSqlTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/attributes/nosql/AttributesServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/nosql/AttributesServiceNoSqlTest.java index 2a2d57a444..295b888100 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/attributes/nosql/AttributesServiceNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/nosql/AttributesServiceNoSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.attributes.nosql; -import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.attributes.BaseAttributesServiceTest; -@DaoServiceNoSqlTest +@DaoNoSqlTest public class AttributesServiceNoSqlTest extends BaseAttributesServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/attributes/sql/AttributesServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/sql/AttributesServiceSqlTest.java index 9cedb3a431..7c06da09a3 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/attributes/sql/AttributesServiceSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/sql/AttributesServiceSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.attributes.sql; -import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.service.attributes.BaseAttributesServiceTest; -@DaoServiceSqlTest +@DaoSqlTest public class AttributesServiceSqlTest extends BaseAttributesServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/event/nosql/EventServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/event/nosql/EventServiceNoSqlTest.java index 36a87096e9..21f81fe2cd 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/event/nosql/EventServiceNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/event/nosql/EventServiceNoSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.event.nosql; -import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.event.BaseEventServiceTest; -@DaoServiceNoSqlTest +@DaoNoSqlTest public class EventServiceNoSqlTest extends BaseEventServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/event/sql/EventServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/event/sql/EventServiceSqlTest.java index a0d63699d9..77fee52372 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/event/sql/EventServiceSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/event/sql/EventServiceSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.event.sql; -import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.service.event.BaseEventServiceTest; -@DaoServiceSqlTest +@DaoSqlTest public class EventServiceSqlTest extends BaseEventServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AdminSettingsServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AdminSettingsServiceNoSqlTest.java index 8f1dc1f600..b02c9cba6d 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AdminSettingsServiceNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AdminSettingsServiceNoSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.nosql; -import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.BaseAdminSettingsServiceTest; -@DaoServiceNoSqlTest +@DaoNoSqlTest public class AdminSettingsServiceNoSqlTest extends BaseAdminSettingsServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AlarmServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AlarmServiceNoSqlTest.java index 5444dda2a9..9115a2daa1 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AlarmServiceNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AlarmServiceNoSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.nosql; -import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.BaseAlarmServiceTest; -@DaoServiceNoSqlTest +@DaoNoSqlTest public class AlarmServiceNoSqlTest extends BaseAlarmServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AssetServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AssetServiceNoSqlTest.java index 9a426d227a..6370a711f8 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AssetServiceNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/AssetServiceNoSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.nosql; -import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.BaseAssetServiceTest; -@DaoServiceNoSqlTest +@DaoNoSqlTest public class AssetServiceNoSqlTest extends BaseAssetServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/CustomerServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/CustomerServiceNoSqlTest.java index 0981463813..f437551843 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/CustomerServiceNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/CustomerServiceNoSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.nosql; -import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.BaseCustomerServiceTest; -@DaoServiceNoSqlTest +@DaoNoSqlTest public class CustomerServiceNoSqlTest extends BaseCustomerServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DashboardServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DashboardServiceNoSqlTest.java index b5972194cc..2ed8f554e2 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DashboardServiceNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DashboardServiceNoSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.nosql; -import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.BaseDashboardServiceTest; -@DaoServiceNoSqlTest +@DaoNoSqlTest public class DashboardServiceNoSqlTest extends BaseDashboardServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialCacheNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialCacheNoSqlTest.java index 8cebc1b549..3dc4b84623 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialCacheNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialCacheNoSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.nosql; -import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.BaseDeviceCredentialsCacheTest; -@DaoServiceNoSqlTest +@DaoNoSqlTest public class DeviceCredentialCacheNoSqlTest extends BaseDeviceCredentialsCacheTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialServiceNoSqlTest.java index b0dcd10801..0a85622014 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialServiceNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceCredentialServiceNoSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.nosql; -import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.BaseDeviceCredentialsServiceTest; -@DaoServiceNoSqlTest +@DaoNoSqlTest public class DeviceCredentialServiceNoSqlTest extends BaseDeviceCredentialsServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceServiceNoSqlTest.java index bffbc67e0f..a6f9554dc2 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceServiceNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/DeviceServiceNoSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.nosql; -import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.BaseDeviceServiceTest; -@DaoServiceNoSqlTest +@DaoNoSqlTest public class DeviceServiceNoSqlTest extends BaseDeviceServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/RelationServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/RelationServiceNoSqlTest.java index 3f39797215..2133304a32 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/RelationServiceNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/RelationServiceNoSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.nosql; -import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.BaseRelationServiceTest; -@DaoServiceNoSqlTest +@DaoNoSqlTest public class RelationServiceNoSqlTest extends BaseRelationServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/TenantServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/TenantServiceNoSqlTest.java index f977ee41b8..8066e57fdc 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/TenantServiceNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/TenantServiceNoSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.nosql; -import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.BaseTenantServiceTest; -@DaoServiceNoSqlTest +@DaoNoSqlTest public class TenantServiceNoSqlTest extends BaseTenantServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/UserServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/UserServiceNoSqlTest.java index 4fe536ccae..d3a64524cf 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/UserServiceNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/UserServiceNoSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.nosql; -import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.BaseUserServiceTest; -@DaoServiceNoSqlTest +@DaoNoSqlTest public class UserServiceNoSqlTest extends BaseUserServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetTypeServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetTypeServiceNoSqlTest.java index d959184eb1..a814f359ca 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetTypeServiceNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetTypeServiceNoSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.nosql; -import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.BaseWidgetTypeServiceTest; -@DaoServiceNoSqlTest +@DaoNoSqlTest public class WidgetTypeServiceNoSqlTest extends BaseWidgetTypeServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetsBundleServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetsBundleServiceNoSqlTest.java index 498a96efd3..b0e7890310 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetsBundleServiceNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/nosql/WidgetsBundleServiceNoSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.nosql; -import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.BaseWidgetsBundleServiceTest; -@DaoServiceNoSqlTest +@DaoNoSqlTest public class WidgetsBundleServiceNoSqlTest extends BaseWidgetsBundleServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/plugin/nosql/PluginServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/plugin/nosql/PluginServiceNoSqlTest.java index 15b6ddaed2..f06e5435bc 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/plugin/nosql/PluginServiceNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/plugin/nosql/PluginServiceNoSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.plugin.nosql; -import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.plugin.BasePluginServiceTest; -@DaoServiceNoSqlTest +@DaoNoSqlTest public class PluginServiceNoSqlTest extends BasePluginServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/plugin/sql/PluginServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/plugin/sql/PluginServiceSqlTest.java index addeffe64e..448747f36e 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/plugin/sql/PluginServiceSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/plugin/sql/PluginServiceSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.plugin.sql; -import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.service.plugin.BasePluginServiceTest; -@DaoServiceSqlTest +@DaoSqlTest public class PluginServiceSqlTest extends BasePluginServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/rule/nosql/RuleServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/rule/nosql/RuleServiceNoSqlTest.java index 1fc6886cd9..2a347832c4 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/rule/nosql/RuleServiceNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/rule/nosql/RuleServiceNoSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.rule.nosql; -import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.rule.BaseRuleServiceTest; -@DaoServiceNoSqlTest +@DaoNoSqlTest public class RuleServiceNoSqlTest extends BaseRuleServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/rule/sql/RuleServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/rule/sql/RuleServiceSqlTest.java index b3a810f068..1e9325a9a7 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/rule/sql/RuleServiceSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/rule/sql/RuleServiceSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.rule.sql; -import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.service.rule.BaseRuleServiceTest; -@DaoServiceSqlTest +@DaoSqlTest public class RuleServiceSqlTest extends BaseRuleServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AdminSettingsServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AdminSettingsServiceSqlTest.java index 901a9cf6e6..ff66d126b5 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AdminSettingsServiceSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AdminSettingsServiceSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.sql; -import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.service.BaseAdminSettingsServiceTest; -@DaoServiceSqlTest +@DaoSqlTest public class AdminSettingsServiceSqlTest extends BaseAdminSettingsServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmServiceSqlTest.java index 85bef2bbaa..f67f5d568d 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmServiceSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AlarmServiceSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.sql; -import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.service.BaseAlarmServiceTest; -@DaoServiceSqlTest +@DaoSqlTest public class AlarmServiceSqlTest extends BaseAlarmServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetServiceSqlTest.java index 30cc8feec1..1bbc789ee6 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetServiceSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/AssetServiceSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.sql; -import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.service.BaseAssetServiceTest; -@DaoServiceSqlTest +@DaoSqlTest public class AssetServiceSqlTest extends BaseAssetServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/CustomerServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/CustomerServiceSqlTest.java index 559281b239..bdaca55109 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/CustomerServiceSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/CustomerServiceSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.sql; -import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.service.BaseCustomerServiceTest; -@DaoServiceSqlTest +@DaoSqlTest public class CustomerServiceSqlTest extends BaseCustomerServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DashboardServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DashboardServiceSqlTest.java index 5af38f62c0..77a8cef932 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DashboardServiceSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DashboardServiceSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.sql; -import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.service.BaseDashboardServiceTest; -@DaoServiceSqlTest +@DaoSqlTest public class DashboardServiceSqlTest extends BaseDashboardServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheSqlTest.java index b6fd8e802c..6f9211d8ee 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsCacheSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.sql; -import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.service.BaseDeviceCredentialsCacheTest; -@DaoServiceSqlTest +@DaoSqlTest public class DeviceCredentialsCacheSqlTest extends BaseDeviceCredentialsCacheTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsServiceSqlTest.java index fbc0cd6b37..31fde40b79 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsServiceSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceCredentialsServiceSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.sql; -import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.service.BaseDeviceCredentialsServiceTest; -@DaoServiceSqlTest +@DaoSqlTest public class DeviceCredentialsServiceSqlTest extends BaseDeviceCredentialsServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceServiceSqlTest.java index 4a030d508a..647a6027a0 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceServiceSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/DeviceServiceSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.sql; -import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.service.BaseDeviceServiceTest; -@DaoServiceSqlTest +@DaoSqlTest public class DeviceServiceSqlTest extends BaseDeviceServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationServiceSqlTest.java index 8c8e178c68..e9fefa4cd2 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationServiceSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/RelationServiceSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.sql; -import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.service.BaseRelationServiceTest; -@DaoServiceSqlTest +@DaoSqlTest public class RelationServiceSqlTest extends BaseRelationServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantServiceSqlTest.java index 6f05d5379b..f2816dae9c 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantServiceSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/TenantServiceSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.sql; -import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.service.BaseTenantServiceTest; -@DaoServiceSqlTest +@DaoSqlTest public class TenantServiceSqlTest extends BaseTenantServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/UserServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/UserServiceSqlTest.java index 27c69998fd..4b4085722c 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/UserServiceSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/UserServiceSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.sql; -import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.service.BaseUserServiceTest; -@DaoServiceSqlTest +@DaoSqlTest public class UserServiceSqlTest extends BaseUserServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetTypeServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetTypeServiceSqlTest.java index 5c9656fdd1..ec733d69f3 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetTypeServiceSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetTypeServiceSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.sql; -import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.service.BaseWidgetTypeServiceTest; -@DaoServiceSqlTest +@DaoSqlTest public class WidgetTypeServiceSqlTest extends BaseWidgetTypeServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetsBundleServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetsBundleServiceSqlTest.java index 3e6dcdedad..7d44fa8ef2 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetsBundleServiceSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/sql/WidgetsBundleServiceSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.sql; -import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.service.BaseWidgetsBundleServiceTest; -@DaoServiceSqlTest +@DaoSqlTest public class WidgetsBundleServiceSqlTest extends BaseWidgetsBundleServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlTest.java index 56b1b47781..a5c29aadfa 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.timeseries.nosql; -import org.thingsboard.server.dao.service.DaoServiceNoSqlTest; +import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.timeseries.BaseTimeseriesServiceTest; -@DaoServiceNoSqlTest +@DaoNoSqlTest public class TimeseriesServiceNoSqlTest extends BaseTimeseriesServiceTest { } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/sql/TimeseriesServiceSqlTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/sql/TimeseriesServiceSqlTest.java index 5e92e55217..fa13dea926 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/sql/TimeseriesServiceSqlTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/timeseries/sql/TimeseriesServiceSqlTest.java @@ -15,9 +15,9 @@ */ package org.thingsboard.server.dao.service.timeseries.sql; -import org.thingsboard.server.dao.service.DaoServiceSqlTest; +import org.thingsboard.server.dao.service.DaoSqlTest; import org.thingsboard.server.dao.service.timeseries.BaseTimeseriesServiceTest; -@DaoServiceSqlTest +@DaoSqlTest public class TimeseriesServiceSqlTest extends BaseTimeseriesServiceTest { } diff --git a/pom.xml b/pom.xml index 393fbbaea4..5c16cb60de 100755 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,6 @@ 2.6.1 1.56 2.0.1 - 1.4.194 2.5.3 1.2.1 9.4.1211 @@ -741,12 +740,6 @@ bcpkix-jdk15on ${bouncycastle.version} - - com.h2database - h2 - ${h2.version} - test - ru.yandex.qatools.embed postgresql-embedded From 996658eb44bb3ce806f4088570c9ed4bab6e21c1 Mon Sep 17 00:00:00 2001 From: mp-loki Date: Tue, 27 Jun 2017 21:01:37 -0400 Subject: [PATCH 69/69] License Headers updated --- .../server/system/SystemSqlTestSuite.java | 15 +++++++++++++++ .../server/system/nosql/DeviceApiNoSqlTest.java | 15 +++++++++++++++ .../server/system/sql/DeviceApiSqlTest.java | 15 +++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/application/src/test/java/org/thingsboard/server/system/SystemSqlTestSuite.java b/application/src/test/java/org/thingsboard/server/system/SystemSqlTestSuite.java index 72982a863e..726b2052aa 100644 --- a/application/src/test/java/org/thingsboard/server/system/SystemSqlTestSuite.java +++ b/application/src/test/java/org/thingsboard/server/system/SystemSqlTestSuite.java @@ -1,3 +1,18 @@ +/** + * 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.system; import org.junit.ClassRule; diff --git a/application/src/test/java/org/thingsboard/server/system/nosql/DeviceApiNoSqlTest.java b/application/src/test/java/org/thingsboard/server/system/nosql/DeviceApiNoSqlTest.java index f8a172484d..7ee185cd0f 100644 --- a/application/src/test/java/org/thingsboard/server/system/nosql/DeviceApiNoSqlTest.java +++ b/application/src/test/java/org/thingsboard/server/system/nosql/DeviceApiNoSqlTest.java @@ -1,3 +1,18 @@ +/** + * 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.system.nosql; import org.thingsboard.server.dao.service.DaoNoSqlTest; diff --git a/application/src/test/java/org/thingsboard/server/system/sql/DeviceApiSqlTest.java b/application/src/test/java/org/thingsboard/server/system/sql/DeviceApiSqlTest.java index 2df56e8268..bf533132c7 100644 --- a/application/src/test/java/org/thingsboard/server/system/sql/DeviceApiSqlTest.java +++ b/application/src/test/java/org/thingsboard/server/system/sql/DeviceApiSqlTest.java @@ -1,3 +1,18 @@ +/** + * 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.system.sql; import org.thingsboard.server.dao.service.DaoSqlTest;