From b45c000ed478f2407288aab1532425288f998689 Mon Sep 17 00:00:00 2001
From: Alexander Alexeev
Date: Wed, 30 Nov 2016 13:05:22 +0700
Subject: configurations clean-up, import is redundant

---
 .../main/java/com/juick/ws/configuration/WebsocketConfiguration.java   | 3 ---
 .../src/main/java/com/juick/ws/configuration/WebsocketInitializer.java | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'juick-ws/src/main/java/com/juick/ws/configuration')

diff --git a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
index 4c20001a..fea6959f 100644
--- a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
+++ b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
@@ -1,11 +1,9 @@
 package com.juick.ws.configuration;
 
-import com.juick.configuration.DataConfiguration;
 import com.juick.ws.WebsocketComponent;
 import com.juick.ws.XMPPConnection;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.web.socket.config.annotation.EnableWebSocket;
@@ -22,7 +20,6 @@ import javax.inject.Inject;
 @Configuration
 @EnableWebSocket
 @PropertySource("classpath:juick.conf")
-@Import(DataConfiguration.class)
 class WebsocketConfiguration implements WebSocketConfigurer {
     @Inject
     private Environment env;
diff --git a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java
index a754f1a9..bbbcc6a4 100644
--- a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java
+++ b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java
@@ -13,7 +13,7 @@ public class WebsocketInitializer extends AbstractAnnotationConfigDispatcherServ
 
     @Override
     protected Class<?>[] getRootConfigClasses() {
-        return new Class<?>[]{WebsocketConfiguration.class};
+        return new Class<?>[]{WebsocketConfiguration.class, DataConfiguration.class};
     }
 
     @Override
-- 
cgit v1.2.3