juick-api: inject properties with @Value

1 files changed, 5 insertions, 15 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 382b3df5..e987893d 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
@@ -3,7 +3,9 @@ package com.juick.api.configuration;
 import com.juick.api.ApiServer;
 import com.juick.api.MessengerBot;
 import com.juick.api.TGBot;
+import com.pengrad.telegrambot.TelegramBot;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
@@ -22,30 +24,18 @@ import javax.inject.Inject;
 @PropertySource("classpath:juick.conf")
 public class ApiAppConfiguration {
     @Inject
-    private Environment env;
+    TGBot tgBot;
 
     @Bean
     public ApiServer apiServer() {
-        return new ApiServer(env);
-    }
-
-    @Bean
-    public TGBot tgBot() {
-        return new TGBot(env.getProperty("telegram_token", StringUtils.EMPTY));
-    }
-
-    @Bean
-    public MessengerBot fbBot() {
-        MessengerBot bot = new MessengerBot();
-        bot.setVerifyToken(env.getProperty("fb_verify_token", StringUtils.EMPTY));
-        return bot;
+        return new ApiServer();
     }
 
     private static final String WS_URI = "wss://ws.juick.com/";
 
     @Bean
     public WebSocketConnectionManager connectionManager() {
-        WebSocketConnectionManager manager = new WebSocketConnectionManager(client(), tgBot(), WS_URI);
+        WebSocketConnectionManager manager = new WebSocketConnectionManager(client(), tgBot, WS_URI);
         manager.setAutoStartup(true);
         return manager;
     }