From 2ad19106f369dbf6b2b2251c56a1569d5eec0e2c Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Thu, 4 Jan 2024 14:52:12 +0200
Subject: [PATCH] removed redundant code, fixed tests

---
 .../service/install/TimescaleTsDatabaseUpgradeService.java  | 5 -----
 .../main/java/org/thingsboard/server/dao/JpaDaoConfig.java  | 6 +++---
 .../org/thingsboard/server/dao/SqlTimeseriesDaoConfig.java  | 1 -
 .../timeseries/nosql/TimeseriesServiceNoSqlTest.java        | 1 -
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/install/TimescaleTsDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/TimescaleTsDatabaseUpgradeService.java
index 4477bef1c4..205ec14591 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/TimescaleTsDatabaseUpgradeService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/TimescaleTsDatabaseUpgradeService.java
@@ -184,11 +184,6 @@ public class TimescaleTsDatabaseUpgradeService extends AbstractSqlTsDatabaseUpgr
                 break;
             case "3.2.2":
                 break;
-            case "3.6.2":
-                try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
-                    loadSql(conn, LOAD_TTL_FUNCTIONS_SQL, "3.6.2");
-                }
-                break;
             default:
                 throw new RuntimeException("Unable to upgrade SQL database, unsupported fromVersion: " + fromVersion);
         }
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 37ca4aecbc..40a45c3444 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java
@@ -27,9 +27,9 @@ import org.thingsboard.server.dao.util.TbAutoConfiguration;
  */
 @Configuration
 @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"})
-@EnableJpaRepositories({"org.thingsboard.server.dao.sql", "org.thingsboard.server.dao.sqlts"})
-@EntityScan({"org.thingsboard.server.dao.model.sql", "org.thingsboard.server.dao.model.sqlts"})
+@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")
+@EntityScan("org.thingsboard.server.dao.model.sql")
 @EnableTransactionManagement
 public class JpaDaoConfig {
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/SqlTimeseriesDaoConfig.java b/dao/src/main/java/org/thingsboard/server/dao/SqlTimeseriesDaoConfig.java
index 44658f114f..9693e2d10b 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/SqlTimeseriesDaoConfig.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/SqlTimeseriesDaoConfig.java
@@ -27,7 +27,6 @@ import org.thingsboard.server.dao.util.TbAutoConfiguration;
 @EnableJpaRepositories({"org.thingsboard.server.dao.sqlts.dictionary"})
 @EntityScan({"org.thingsboard.server.dao.model.sqlts.dictionary"})
 @EnableTransactionManagement
-@SqlTsOrTsLatestAnyDao
 public class SqlTimeseriesDaoConfig {
 
 }
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 af1b11174a..efcf62be20 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,7 +15,6 @@
  */
 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.timeseries.BaseTimeseriesServiceTest;