diff options
author | 2016-11-26 04:24:14 +0700 | |
---|---|---|
committer | 2016-11-26 04:24:14 +0700 | |
commit | 3c037e00d89a4ad5d0df57b3216857237ab81886 (patch) | |
tree | fc29f7e6eea5247564f3e32f6c93878e6015bcfd /juick-api/src/main/java/com/juick/api/configuration/ApiAppConfiguration.java | |
parent | 46a040d6ff07e2581ae461ac60d2abc736cc7c6d (diff) |
api configuration
Diffstat (limited to 'juick-api/src/main/java/com/juick/api/configuration/ApiAppConfiguration.java')
-rw-r--r-- | juick-api/src/main/java/com/juick/api/configuration/ApiAppConfiguration.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/juick-api/src/main/java/com/juick/api/configuration/ApiAppConfiguration.java b/juick-api/src/main/java/com/juick/api/configuration/ApiAppConfiguration.java index 8f1e269b..b4b9df57 100644 --- a/juick-api/src/main/java/com/juick/api/configuration/ApiAppConfiguration.java +++ b/juick-api/src/main/java/com/juick/api/configuration/ApiAppConfiguration.java @@ -2,8 +2,9 @@ package com.juick.api.configuration; import com.juick.api.ApiServer; import com.juick.api.TGBot; -import com.juick.configuration.DataConfiguration; -import org.springframework.context.annotation.*; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; import org.springframework.core.env.Environment; import javax.inject.Inject; @@ -13,17 +14,17 @@ import javax.inject.Inject; */ @Configuration @PropertySource("classpath:juick.conf") -@Import(DataConfiguration.class) public class ApiAppConfiguration { @Inject private Environment env; @Bean - ApiServer apiServer() { + public ApiServer apiServer() { return new ApiServer(env); } + @Bean - TGBot tgBot() { + public TGBot tgBot() { return new TGBot(env.getProperty("telegram_token", "")); } } |