diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/util/MockServletRequest.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/util/MockServletRequest.java
index 02f9ecd10..5f9464638 100644
--- a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/util/MockServletRequest.java
+++ b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/util/MockServletRequest.java
@@ -36,6 +36,8 @@ public class MockServletRequest implements HttpServletRequest {
 
 	private Map<String, String> parameters = new HashMap<>();
 
+	private Map<String, Object> attributes = new HashMap<>();
+
 	public MockServletRequest() {
 		super();
 	}
@@ -88,6 +90,7 @@ public Object getAttribute(String arg0) {
 		return null;
 	}
 
+	@SuppressWarnings("rawtypes")
 	@Override
 	public Enumeration getAttributeNames() {
 		return null;
@@ -217,58 +220,51 @@ public String getScheme() {
 
 	@Override
 	public String getServerName() {
-
 		return null;
 	}
 
 	@Override
 	public int getServerPort() {
-
 		return 0;
 	}
 
 	@Override
 	public boolean isSecure() {
-
 		return false;
 	}
 
 	@Override
-	public void removeAttribute(String arg0) {
-
+	public void removeAttribute(String attribute) {
+		attributes.remove(attribute);
 	}
 
 	@Override
-	public void setAttribute(String arg0, Object arg1) {
-
+	public void setAttribute(String attribute, Object value) {
+		attributes.put(attribute, value);
 	}
 
 	@Override
-	public void setCharacterEncoding(String arg0) throws UnsupportedEncodingException {
-
+	public void setCharacterEncoding(String encofing) throws UnsupportedEncodingException {
+		// Nothing to do
 	}
 
 	@Override
 	public String getAuthType() {
-
 		return null;
 	}
 
 	@Override
 	public String getContextPath() {
-
 		return null;
 	}
 
 	@Override
 	public Cookie[] getCookies() {
-
 		return null;
 	}
 
 	@Override
 	public long getDateHeader(String arg0) {
-
 		return 0;
 	}
 
@@ -280,27 +276,25 @@ public String getHeader(String header) {
 			return null;
 	}
 
+	@SuppressWarnings("rawtypes")
 	@Override
 	public Enumeration getHeaderNames() {
-
 		return null;
 	}
 
+	@SuppressWarnings("rawtypes")
 	@Override
 	public Enumeration getHeaders(String arg0) {
-
 		return null;
 	}
 
 	@Override
 	public int getIntHeader(String arg0) {
-
 		return 0;
 	}
 
 	@Override
 	public String getMethod() {
-
 		return null;
 	}
 
@@ -311,31 +305,26 @@ public String getPathInfo() {
 
 	@Override
 	public String getPathTranslated() {
-
 		return null;
 	}
 
 	@Override
 	public String getQueryString() {
-
 		return null;
 	}
 
 	@Override
 	public String getRemoteUser() {
-
 		return null;
 	}
 
 	@Override
 	public String getRequestURI() {
-
 		return null;
 	}
 
 	@Override
 	public StringBuffer getRequestURL() {
-
 		return null;
 	}
 
@@ -363,38 +352,31 @@ public HttpSession getSession(boolean arg0) {
 
 	@Override
 	public Principal getUserPrincipal() {
-
 		return null;
 	}
 
 	@Override
 	public boolean isRequestedSessionIdFromCookie() {
-
 		return false;
 	}
 
 	@Override
 	public boolean isRequestedSessionIdFromURL() {
-
 		return false;
 	}
 
 	@Override
 	public boolean isRequestedSessionIdFromUrl() {
-
 		return false;
 	}
 
 	@Override
 	public boolean isRequestedSessionIdValid() {
-
 		return false;
 	}
 
 	@Override
 	public boolean isUserInRole(String arg0) {
-
 		return false;
 	}
-
-}
+}
\ No newline at end of file
diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/util/MockServletResponse.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/util/MockServletResponse.java
index 3f15597a2..37f787394 100644
--- a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/util/MockServletResponse.java
+++ b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/util/MockServletResponse.java
@@ -82,57 +82,57 @@ public boolean isCommitted() {
 
 	@Override
 	public void reset() {
-
+// Nothing to do
 	}
 
 	@Override
 	public void resetBuffer() {
-
+		// Nothing to do
 	}
 
 	@Override
 	public void setBufferSize(int arg0) {
-
+		// Nothing to do
 	}
 
 	@Override
 	public void setCharacterEncoding(String arg0) {
-
+		// Nothing to do
 	}
 
 	@Override
 	public void setContentLength(int arg0) {
-
+		// Nothing to do
 	}
 
 	@Override
 	public void setContentType(String arg0) {
-
+		// Nothing to do
 	}
 
 	@Override
 	public void setLocale(Locale arg0) {
-
+		// Nothing to do
 	}
 
 	@Override
 	public void addCookie(Cookie arg0) {
-
+		// Nothing to do
 	}
 
 	@Override
 	public void addDateHeader(String arg0, long arg1) {
-
+		// Nothing to do
 	}
 
 	@Override
 	public void addHeader(String arg0, String arg1) {
-
+		// Nothing to do
 	}
 
 	@Override
 	public void addIntHeader(String arg0, int arg1) {
-
+		// Nothing to do
 	}
 
 	@Override
@@ -162,42 +162,42 @@ public String encodeUrl(String arg0) {
 
 	@Override
 	public void sendError(int arg0) throws IOException {
-
+		// Nothing to do
 	}
 
 	@Override
 	public void sendError(int arg0, String arg1) throws IOException {
-
+		// Nothing to do
 	}
 
 	@Override
 	public void sendRedirect(String arg0) throws IOException {
-
+		// Nothing to do
 	}
 
 	@Override
 	public void setDateHeader(String arg0, long arg1) {
-
+		// Nothing to do
 	}
 
 	@Override
 	public void setHeader(String arg0, String arg1) {
-
+		// Nothing to do
 	}
 
 	@Override
 	public void setIntHeader(String arg0, int arg1) {
-
+		// Nothing to do
 	}
 
 	@Override
 	public void setStatus(int arg0) {
-
+		// Nothing to do
 	}
 
 	@Override
 	public void setStatus(int arg0, String arg1) {
-
+		// Nothing to do
 	}
 
 	public String getOutputString() throws IOException {
@@ -206,4 +206,4 @@ public String getOutputString() throws IOException {
 		else
 			return "";
 	}
-}
+}
\ No newline at end of file
diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/util/MockServletSession.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/util/MockServletSession.java
index 384138423..30db62fbd 100644
--- a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/util/MockServletSession.java
+++ b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/util/MockServletSession.java
@@ -15,6 +15,7 @@
  * @author Marco Meschieri - LogicalDOC
  * @since 8.3.3
  */
+@SuppressWarnings("deprecation")
 public class MockServletSession implements HttpSession {
 
 	private Map<String, Object> attributes = new HashMap<>();