From 045ca0848c8ee7c771541a5829157531c782cf30 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 19 Apr 2017 14:51:48 +0300
Subject: juick-www: Home controller uses Pebble, drop ads

wip
---
 juick-api/src/main/java/com/juick/api/ApiServer.java          |  3 ---
 .../java/com/juick/api/configuration/ApiAppConfiguration.java | 11 -----------
 .../java/com/juick/api/configuration/ApiMvcConfiguration.java |  6 ++++++
 .../src/test/java/com/juick/api/tests/MessagesTests.java      |  6 ++++--
 4 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'juick-api/src')

diff --git a/juick-api/src/main/java/com/juick/api/ApiServer.java b/juick-api/src/main/java/com/juick/api/ApiServer.java
index b59010b3..097dda58 100644
--- a/juick-api/src/main/java/com/juick/api/ApiServer.java
+++ b/juick-api/src/main/java/com/juick/api/ApiServer.java
@@ -17,12 +17,9 @@
  */
 package com.juick.api;
 
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.math.NumberUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.env.Environment;
 import rocks.xmpp.core.XmppException;
 import rocks.xmpp.core.session.Extension;
 import rocks.xmpp.core.session.XmppSessionConfiguration;
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 e987893d..b6ba9282 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
@@ -1,15 +1,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;
-import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.socket.client.WebSocketConnectionManager;
 import org.springframework.web.socket.client.standard.StandardWebSocketClient;
@@ -26,11 +20,6 @@ public class ApiAppConfiguration {
     @Inject
     TGBot tgBot;
 
-    @Bean
-    public ApiServer apiServer() {
-        return new ApiServer();
-    }
-
     private static final String WS_URI = "wss://ws.juick.com/";
 
     @Bean
diff --git a/juick-api/src/main/java/com/juick/api/configuration/ApiMvcConfiguration.java b/juick-api/src/main/java/com/juick/api/configuration/ApiMvcConfiguration.java
index 37c07434..adff42a7 100644
--- a/juick-api/src/main/java/com/juick/api/configuration/ApiMvcConfiguration.java
+++ b/juick-api/src/main/java/com/juick/api/configuration/ApiMvcConfiguration.java
@@ -2,6 +2,7 @@ package com.juick.api.configuration;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+import com.juick.api.ApiServer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -22,6 +23,11 @@ import java.util.List;
 @ComponentScan(basePackages = {"com.juick.api.controllers"})
 public class ApiMvcConfiguration extends WebMvcConfigurationSupport {
 
+    @Bean
+    public ApiServer apiServer() {
+        return new ApiServer();
+    }
+
     @Override
     public RequestMappingHandlerMapping requestMappingHandlerMapping() {
         RequestMappingHandlerMapping mapping = super.requestMappingHandlerMapping();
diff --git a/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java b/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java
index 61d1b008..af1e49a4 100644
--- a/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java
+++ b/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java
@@ -3,9 +3,10 @@ package com.juick.api.tests;
 import com.juick.Message;
 import com.juick.Tag;
 import com.juick.User;
-import com.juick.api.configuration.ApiAppConfiguration;
 import com.juick.api.configuration.ApiMvcConfiguration;
 import com.juick.api.configuration.ApiSecurityConfig;
+import com.juick.api.configuration.MessengerConfiguration;
+import com.juick.api.configuration.TelegramConfiguration;
 import com.juick.configuration.MockDataConfiguration;
 import com.juick.server.helpers.TagStats;
 import com.juick.service.MessagesService;
@@ -44,7 +45,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @WebAppConfiguration
 public class MessagesTests {
     @Configuration
-    @Import(value = {ApiMvcConfiguration.class, ApiAppConfiguration.class, ApiSecurityConfig.class, MockDataConfiguration.class})
+    @Import(value = {ApiMvcConfiguration.class, ApiSecurityConfig.class,
+            MockDataConfiguration.class, MessengerConfiguration.class, TelegramConfiguration.class})
     static class Config {}
 
     private MockMvc mockMvc;
-- 
cgit v1.2.3