1 files changed, 18 insertions, 8 deletions
diff --git a/juick-spring-www/src/main/java/com/juick/www/configuration/WwwInitializer.java b/juick-spring-www/src/main/java/com/juick/www/configuration/WwwInitializer.java
index 852ec554..6b7b4ebc 100644
--- a/juick-spring-www/src/main/java/com/juick/www/configuration/WwwInitializer.java
+++ b/juick-spring-www/src/main/java/com/juick/www/configuration/WwwInitializer.java
@@ -6,6 +6,9 @@ import org.springframework.web.filter.CharacterEncodingFilter;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
 import javax.servlet.Filter;
+import javax.servlet.FilterRegistration;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
 
 /**
  * Created by aalexeev on 11/20/16.
@@ -14,7 +17,7 @@ public class WwwInitializer extends AbstractAnnotationConfigDispatcherServletIni
 
     @Override
     protected Class<?>[] getRootConfigClasses() {
-        return new Class<?>[]{DataConfiguration.class, SearchConfiguration.class};
+        return new Class<?>[]{DataConfiguration.class, SearchConfiguration.class, WebSecurityConfig.class};
     }
 
     @Override
@@ -28,16 +31,23 @@ public class WwwInitializer extends AbstractAnnotationConfigDispatcherServletIni
     }
 
     @Override
-    protected Filter[] getServletFilters() {
-        CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter();
-        characterEncodingFilter.setEncoding("UTF-8");
-
-        return new Filter[]{characterEncodingFilter};
+    protected String getServletName() {
+        return "WWW-spring dispatcher servlet";
     }
 
     @Override
-    protected String getServletName() {
-        return "WWW-spring dispatcher servlet";
+    public void onStartup(ServletContext servletContext) throws ServletException {
+        super.onStartup(servletContext);
+
+        CharacterEncodingFilter encodingFilter = new CharacterEncodingFilter();
+
+        encodingFilter.setEncoding("UTF-8");
+        encodingFilter.setForceEncoding(true);
+
+        FilterRegistration.Dynamic registration = servletContext.addFilter(
+                "encodingFilter",                new CharacterEncodingFilter());
+
+        registration.addMappingForUrlPatterns(null, true, "/*");
     }
 }