thingsboard-aplcache

Fixed tests

9/20/2018 11:08:03 AM

Details

diff --git a/application/src/main/java/org/thingsboard/server/service/install/CassandraEntityDatabaseSchemaService.java b/application/src/main/java/org/thingsboard/server/service/install/CassandraEntityDatabaseSchemaService.java
index 7937ef2..b492a51 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/CassandraEntityDatabaseSchemaService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/CassandraEntityDatabaseSchemaService.java
@@ -15,11 +15,13 @@
  */
 package org.thingsboard.server.service.install;
 
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.dao.util.NoSqlDao;
 
 @Service
 @NoSqlDao
+@Profile("install")
 public class CassandraEntityDatabaseSchemaService extends CassandraAbstractDatabaseSchemaService
         implements EntityDatabaseSchemaService {
     public CassandraEntityDatabaseSchemaService() {
diff --git a/application/src/main/java/org/thingsboard/server/service/install/CassandraTsDatabaseSchemaService.java b/application/src/main/java/org/thingsboard/server/service/install/CassandraTsDatabaseSchemaService.java
index ba18b57..1a3a2e4 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/CassandraTsDatabaseSchemaService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/CassandraTsDatabaseSchemaService.java
@@ -15,11 +15,13 @@
  */
 package org.thingsboard.server.service.install;
 
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.dao.util.NoSqlTsDao;
 
 @Service
 @NoSqlTsDao
+@Profile("install")
 public class CassandraTsDatabaseSchemaService extends CassandraAbstractDatabaseSchemaService
         implements TsDatabaseSchemaService {
     public CassandraTsDatabaseSchemaService() {
diff --git a/application/src/main/java/org/thingsboard/server/service/install/SqlEntityDatabaseSchemaService.java b/application/src/main/java/org/thingsboard/server/service/install/SqlEntityDatabaseSchemaService.java
index 16453c6..bfd371b 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/SqlEntityDatabaseSchemaService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/SqlEntityDatabaseSchemaService.java
@@ -15,11 +15,13 @@
  */
 package org.thingsboard.server.service.install;
 
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.dao.util.SqlDao;
 
 @Service
 @SqlDao
+@Profile("install")
 public class SqlEntityDatabaseSchemaService extends SqlAbstractDatabaseSchemaService
         implements EntityDatabaseSchemaService {
     public SqlEntityDatabaseSchemaService() {
diff --git a/application/src/main/java/org/thingsboard/server/service/install/SqlTsDatabaseSchemaService.java b/application/src/main/java/org/thingsboard/server/service/install/SqlTsDatabaseSchemaService.java
index 82daf90..03a3517 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/SqlTsDatabaseSchemaService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/SqlTsDatabaseSchemaService.java
@@ -15,11 +15,13 @@
  */
 package org.thingsboard.server.service.install;
 
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.dao.util.SqlTsDao;
 
 @Service
 @SqlTsDao
+@Profile("install")
 public class SqlTsDatabaseSchemaService extends SqlAbstractDatabaseSchemaService
         implements TsDatabaseSchemaService {
     public SqlTsDatabaseSchemaService() {