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

---
 .../main/java/com/juick/ws/configuration/WebsocketInitializer.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

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 785eefcf..751da635 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<?>[]{DataConfiguration.class};
+        return new Class<?>[]{DataConfiguration.class, WebsocketConfiguration.class};
     }
 
     @Override
@@ -28,9 +28,7 @@ public class WebsocketInitializer extends AbstractAnnotationConfigDispatcherServ
 
     @Override
     protected Filter[] getServletFilters() {
-        CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter();
-        characterEncodingFilter.setEncoding("UTF-8");
-        return new Filter[]{characterEncodingFilter};
+        return new Filter[]{new CharacterEncodingFilter("UTF-8")};
     }
 
     @Override
-- 
cgit v1.2.3