diff --git a/spring-security-modules/spring-security-web-mvc-custom/pom.xml b/spring-security-modules/spring-security-web-mvc-custom/pom.xml index 539f83d7b8..533a1bf83d 100644 --- a/spring-security-modules/spring-security-web-mvc-custom/pom.xml +++ b/spring-security-modules/spring-security-web-mvc-custom/pom.xml @@ -175,6 +175,7 @@ 19.0 + 3.2.2 1.6.1 diff --git a/spring-security-modules/spring-security-web-mvc-custom/src/main/java/com/baeldung/web/interceptor/LoggerInterceptor.java b/spring-security-modules/spring-security-web-mvc-custom/src/main/java/com/baeldung/web/interceptor/LoggerInterceptor.java index b54fda5a82..669e4cb3c5 100644 --- a/spring-security-modules/spring-security-web-mvc-custom/src/main/java/com/baeldung/web/interceptor/LoggerInterceptor.java +++ b/spring-security-modules/spring-security-web-mvc-custom/src/main/java/com/baeldung/web/interceptor/LoggerInterceptor.java @@ -1,16 +1,18 @@ package com.baeldung.web.interceptor; -import com.google.common.base.Strings; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; +import java.util.Enumeration; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Enumeration; -public class LoggerInterceptor extends HandlerInterceptorAdapter { +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.ModelAndView; + +import com.google.common.base.Strings; + +public class LoggerInterceptor implements HandlerInterceptor { private static Logger log = LoggerFactory.getLogger(LoggerInterceptor.class); @@ -50,7 +52,8 @@ public class LoggerInterceptor extends HandlerInterceptorAdapter { if (posted.length() > 1) posted.append("&"); final String curr = (String) e.nextElement(); - posted.append(curr).append("="); + posted.append(curr) + .append("="); if (curr.contains("password") || curr.contains("answer") || curr.contains("pwd")) { posted.append("*****"); } else { diff --git a/spring-security-modules/spring-security-web-mvc-custom/src/main/java/com/baeldung/web/interceptor/SessionTimerInterceptor.java b/spring-security-modules/spring-security-web-mvc-custom/src/main/java/com/baeldung/web/interceptor/SessionTimerInterceptor.java index 38e852305c..e7decc262f 100644 --- a/spring-security-modules/spring-security-web-mvc-custom/src/main/java/com/baeldung/web/interceptor/SessionTimerInterceptor.java +++ b/spring-security-modules/spring-security-web-mvc-custom/src/main/java/com/baeldung/web/interceptor/SessionTimerInterceptor.java @@ -8,10 +8,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; -public class SessionTimerInterceptor extends HandlerInterceptorAdapter { +public class SessionTimerInterceptor implements HandlerInterceptor { private static Logger log = LoggerFactory.getLogger(SessionTimerInterceptor.class); @@ -30,7 +30,8 @@ public class SessionTimerInterceptor extends HandlerInterceptorAdapter { request.setAttribute("executionTime", startTime); if (UserInterceptor.isUserLogged()) { session = request.getSession(); - log.info("Time since last request in this session: {} ms", System.currentTimeMillis() - request.getSession().getLastAccessedTime()); + log.info("Time since last request in this session: {} ms", System.currentTimeMillis() - request.getSession() + .getLastAccessedTime()); if (System.currentTimeMillis() - session.getLastAccessedTime() > MAX_INACTIVE_SESSION_TIME) { log.warn("Logging out, due to inactive session"); SecurityContextHolder.clearContext(); diff --git a/spring-security-modules/spring-security-web-mvc-custom/src/main/java/com/baeldung/web/interceptor/UserInterceptor.java b/spring-security-modules/spring-security-web-mvc-custom/src/main/java/com/baeldung/web/interceptor/UserInterceptor.java index cd64a20842..ad80571be6 100644 --- a/spring-security-modules/spring-security-web-mvc-custom/src/main/java/com/baeldung/web/interceptor/UserInterceptor.java +++ b/spring-security-modules/spring-security-web-mvc-custom/src/main/java/com/baeldung/web/interceptor/UserInterceptor.java @@ -1,18 +1,18 @@ package com.baeldung.web.interceptor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.SmartView; -import org.springframework.web.servlet.View; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -public class UserInterceptor extends HandlerInterceptorAdapter { +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.SmartView; +import org.springframework.web.servlet.View; + +public class UserInterceptor implements HandlerInterceptor { private static Logger log = LoggerFactory.getLogger(UserInterceptor.class); @@ -44,7 +44,9 @@ public class UserInterceptor extends HandlerInterceptorAdapter { */ private void addToModelUserDetails(HttpSession session) { log.info("================= addToModelUserDetails ============================"); - String loggedUsername = SecurityContextHolder.getContext().getAuthentication().getName(); + String loggedUsername = SecurityContextHolder.getContext() + .getAuthentication() + .getName(); session.setAttribute("username", loggedUsername); log.info("user(" + loggedUsername + ") session : " + session); log.info("================= addToModelUserDetails ============================"); @@ -56,7 +58,9 @@ public class UserInterceptor extends HandlerInterceptorAdapter { */ private void addToModelUserDetails(ModelAndView model) { log.info("================= addToModelUserDetails ============================"); - String loggedUsername = SecurityContextHolder.getContext().getAuthentication().getName(); + String loggedUsername = SecurityContextHolder.getContext() + .getAuthentication() + .getName(); model.addObject("loggedUsername", loggedUsername); log.trace("session : " + model.getModel()); log.info("================= addToModelUserDetails ============================"); @@ -76,7 +80,10 @@ public class UserInterceptor extends HandlerInterceptorAdapter { public static boolean isUserLogged() { try { - return !SecurityContextHolder.getContext().getAuthentication().getName().equals("anonymousUser"); + return !SecurityContextHolder.getContext() + .getAuthentication() + .getName() + .equals("anonymousUser"); } catch (Exception e) { return false; }