From 1cc21c2eca3978086aaaea718e281efcad95d140 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Mon, 3 Jul 2017 13:41:17 +0300 Subject: [PATCH] TB-65: Fix spring boot configuration. --- .../thingsboard/server/ThingsboardInstallApplication.java | 6 ++---- .../server/service/install/SqlDatabaseSchemaService.java | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/ThingsboardInstallApplication.java b/application/src/main/java/org/thingsboard/server/ThingsboardInstallApplication.java index e6f27a4492..3caca2b6e8 100644 --- a/application/src/main/java/org/thingsboard/server/ThingsboardInstallApplication.java +++ b/application/src/main/java/org/thingsboard/server/ThingsboardInstallApplication.java @@ -17,16 +17,14 @@ package org.thingsboard.server; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.SpringBootConfiguration; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ComponentScan; import org.thingsboard.server.install.ThingsboardInstallService; import java.util.Arrays; -@EnableAutoConfiguration -@SpringBootApplication +@SpringBootConfiguration @ComponentScan({"org.thingsboard.server.install", "org.thingsboard.server.service.component", "org.thingsboard.server.service.install", diff --git a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseSchemaService.java b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseSchemaService.java index f5fad0928c..fc92de81ea 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseSchemaService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseSchemaService.java @@ -20,10 +20,12 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import org.thingsboard.server.dao.util.SqlDao; @Service @Profile("install") @Slf4j +@SqlDao public class SqlDatabaseSchemaService implements DatabaseSchemaService { @Value("${install.data_dir}")