diff options
author | Alexander Alexeev | 2016-11-11 01:29:01 +0700 |
---|---|---|
committer | Vitaly Takmazov | 2016-11-11 17:27:58 +0300 |
commit | 6604dc96558028c0095f33eca1852de5e61f8466 (patch) | |
tree | 5da1118a468d7142250112ee83f81b5849accdf0 /juick-ws/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java | |
parent | 9077e9f21d785a6507aeb79d04faca2107aa80e4 (diff) |
common data configuration is added
Diffstat (limited to 'juick-ws/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java')
-rw-r--r-- | juick-ws/src/main/java/com/juick/ws/configuration/WebsocketInitializer.java | 13 |
1 files changed, 7 insertions, 6 deletions
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 89017f8b..4829710f 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 @@ -1,4 +1,6 @@ package com.juick.ws.configuration; + +import com.juick.configuration.DataConfiguration; import org.springframework.web.filter.CharacterEncodingFilter; import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer; @@ -10,24 +12,23 @@ import javax.servlet.Filter; public class WebsocketInitializer extends AbstractAnnotationConfigDispatcherServletInitializer { @Override protected Class<?>[] getRootConfigClasses() { - return new Class[] {WebsocketConfiguration.class}; + return new Class[]{DataConfiguration.class}; } @Override protected Class<?>[] getServletConfigClasses() { - return null; + return new Class[]{WebsocketConfiguration.class}; } @Override protected String[] getServletMappings() { - return new String[] { - "/" - }; + return new String[]{"/"}; } + @Override protected Filter[] getServletFilters() { CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter(); characterEncodingFilter.setEncoding("UTF-8"); - return new Filter[] { characterEncodingFilter}; + return new Filter[]{characterEncodingFilter}; } } |