From d8f4849e84569436e36afb4c1e914b93d70370f7 Mon Sep 17 00:00:00 2001
From: Alexander Alexeev
Date: Thu, 24 Nov 2016 12:46:46 +0700
Subject: web socket configuration separated; header mapping fixed

---
 .../configuration/WebsocketMvcConfiguration.java   | 38 +++-------------------
 1 file changed, 5 insertions(+), 33 deletions(-)

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

diff --git a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketMvcConfiguration.java b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketMvcConfiguration.java
index 4ae0a04a..fc373359 100644
--- a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketMvcConfiguration.java
+++ b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketMvcConfiguration.java
@@ -2,30 +2,23 @@ package com.juick.ws.configuration;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
-import com.juick.configuration.DataConfiguration;
-import com.juick.ws.WebsocketComponent;
-import com.juick.ws.XMPPConnection;
 import com.mitchellbosecke.pebble.PebbleEngine;
 import com.mitchellbosecke.pebble.loader.Loader;
 import com.mitchellbosecke.pebble.loader.ServletLoader;
 import com.mitchellbosecke.pebble.spring4.PebbleViewResolver;
 import com.mitchellbosecke.pebble.spring4.extension.SpringExtension;
-import org.springframework.context.annotation.*;
-import org.springframework.core.env.Environment;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.servlet.ViewResolver;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
-import org.springframework.web.socket.config.annotation.EnableWebSocket;
-import org.springframework.web.socket.config.annotation.ServletWebSocketHandlerRegistry;
-import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
-import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
 
-import javax.inject.Inject;
 import java.util.List;
 
 /**
@@ -33,29 +26,8 @@ import java.util.List;
  */
 @Configuration
 @ComponentScan(basePackages = {"com.juick.ws.controllers"})
-@EnableWebSocket
 @PropertySource("classpath:juick.conf")
-public class WebsocketMvcConfiguration extends WebMvcConfigurationSupport  implements WebSocketConfigurer  {
-    @Inject
-    private Environment env;
-    @Inject
-    private JdbcTemplate jdbc;
-
-    @Bean
-    public WebsocketComponent wsHandler() {
-        return new WebsocketComponent(jdbc);
-    }
-
-    @Bean
-    public XMPPConnection ws() {
-        return new XMPPConnection(env, wsHandler(), jdbc);
-    }
-
-    @Override
-    public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-        ((ServletWebSocketHandlerRegistry) registry).setOrder(2);
-        registry.addHandler(wsHandler(), "/**").setAllowedOrigins("*");
-    }
+public class WebsocketMvcConfiguration extends WebMvcConfigurationSupport {
 
     @Bean
     public Loader templateLoader() {
-- 
cgit v1.2.3