Browse Source

Fix Timescale dao configuration

pull/11368/head
ViacheslavKlimov 2 years ago
parent
commit
49707f9cfc
  1. 10
      dao/src/main/java/org/thingsboard/server/dao/config/JpaDaoConfig.java
  2. 2
      dao/src/main/java/org/thingsboard/server/dao/config/TimescaleDaoConfig.java
  3. 2
      dao/src/main/java/org/thingsboard/server/dao/config/TimescaleTsLatestDaoConfig.java

10
dao/src/main/java/org/thingsboard/server/dao/config/JpaDaoConfig.java

@ -69,7 +69,9 @@ public class JpaDaoConfig {
public LocalContainerEntityManagerFactoryBean entityManagerFactory(@Qualifier("dataSource") DataSource dataSource, public LocalContainerEntityManagerFactoryBean entityManagerFactory(@Qualifier("dataSource") DataSource dataSource,
EntityManagerFactoryBuilder builder, EntityManagerFactoryBuilder builder,
@Autowired(required = false) SqlTsLatestDaoConfig tsLatestDaoConfig, @Autowired(required = false) SqlTsLatestDaoConfig tsLatestDaoConfig,
@Autowired(required = false) SqlTsDaoConfig tsDaoConfig) { @Autowired(required = false) SqlTsDaoConfig tsDaoConfig,
@Autowired(required = false) TimescaleDaoConfig timescaleDaoConfig,
@Autowired(required = false) TimescaleTsLatestDaoConfig timescaleTsLatestDaoConfig) {
List<String> packages = new ArrayList<>(); List<String> packages = new ArrayList<>();
packages.add("org.thingsboard.server.dao.model.sql"); packages.add("org.thingsboard.server.dao.model.sql");
packages.add("org.thingsboard.server.dao.model.sqlts.dictionary"); packages.add("org.thingsboard.server.dao.model.sqlts.dictionary");
@ -79,6 +81,12 @@ public class JpaDaoConfig {
if (tsDaoConfig != null) { if (tsDaoConfig != null) {
packages.add("org.thingsboard.server.dao.model.sqlts.ts"); packages.add("org.thingsboard.server.dao.model.sqlts.ts");
} }
if (timescaleDaoConfig != null) {
packages.add("org.thingsboard.server.dao.model.sqlts.timescale");
}
if (timescaleTsLatestDaoConfig != null) {
packages.add("org.thingsboard.server.dao.model.sqlts.latest");
}
return builder return builder
.dataSource(dataSource) .dataSource(dataSource)
.packages(packages.toArray(String[]::new)) .packages(packages.toArray(String[]::new))

2
dao/src/main/java/org/thingsboard/server/dao/config/TimescaleDaoConfig.java

@ -15,7 +15,6 @@
*/ */
package org.thingsboard.server.dao.config; package org.thingsboard.server.dao.config;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
@ -28,7 +27,6 @@ import org.thingsboard.server.dao.util.TimescaleDBTsDao;
@TbAutoConfiguration @TbAutoConfiguration
@ComponentScan({"org.thingsboard.server.dao.sqlts.timescale"}) @ComponentScan({"org.thingsboard.server.dao.sqlts.timescale"})
@EnableJpaRepositories(value = {"org.thingsboard.server.dao.sqlts.timescale", "org.thingsboard.server.dao.sqlts.insert.timescale"}, bootstrapMode = BootstrapMode.LAZY) @EnableJpaRepositories(value = {"org.thingsboard.server.dao.sqlts.timescale", "org.thingsboard.server.dao.sqlts.insert.timescale"}, bootstrapMode = BootstrapMode.LAZY)
@EntityScan({"org.thingsboard.server.dao.model.sqlts.timescale"})
@EnableTransactionManagement @EnableTransactionManagement
@TimescaleDBTsDao @TimescaleDBTsDao
public class TimescaleDaoConfig { public class TimescaleDaoConfig {

2
dao/src/main/java/org/thingsboard/server/dao/config/TimescaleTsLatestDaoConfig.java

@ -15,7 +15,6 @@
*/ */
package org.thingsboard.server.dao.config; package org.thingsboard.server.dao.config;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
@ -28,7 +27,6 @@ import org.thingsboard.server.dao.util.TimescaleDBTsLatestDao;
@TbAutoConfiguration @TbAutoConfiguration
@ComponentScan({"org.thingsboard.server.dao.sqlts.timescale"}) @ComponentScan({"org.thingsboard.server.dao.sqlts.timescale"})
@EnableJpaRepositories(value = {"org.thingsboard.server.dao.sqlts.insert.latest.sql", "org.thingsboard.server.dao.sqlts.latest"}, bootstrapMode = BootstrapMode.LAZY) @EnableJpaRepositories(value = {"org.thingsboard.server.dao.sqlts.insert.latest.sql", "org.thingsboard.server.dao.sqlts.latest"}, bootstrapMode = BootstrapMode.LAZY)
@EntityScan({"org.thingsboard.server.dao.model.sqlts.latest"})
@EnableTransactionManagement @EnableTransactionManagement
@TimescaleDBTsLatestDao @TimescaleDBTsLatestDao
public class TimescaleTsLatestDaoConfig { public class TimescaleTsLatestDaoConfig {

Loading…
Cancel
Save