From 3c037e00d89a4ad5d0df57b3216857237ab81886 Mon Sep 17 00:00:00 2001
From: Alexander Alexeev
Date: Sat, 26 Nov 2016 04:24:14 +0700
Subject: api configuration

---
 .../main/java/com/juick/api/configuration/ApiInitializer.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'juick-api/src/main/java/com/juick/api/configuration/ApiInitializer.java')

diff --git a/juick-api/src/main/java/com/juick/api/configuration/ApiInitializer.java b/juick-api/src/main/java/com/juick/api/configuration/ApiInitializer.java
index 2dc25e66..63ba52e8 100644
--- a/juick-api/src/main/java/com/juick/api/configuration/ApiInitializer.java
+++ b/juick-api/src/main/java/com/juick/api/configuration/ApiInitializer.java
@@ -1,5 +1,7 @@
 package com.juick.api.configuration;
 
+import com.juick.configuration.DataConfiguration;
+import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer;
 import org.springframework.web.filter.CharacterEncodingFilter;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
@@ -12,12 +14,12 @@ public class ApiInitializer extends AbstractAnnotationConfigDispatcherServletIni
 
     @Override
     protected Class<?>[] getRootConfigClasses() {
-        return new Class<?>[]{ApiAppConfiguration.class};
+        return new Class<?>[]{ApiAppConfiguration.class, ApiSecurityConfig.class, DataConfiguration.class};
     }
 
     @Override
     protected Class<?>[] getServletConfigClasses() {
-        return new Class<?>[]{ApiMvcConfiguration.class, ApiSecurityConfig.class};
+        return new Class<?>[]{ApiMvcConfiguration.class};
     }
 
     @Override
@@ -27,9 +29,7 @@ public class ApiInitializer extends AbstractAnnotationConfigDispatcherServletIni
 
     @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