Add interceptor

gkislin@yandex.ru · gkislin@yandex.ru · commit a7f9495417a5 · 2015-04-30T22:16:27.000+03:00
Correct header
Correct styles
diff --git a/src/main/java/ru/javawebinar/topjava/LoggedUser.java b/src/main/java/ru/javawebinar/topjava/LoggedUser.java
@@ -38,6 +38,10 @@ public static LoggedUser get() {
         return user;
     }
 
+    public User getUser() {
+        return user;
+    }
+
     public static int id() {
         return get().user.getId();
     }
diff --git a/src/main/java/ru/javawebinar/topjava/web/interceptor/ModelInterceptor.java b/src/main/java/ru/javawebinar/topjava/web/interceptor/ModelInterceptor.java
@@ -0,0 +1,24 @@
+package ru.javawebinar.topjava.web.interceptor;
+
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+import ru.javawebinar.topjava.LoggedUser;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * This interceptor adds the user to the model of every requests managed
+ */
+public class ModelInterceptor extends HandlerInterceptorAdapter {
+
+    @Override
+    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
+        if (modelAndView != null && !modelAndView.isEmpty() && modelAndView.getModelMap().get("user") == null) {
+            LoggedUser loggedUser = LoggedUser.safeGet();
+            if (loggedUser != null) {
+                modelAndView.getModelMap().addAttribute("user", loggedUser.getUser());
+            }
+        }
+    }
+}
diff --git a/src/main/resources/spring/spring-mvc.xml b/src/main/resources/spring/spring-mvc.xml
@@ -15,6 +15,9 @@
     <!-- serve static resources (*.html, ...) from src/main/webapp/ -->
     <mvc:default-servlet-handler/>
 
+    <mvc:interceptors>
+        <bean class="ru.javawebinar.topjava.web.interceptor.ModelInterceptor"/>
+    </mvc:interceptors>
 
     <mvc:annotation-driven conversion-service="conversionService">
         <mvc:message-converters>
diff --git a/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp b/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp
@@ -20,7 +20,7 @@
                     <sec:authorize access="hasRole('ROLE_ADMIN')">
                         <a class="btn btn-info" role="button" href="users"><fmt:message key="users.title"/></a>
                     </sec:authorize>
-                    <%--<a class="btn btn-info" role="button" href="profile">${user.getName()} profile</a>--%>
+                    <a class="btn btn-info" role="button" href="profile">${user.name} profile</a>
                     <a class="btn btn-primary" role="button" href="logout">Logout</a>
                 </sec:authorize>
             </form>
diff --git a/src/main/webapp/resources/css/style.css b/src/main/webapp/resources/css/style.css
@@ -6,3 +6,19 @@
     margin-right: auto;
     padding: 15px;
 }
+.error, .message {
+    padding: 10px;
+    margin-bottom: 20px;
+    border-radius: 4px;
+    font-size: 16px;
+}
+.error {
+    color: #a94442;
+    background-color: #f2dede;
+    border: 1px solid #ebccd1;
+}
+.message {
+    color: #2f9635;
+    background-color: #c6fbc2;
+    border: 1px solid #9feba6;
+}

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,10 @@ public static LoggedUser get() {`
`38`	`38`	`return user;`
`39`	`39`	`}`
`40`	`40`
	`41`	`+ public User getUser() {`
	`42`	`+ return user;`
	`43`	`+ }`
	`44`	`+`
`41`	`45`	`public static int id() {`
`42`	`46`	`return get().user.getId();`
`43`	`47`	`}`