dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed redundant code, fixed tests

Browse Source
This commit is contained in:
dashevchenko 2024-01-04 14:52:12 +02:00
parent e9c8445e53
commit 2ad19106f3
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/src/main/java/org/thingsboard/server/service/install/TimescaleTsDatabaseUpgradeService.java
View File

@ -184,11 +184,6 @@ public class TimescaleTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgr
break; break;
case "3.2.2": case "3.2.2":
break; break;
case "3.6.2":
try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
loadSql(conn, LOAD_TTL_FUNCTIONS_SQL, "3.6.2");
}
break;
default: default:
throw new RuntimeException("Unable to upgrade SQL database, unsupported fromVersion: " + fromVersion); throw new RuntimeException("Unable to upgrade SQL database, unsupported fromVersion: " + fromVersion);
} }

6
dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java
View File

@ -27,9 +27,9 @@ import org.thingsboard.server.dao.util.TbAutoConfiguration;
*/ */
@Configuration @Configuration
@TbAutoConfiguration @TbAutoConfiguration
@ComponentScan({"org.thingsboard.server.dao.sql", "org.thingsboard.server.dao.sqlts", "org.thingsboard.server.dao.attributes", "org.thingsboard.server.dao.cache", "org.thingsboard.server.cache"}) @ComponentScan({"org.thingsboard.server.dao.sql", "org.thingsboard.server.dao.attributes", "org.thingsboard.server.dao.cache", "org.thingsboard.server.cache"})
@EnableJpaRepositories({"org.thingsboard.server.dao.sql", "org.thingsboard.server.dao.sqlts"}) @EnableJpaRepositories("org.thingsboard.server.dao.sql")
@EntityScan({"org.thingsboard.server.dao.model.sql", "org.thingsboard.server.dao.model.sqlts"}) @EntityScan("org.thingsboard.server.dao.model.sql")
@EnableTransactionManagement @EnableTransactionManagement
public class JpaDaoConfig { public class JpaDaoConfig {

1
dao/src/main/java/org/thingsboard/server/dao/SqlTimeseriesDaoConfig.java
View File

@ -27,7 +27,6 @@ import org.thingsboard.server.dao.util.TbAutoConfiguration;
@EnableJpaRepositories({"org.thingsboard.server.dao.sqlts.dictionary"}) @EnableJpaRepositories({"org.thingsboard.server.dao.sqlts.dictionary"})
@EntityScan({"org.thingsboard.server.dao.model.sqlts.dictionary"}) @EntityScan({"org.thingsboard.server.dao.model.sqlts.dictionary"})
@EnableTransactionManagement @EnableTransactionManagement
@SqlTsOrTsLatestAnyDao
public class SqlTimeseriesDaoConfig { public class SqlTimeseriesDaoConfig {
} }

1
dao/src/test/java/org/thingsboard/server/dao/service/timeseries/nosql/TimeseriesServiceNoSqlTest.java
View File

@ -15,7 +15,6 @@
*/ */
package org.thingsboard.server.dao.service.timeseries.nosql; package org.thingsboard.server.dao.service.timeseries.nosql;
import org.thingsboard.server.dao.AbstractJpaDaoTest;
import org.thingsboard.server.dao.service.DaoNoSqlTest; import org.thingsboard.server.dao.service.DaoNoSqlTest;
import org.thingsboard.server.dao.service.timeseries.BaseTimeseriesServiceTest; import org.thingsboard.server.dao.service.timeseries.BaseTimeseriesServiceTest;