diff --git a/application/pom.xml b/application/pom.xml index 89a6377bea..b379b59bf7 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -260,7 +260,6 @@ org.hsqldb hsqldb - test diff --git a/application/src/main/conf/thingsboard.conf b/application/src/main/conf/thingsboard.conf index ef977eea46..5ca6f26c33 100644 --- a/application/src/main/conf/thingsboard.conf +++ b/application/src/main/conf/thingsboard.conf @@ -17,3 +17,4 @@ export JAVA_OPTS="$JAVA_OPTS -Dplatform=@pkg.platform@" export LOG_FILENAME=${pkg.name}.out export LOADER_PATH=${pkg.installFolder}/conf,${pkg.installFolder}/extensions +export SQL_DATA_FOLDER=${pkg.installFolder}/data/sql diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 5d5dac1717..c749cb2a50 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -223,21 +223,36 @@ spring.mvc.cors: allowed-headers: "*" max-age: "1800" allow-credentials: "true" - -# SQL DAO Configuration +# HSQLDB DAO Configuration spring: data: jpa: repositories: enabled: "true" jpa: - show-sql: "false" - database-platform: "org.hibernate.dialect.PostgreSQLDialect" hibernate: ddl-auto: "validate" + database-platform: "org.hibernate.dialect.HSQLDialect" datasource: - 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 + driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.hsqldb.jdbc.JDBCDriver}" + url: "${SPRING_DATASOURCE_URL:jdbc:hsqldb:file:${SQL_DATA_FOLDER:/tmp}/thingsboardDb;sql.enforce_size=false}" + username: "${SPRING_DATASOURCE_USERNAME:sa}" + password: "${SPRING_DATASOURCE_PASSWORD:}" + + +# Postgres DAO Configuration +#spring: +# data: +# jpa: +# repositories: +# enabled: "true" +# jpa: +# hibernate: +# ddl-auto: "validate" +# database-platform: "org.hibernate.dialect.PostgreSQLDialect" +# datasource: +# 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}" diff --git a/application/src/main/scripts/windows/install.bat b/application/src/main/scripts/windows/install.bat index c160367486..b49ca84628 100644 --- a/application/src/main/scripts/windows/install.bat +++ b/application/src/main/scripts/windows/install.bat @@ -78,6 +78,7 @@ if "%1" == "--loadDemo" ( SET BASE=%~dp0 SET LOADER_PATH=%BASE%\conf,%BASE%\extensions +SET SQL_DATA_FOLDER=%BASE%\data\sql SET jarfile=%BASE%\lib\${pkg.name}.jar SET installDir=%BASE%\data diff --git a/application/src/main/scripts/windows/service.xml b/application/src/main/scripts/windows/service.xml index becbcdc9bd..17165905bc 100644 --- a/application/src/main/scripts/windows/service.xml +++ b/application/src/main/scripts/windows/service.xml @@ -6,6 +6,7 @@ ${pkg.winWrapperLogFolder} rotate + java -Dplatform=windows -jar diff --git a/application/src/main/scripts/windows/upgrade.bat b/application/src/main/scripts/windows/upgrade.bat index 3e6aed34f0..9039d50a6c 100644 --- a/application/src/main/scripts/windows/upgrade.bat +++ b/application/src/main/scripts/windows/upgrade.bat @@ -22,6 +22,7 @@ if not defined fromVersion ( ) SET LOADER_PATH=%BASE%\conf,%BASE%\extensions +SET SQL_DATA_FOLDER=%BASE%\data\sql SET jarfile=%BASE%\lib\${pkg.name}.jar SET installDir=%BASE%\data 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 2fd6c97689..8571bd6408 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 @@ -28,8 +28,6 @@ import org.thingsboard.server.dao.model.BaseEntity; import java.util.List; import java.util.UUID; -import static org.springframework.transaction.annotation.Propagation.REQUIRES_NEW; - /** * @author Valerii Sosliuk */ 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 bc6a4d74e1..f6979a30d2 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 @@ -20,8 +20,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; import org.thingsboard.server.common.data.asset.TenantAssetType; -import org.thingsboard.server.dao.util.SqlDao; import org.thingsboard.server.dao.model.sql.AssetEntity; +import org.thingsboard.server.dao.util.SqlDao; import java.util.List; import java.util.UUID; 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 decd74b95b..d936a38fa0 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java +++ b/dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java @@ -24,7 +24,7 @@ import java.util.Arrays; @RunWith(ClasspathSuite.class) @ClassnameFilters({ - "org.thingsboard.server.dao.sql.*AASDTest" + "org.thingsboard.server.dao.sql.*AAATest" }) public class JpaDaoTestSuite { 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 507eb4d4af..01c53b6883 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java +++ b/dao/src/test/java/org/thingsboard/server/dao/JpaDbunitTestConfig.java @@ -51,7 +51,6 @@ public class JpaDbunitTestConfig { DatabaseDataSourceConnectionFactoryBean databaseDataSourceConnectionFactoryBean = new DatabaseDataSourceConnectionFactoryBean(); databaseDataSourceConnectionFactoryBean.setDatabaseConfig(databaseConfigBean()); databaseDataSourceConnectionFactoryBean.setDataSource(dataSource); - databaseDataSourceConnectionFactoryBean.setSchema("public"); return databaseDataSourceConnectionFactoryBean; } } 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 265185479b..992cbba829 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,8 +18,6 @@ package org.thingsboard.server.dao.sql.alarm; import com.google.common.util.concurrent.ListenableFuture; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.PageRequest; -import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.alarm.Alarm; import org.thingsboard.server.common.data.alarm.AlarmId; import org.thingsboard.server.common.data.alarm.AlarmStatus; @@ -27,7 +25,6 @@ import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.dao.AbstractJpaDaoTest; import org.thingsboard.server.dao.alarm.AlarmDao; -import org.thingsboard.server.dao.model.sql.AlarmEntity; import java.util.UUID; import java.util.concurrent.ExecutionException; @@ -43,8 +40,6 @@ public class JpaAlarmDaoTest extends AbstractJpaDaoTest { @Autowired private AlarmDao alarmDao; - @Autowired - private AlarmRepository alarmRepository; @Test public void testFindLatestByOriginatorAndType() throws ExecutionException, InterruptedException { @@ -59,9 +54,6 @@ public class JpaAlarmDaoTest extends AbstractJpaDaoTest { saveAlarm(alarm2Id, tenantId, originator1Id, "TEST_ALARM"); saveAlarm(alarm3Id, tenantId, originator2Id, "TEST_ALARM"); assertEquals(3, alarmDao.find().size()); - AlarmEntity alarmEntity = alarmRepository.findLatestByOriginatorAndType( - tenantId, originator1Id, EntityType.DEVICE, "TEST_ALARM", new PageRequest(0, 1)).get(0); - assertNotNull(alarmEntity); ListenableFuture future = alarmDao .findLatestByOriginatorAndType(new TenantId(tenantId), new DeviceId(originator1Id), "TEST_ALARM"); Alarm alarm = future.get(); @@ -69,11 +61,6 @@ public class JpaAlarmDaoTest extends AbstractJpaDaoTest { assertEquals(alarm2Id, alarm.getId().getId()); } - @Test - public void testFindAlarmByIdAsync() { - // TODO: implement - } - private void saveAlarm(UUID id, UUID tenantId, UUID deviceId, String type) { Alarm alarm = new Alarm(); alarm.setId(new AlarmId(id)); diff --git a/dao/src/test/resources/dbunit/device_credentials.xml b/dao/src/test/resources/dbunit/device_credentials.xml index 01ccd6615b..5f813e26d9 100644 --- a/dao/src/test/resources/dbunit/device_credentials.xml +++ b/dao/src/test/resources/dbunit/device_credentials.xml @@ -1,14 +1,14 @@ \ No newline at end of file diff --git a/dao/src/test/resources/dbunit/rule.xml b/dao/src/test/resources/dbunit/rule.xml index 5040ff6941..dfe1054785 100644 --- a/dao/src/test/resources/dbunit/rule.xml +++ b/dao/src/test/resources/dbunit/rule.xml @@ -1,31 +1,31 @@ - - - - - org.hsqldb hsqldb ${hsqldb.version} - test ru.yandex.qatools.embed