aboutsummaryrefslogtreecommitdiff
path: root/juick-api/src/main/java/com/juick/api/configuration
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2017-09-05 14:16:12 +0300
committerGravatar Vitaly Takmazov2017-09-05 14:18:45 +0300
commit8dae811e0ad78f15faa6431590a0a4ae66c7bc03 (patch)
tree3b6845f5473d38eb62a1941d201d4e9e3d113906 /juick-api/src/main/java/com/juick/api/configuration
parent835482fba474cae7b9bdc714f4552f669458482b (diff)
api: telegram bot is spring component
Diffstat (limited to 'juick-api/src/main/java/com/juick/api/configuration')
-rw-r--r--juick-api/src/main/java/com/juick/api/configuration/ApiAppConfiguration.java2
-rw-r--r--juick-api/src/main/java/com/juick/api/configuration/ApiInitializer.java3
-rw-r--r--juick-api/src/main/java/com/juick/api/configuration/TelegramConfiguration.java36
3 files changed, 2 insertions, 39 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 cb5e617d..8bae8e93 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
@@ -36,7 +36,7 @@ import javax.inject.Inject;
@EnableScheduling
@EnableAsync
@PropertySource("classpath:juick.conf")
-@ComponentScan(basePackages = "com.juick.api.controllers")
+@ComponentScan(basePackages = "com.juick.api")
@Import(BaseWebConfiguration.class)
public class ApiAppConfiguration extends WebMvcConfigurationSupport {
@Inject
diff --git a/juick-api/src/main/java/com/juick/api/configuration/ApiInitializer.java b/juick-api/src/main/java/com/juick/api/configuration/ApiInitializer.java
index 1b2e7850..fa025e56 100644
--- a/juick-api/src/main/java/com/juick/api/configuration/ApiInitializer.java
+++ b/juick-api/src/main/java/com/juick/api/configuration/ApiInitializer.java
@@ -32,8 +32,7 @@ public class ApiInitializer extends AbstractAnnotationConfigDispatcherServletIni
@Override
protected Class<?>[] getRootConfigClasses() {
return new Class<?>[]{
- ApiSecurityConfig.class, DataConfiguration.class,
- TelegramConfiguration.class, MessengerConfiguration.class
+ ApiSecurityConfig.class, DataConfiguration.class, MessengerConfiguration.class
};
}
diff --git a/juick-api/src/main/java/com/juick/api/configuration/TelegramConfiguration.java b/juick-api/src/main/java/com/juick/api/configuration/TelegramConfiguration.java
deleted file mode 100644
index c232de96..00000000
--- a/juick-api/src/main/java/com/juick/api/configuration/TelegramConfiguration.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2008-2017, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.juick.api.configuration;
-
-import com.juick.api.TGBot;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Created by vital on 28.03.2017.
- */
-@Configuration
-public class TelegramConfiguration {
- @Value("${telegram_token}")
- private String telegramToken;
- @Bean
- public TGBot tgBot() {
- return new TGBot(telegramToken);
- }
-}