diff --git a/spring-rest/src/main/java/org/baeldung/web/controller/redirect/RedirectController.java b/spring-rest/src/main/java/org/baeldung/web/controller/redirect/RedirectController.java
index db83495c6f..1b87ab2816 100644
--- a/spring-rest/src/main/java/org/baeldung/web/controller/redirect/RedirectController.java
+++ b/spring-rest/src/main/java/org/baeldung/web/controller/redirect/RedirectController.java
@@ -38,14 +38,15 @@ public class RedirectController {
 		return new RedirectView("redirectedUrl");
 	}
 
-	@RequestMapping(value = "/redirectWithForwardPrefix", method = RequestMethod.GET)
-	public ModelAndView redirectWithUsingForwardPrefix(final ModelMap model) {
+	@RequestMapping(value = "/forwardWithForwardPrefix", method = RequestMethod.GET)
+	public ModelAndView forwardWithUsingForwardPrefix(final ModelMap model) {
 		model.addAttribute("attribute", "redirectWithForwardPrefix");
 		return new ModelAndView("forward:/redirectedUrl", model);
 	}
 
 	@RequestMapping(value = "/redirectedUrl", method = RequestMethod.GET)
-	public ModelAndView redirection(final ModelMap model, @ModelAttribute("flashAttribute") final Object flashAttribute) {
+	public ModelAndView redirection(final ModelMap model,
+			@ModelAttribute("flashAttribute") final Object flashAttribute) {
 		model.addAttribute("redirectionAttribute", flashAttribute);
 		return new ModelAndView("redirection", model);
 	}
diff --git a/spring-rest/src/main/webapp/WEB-INF/api-servlet.xml b/spring-rest/src/main/webapp/WEB-INF/api-servlet.xml
index 2e01bb636b..9bcff1dfe3 100644
--- a/spring-rest/src/main/webapp/WEB-INF/api-servlet.xml
+++ b/spring-rest/src/main/webapp/WEB-INF/api-servlet.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd">
 
-    <context:component-scan base-package="org.baeldung.web" />
+	<context:component-scan base-package="org.baeldung.web" />
+
+	<mvc:annotation-driven />
 
-    <mvc:annotation-driven />
-    
 	<bean
 		class="org.springframework.web.servlet.view.InternalResourceViewResolver" />
 	<bean class="org.springframework.web.servlet.view.XmlViewResolver">
@@ -14,15 +17,15 @@
 		<property name="order" value="0" />
 	</bean>
 
-    <bean id="multipartResolver"
-        class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
-        <!-- max upload size in bytes -->
-        <property name="maxUploadSize" value="20971520" /> <!-- 20MB -->
-         
-        <!-- max size of file in memory (in bytes) -->
-        <property name="maxInMemorySize" value="1048576" /> <!-- 1MB -->
- 
-    </bean>
-    
-    
+	<bean id="multipartResolver"
+		class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
+		<!-- max upload size in bytes -->
+		<property name="maxUploadSize" value="20971520" /> <!-- 20MB -->
+
+		<!-- max size of file in memory (in bytes) -->
+		<property name="maxInMemorySize" value="1048576" /> <!-- 1MB -->
+
+	</bean>
+
+
 </beans>
\ No newline at end of file
diff --git a/spring-rest/src/test/java/org/baeldung/web/controller/redirect/RedirectControllerTest.java b/spring-rest/src/test/java/org/baeldung/web/controller/redirect/RedirectControllerTest.java
index 12ac394f90..c1ce21bef1 100644
--- a/spring-rest/src/test/java/org/baeldung/web/controller/redirect/RedirectControllerTest.java
+++ b/spring-rest/src/test/java/org/baeldung/web/controller/redirect/RedirectControllerTest.java
@@ -46,26 +46,36 @@ public class RedirectControllerTest {
 
 	@Test
 	public void whenRedirectOnUrlWithUsingRedirectPrefix_thenStatusRedirectionAndRedirectedOnUrl() throws Exception {
-		mockMvc.perform(get("/redirectWithRedirectPrefix")).andExpect(status().is3xxRedirection()).andExpect(view().name("redirect:/redirectedUrl")).andExpect(model().attribute("attribute", is("redirectWithRedirectPrefix")))
+		mockMvc.perform(get("/redirectWithRedirectPrefix")).andExpect(status().is3xxRedirection())
+		.andExpect(view().name("redirect:/redirectedUrl"))
+		.andExpect(model().attribute("attribute", is("redirectWithRedirectPrefix")))
 		.andExpect(redirectedUrl("/redirectedUrl?attribute=redirectWithRedirectPrefix"));
 	}
 
 	@Test
-	public void whenRedirectOnUrlWithUsingRedirectAttributes_thenStatusRedirectionAndRedirectedOnUrlAndAddedAttributeToFlashScope() throws Exception {
-		mockMvc.perform(get("/redirectWithRedirectAttributes")).andExpect(status().is3xxRedirection()).andExpect(flash().attribute("flashAttribute", is("redirectWithRedirectAttributes")))
+	public void whenRedirectOnUrlWithUsingRedirectAttributes_thenStatusRedirectionAndRedirectedOnUrlAndAddedAttributeToFlashScope()
+			throws Exception {
+		mockMvc.perform(get("/redirectWithRedirectAttributes")).andExpect(status().is3xxRedirection())
+		.andExpect(flash().attribute("flashAttribute", is("redirectWithRedirectAttributes")))
 		.andExpect(model().attribute("attribute", is("redirectWithRedirectAttributes")))
 		.andExpect(model().attribute("flashAttribute", is(nullValue())))
 		.andExpect(redirectedUrl("redirectedUrl?attribute=redirectWithRedirectAttributes"));
 	}
 
 	@Test
-	public void whenRedirectOnUrlWithUsingRedirectView_thenStatusRedirectionAndRedirectedOnUrlAndAddedAttributeToFlashScope() throws Exception {
-		mockMvc.perform(get("/redirectWithRedirectView")).andExpect(status().is3xxRedirection()).andExpect(model().attribute("attribute", is("redirectWithRedirectView"))).andExpect(redirectedUrl("redirectedUrl?attribute=redirectWithRedirectView"));
+	public void whenRedirectOnUrlWithUsingRedirectView_thenStatusRedirectionAndRedirectedOnUrlAndAddedAttributeToFlashScope()
+			throws Exception {
+		mockMvc.perform(get("/redirectWithRedirectView")).andExpect(status().is3xxRedirection())
+		.andExpect(model().attribute("attribute", is("redirectWithRedirectView")))
+		.andExpect(redirectedUrl("redirectedUrl?attribute=redirectWithRedirectView"));
 	}
 
 	@Test
 	public void whenRedirectOnUrlWithUsingForwardPrefix_thenStatusOkAndForwardedOnUrl() throws Exception {
-		mockMvc.perform(get("/redirectWithForwardPrefix")).andExpect(status().isOk()).andExpect(view().name("forward:/redirectedUrl")).andExpect(model().attribute("attribute", is("redirectWithForwardPrefix"))).andExpect(forwardedUrl("/redirectedUrl"));
+		mockMvc.perform(get("/forwardWithForwardPrefix")).andExpect(status().isOk())
+		.andExpect(view().name("forward:/redirectedUrl"))
+		.andExpect(model().attribute("attribute", is("redirectWithForwardPrefix")))
+		.andExpect(forwardedUrl("/redirectedUrl"));
 	}
 
 }