From 0ebdbec5743df42c1164ab54e27801b09f36ee5c Mon Sep 17 00:00:00 2001
From: Konstantinos Triantafyllou <k.triantafyllou@di.uoa.gr>
Date: Tue, 8 Dec 2020 09:43:21 +0000
Subject: [PATCH] [User | Trunk]: Change UTF-8 filter with spring filter

---
 .../usermanagement/RegisterServlet.java       |  2 +-
 .../utils/CharacterSetFilter.java             | 27 -------------------
 src/main/webapp/WEB-INF/web.xml               | 14 +++++++---
 3 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 src/main/java/eu/dnetlib/openaire/usermanagement/utils/CharacterSetFilter.java

diff --git a/src/main/java/eu/dnetlib/openaire/usermanagement/RegisterServlet.java b/src/main/java/eu/dnetlib/openaire/usermanagement/RegisterServlet.java
index 7cffc71..92a6695 100644
--- a/src/main/java/eu/dnetlib/openaire/usermanagement/RegisterServlet.java
+++ b/src/main/java/eu/dnetlib/openaire/usermanagement/RegisterServlet.java
@@ -50,7 +50,7 @@ public class RegisterServlet extends HttpServlet {
 
     private static Logger logger = Logger.getLogger(RegisterServlet.class);
 
-        @Override
+    @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.setContentType("text/html");
         PrintWriter printWriter = response.getWriter();
diff --git a/src/main/java/eu/dnetlib/openaire/usermanagement/utils/CharacterSetFilter.java b/src/main/java/eu/dnetlib/openaire/usermanagement/utils/CharacterSetFilter.java
deleted file mode 100644
index 76b24cb..0000000
--- a/src/main/java/eu/dnetlib/openaire/usermanagement/utils/CharacterSetFilter.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package eu.dnetlib.openaire.usermanagement.utils;
-
-import javax.servlet.*;
-import java.io.IOException;
-
-public class CharacterSetFilter implements Filter {
-
-    @Override
-    public void init(FilterConfig filterConfig) throws ServletException {
-
-    }
-
-    public void doFilter(
-            ServletRequest request,
-            ServletResponse response,
-            FilterChain next) throws IOException, ServletException {
-        request.setCharacterEncoding("UTF-8");
-        response.setContentType("text/html; charset=UTF-8");
-        response.setCharacterEncoding("UTF-8");
-        next.doFilter(request, response);
-    }
-
-    @Override
-    public void destroy() {
-
-    }
-}
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index c6565e1..9f4364c 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -20,12 +20,20 @@
     </listener>
 
     <filter>
-        <filter-name>CharacterSetFilter</filter-name>
-        <filter-class>eu.dnetlib.openaire.usermanagement.utils.CharacterSetFilter</filter-class>
+        <filter-name>encodingFilter</filter-name>
+        <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+        <init-param>
+            <param-name>encoding</param-name>
+            <param-value>UTF-8</param-value>
+        </init-param>
+        <init-param>
+            <param-name>forceEncoding</param-name>
+            <param-value>true</param-value>
+        </init-param>
     </filter>
 
     <filter-mapping>
-        <filter-name>CharacterSetFilter</filter-name>
+        <filter-name>encodingFilter</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
     <servlet>