Applied patch - 7_03_HW6_fix_relative_url_utf8

devalkone · devalkone · commit 9c02e71f6358 · 2019-11-28T20:17:29.000+03:00
diff --git a/src/main/java/ru/javawebinar/topjava/web/meal/JspMealController.java b/src/main/java/ru/javawebinar/topjava/web/meal/JspMealController.java
@@ -24,7 +24,7 @@ public class JspMealController extends AbstractMealController {
     @GetMapping("/delete")
     public String delete(HttpServletRequest request) {
         super.delete(getId(request));
-        return "redirect:meals";
+        return "redirect:/meals";
     }
 
     @GetMapping("/update")
@@ -50,7 +50,7 @@ public String updateOrCreate(HttpServletRequest request) {
         } else {
             super.update(meal, getId(request));
         }
-        return "redirect:meals";
+        return "redirect:/meals";
     }
 
     @GetMapping("/filter")
diff --git a/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp b/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp
@@ -5,5 +5,6 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title><spring:message code="app.title"/></title>
+    <base href="${pageContext.request.contextPath}/"/>
     <link rel="stylesheet" href="resources/css/style.css">
 </head>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
@@ -36,4 +36,21 @@
         <servlet-name>mvc-dispatcher</servlet-name>
         <url-pattern>/</url-pattern>
     </servlet-mapping>
+
+    <filter>
+        <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>encodingFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 </web-app>

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class JspMealController extends AbstractMealController {`
`24`	`24`	`@GetMapping("/delete")`
`25`	`25`	`public String delete(HttpServletRequest request) {`
`26`	`26`	`super.delete(getId(request));`
`27`		`- return "redirect:meals";`
	`27`	`+ return "redirect:/meals";`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@GetMapping("/update")`
`@@ -50,7 +50,7 @@ public String updateOrCreate(HttpServletRequest request) {`
`50`	`50`	`} else {`
`51`	`51`	`super.update(meal, getId(request));`
`52`	`52`	`}`
`53`		`- return "redirect:meals";`
	`53`	`+ return "redirect:/meals";`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@GetMapping("/filter")`