From 00dd88a0b8eb6be382c7dfdde874af87dc54b6c9 Mon Sep 17 00:00:00 2001
From: alex-semenyuk <alexemenyuk88@gmail.com>
Date: Mon, 20 Jul 2015 13:05:25 +0200
Subject: [PATCH 1/5] Redirect in Spring

---
 spring-rest/README.md                         |  2 +-
 .../redirect/RedirectController.java          | 52 ++++++++++++++++
 .../redirect/RedirectControllerTest.java      | 61 +++++++++++++++++++
 3 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 spring-rest/src/main/java/org/baeldung/web/controller/redirect/RedirectController.java
 create mode 100644 spring-rest/src/test/java/org/baeldung/web/controller/redirect/RedirectControllerTest.java

diff --git a/spring-rest/README.md b/spring-rest/README.md
index 5e0a62c3eb..3231d65625 100644
--- a/spring-rest/README.md
+++ b/spring-rest/README.md
@@ -6,4 +6,4 @@
 ### Relevant Articles: 
 - [Spring @RequestMapping](http://www.baeldung.com/spring-requestmapping)
 - [Http Message Converters with the Spring Framework](http://www.baeldung.com/spring-httpmessageconverter-rest)
-
+- [Redirect in Spring](http://www.baeldung.com/spring-redirect)
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
new file mode 100644
index 0000000000..e687f76e62
--- /dev/null
+++ b/spring-rest/src/main/java/org/baeldung/web/controller/redirect/RedirectController.java
@@ -0,0 +1,52 @@
+package org.baeldung.redirect;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import org.springframework.web.servlet.view.RedirectView;
+
+@Controller
+@RequestMapping("/")
+public class RedirectController {
+
+    @RequestMapping(value = "/redirectWithXMLConfig", method = RequestMethod.GET)
+    public ModelAndView redirectWithUsingXMLConfig(final ModelMap model) {
+        model.addAttribute("attribute", "redirectWithXMLConfig");
+        return new ModelAndView("RedirectedUrl", model);
+    }
+
+    @RequestMapping(value = "/redirectWithRedirectPrefix", method = RequestMethod.GET)
+    public ModelAndView redirectWithUsingRedirectPrefix(final ModelMap model) {
+        model.addAttribute("attribute", "redirectWithRedirectPrefix");
+        return new ModelAndView("redirect:/redirectedUrl", model);
+    }
+
+    @RequestMapping(value = "/redirectWithRedirectAttributes", method = RequestMethod.GET)
+    public RedirectView redirectWithRedirectAttributes(final RedirectAttributes redirectAttributes) {
+        redirectAttributes.addFlashAttribute("flashAttribute", "redirectWithRedirectAttributes");
+        redirectAttributes.addAttribute("attribute", "redirectWithRedirectAttributes");
+        return new RedirectView("redirectedUrl");
+    }
+
+    @RequestMapping(value = "/redirectWithRedirectView", method = RequestMethod.GET)
+    public RedirectView redirectWithUsingRedirectView(final ModelMap model) {
+        model.addAttribute("attribute", "redirectWithRedirectView");
+        return new RedirectView("redirectedUrl");
+    }
+
+    @RequestMapping(value = "/redirectWithForwardPrefix", method = RequestMethod.GET)
+    public ModelAndView redirectWithUsingForwardPrefix(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) {
+        model.addAttribute("redirectionAttribute", flashAttribute);
+        return new ModelAndView("redirection", model);
+    }
+}
\ 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
new file mode 100644
index 0000000000..9b16891336
--- /dev/null
+++ b/spring-rest/src/test/java/org/baeldung/web/controller/redirect/RedirectControllerTest.java
@@ -0,0 +1,61 @@
+package org.baeldung.redirect;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.web.context.WebApplicationContext;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration("file:src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml")
+public class RedirectControllerTest {
+
+    private MockMvc mockMvc;
+
+    @Autowired
+    protected WebApplicationContext wac;
+
+    @Before
+    public void setup() {
+        this.mockMvc = webAppContextSetup(this.wac).build();
+    }
+
+    @Test
+    public void whenRedirectOnUrlWithUsingXMLConfig_thenStatusRedirectionAndRedirectedOnUrl() throws Exception {
+        this.mockMvc.perform(get("/redirectWithXMLConfig")).andExpect(status().is3xxRedirection()).andExpect(view().name("RedirectedUrl")).andExpect(model().attribute("attribute", is("redirectWithXMLConfig")))
+                .andExpect(redirectedUrl("redirectedUrl?attribute=redirectWithXMLConfig"));
+    }
+
+    @Test
+    public void whenRedirectOnUrlWithUsingRedirectPrefix_thenStatusRedirectionAndRedirectedOnUrl() throws Exception {
+        this.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 {
+        this.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 {
+        this.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 {
+        this.mockMvc.perform(get("/redirectWithForwardPrefix")).andExpect(status().isOk()).andExpect(view().name("forward:/redirectedUrl")).andExpect(model().attribute("attribute", is("redirectWithForwardPrefix"))).andExpect(forwardedUrl("/redirectedUrl"));
+    }
+
+}

From c4bc953d1c1288c6bf634bdecc5b0cd2587e1742 Mon Sep 17 00:00:00 2001
From: alex-semenyuk <alexemenyuk88@gmail.com>
Date: Tue, 21 Jul 2015 13:06:14 +0200
Subject: [PATCH 2/5] Fix issues with tests.

---
 spring-rest/pom.xml                           | 11 ++-
 .../redirect/RedirectController.java          | 64 +++++++--------
 .../src/main/webapp/WEB-INF/api-servlet.xml   | 20 ++++-
 .../src/main/webapp/WEB-INF/spring-views.xml  | 10 +++
 .../redirect/RedirectControllerTest.java      | 82 +++++++++++--------
 5 files changed, 113 insertions(+), 74 deletions(-)
 create mode 100644 spring-rest/src/main/webapp/WEB-INF/spring-views.xml

diff --git a/spring-rest/pom.xml b/spring-rest/pom.xml
index 542fa1d025..ecfe1f40f0 100644
--- a/spring-rest/pom.xml
+++ b/spring-rest/pom.xml
@@ -153,6 +153,13 @@
 			<version>${mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
+		
+		<dependency>
+             <groupId>org.springframework</groupId> 
+             <artifactId>spring-test</artifactId> 
+             <version>${spring.version}</version> 
+        </dependency>
+		
 
 	</dependencies>
 
@@ -172,8 +179,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>${maven-compiler-plugin.version}</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 
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 e687f76e62..db83495c6f 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
@@ -1,4 +1,4 @@
-package org.baeldung.redirect;
+package org.baeldung.web.controller.redirect;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -13,40 +13,40 @@ import org.springframework.web.servlet.view.RedirectView;
 @RequestMapping("/")
 public class RedirectController {
 
-    @RequestMapping(value = "/redirectWithXMLConfig", method = RequestMethod.GET)
-    public ModelAndView redirectWithUsingXMLConfig(final ModelMap model) {
-        model.addAttribute("attribute", "redirectWithXMLConfig");
-        return new ModelAndView("RedirectedUrl", model);
-    }
+	@RequestMapping(value = "/redirectWithXMLConfig", method = RequestMethod.GET)
+	public ModelAndView redirectWithUsingXMLConfig(final ModelMap model) {
+		model.addAttribute("attribute", "redirectWithXMLConfig");
+		return new ModelAndView("RedirectedUrl", model);
+	}
 
-    @RequestMapping(value = "/redirectWithRedirectPrefix", method = RequestMethod.GET)
-    public ModelAndView redirectWithUsingRedirectPrefix(final ModelMap model) {
-        model.addAttribute("attribute", "redirectWithRedirectPrefix");
-        return new ModelAndView("redirect:/redirectedUrl", model);
-    }
+	@RequestMapping(value = "/redirectWithRedirectPrefix", method = RequestMethod.GET)
+	public ModelAndView redirectWithUsingRedirectPrefix(final ModelMap model) {
+		model.addAttribute("attribute", "redirectWithRedirectPrefix");
+		return new ModelAndView("redirect:/redirectedUrl", model);
+	}
 
-    @RequestMapping(value = "/redirectWithRedirectAttributes", method = RequestMethod.GET)
-    public RedirectView redirectWithRedirectAttributes(final RedirectAttributes redirectAttributes) {
-        redirectAttributes.addFlashAttribute("flashAttribute", "redirectWithRedirectAttributes");
-        redirectAttributes.addAttribute("attribute", "redirectWithRedirectAttributes");
-        return new RedirectView("redirectedUrl");
-    }
+	@RequestMapping(value = "/redirectWithRedirectAttributes", method = RequestMethod.GET)
+	public RedirectView redirectWithRedirectAttributes(final RedirectAttributes redirectAttributes) {
+		redirectAttributes.addFlashAttribute("flashAttribute", "redirectWithRedirectAttributes");
+		redirectAttributes.addAttribute("attribute", "redirectWithRedirectAttributes");
+		return new RedirectView("redirectedUrl");
+	}
 
-    @RequestMapping(value = "/redirectWithRedirectView", method = RequestMethod.GET)
-    public RedirectView redirectWithUsingRedirectView(final ModelMap model) {
-        model.addAttribute("attribute", "redirectWithRedirectView");
-        return new RedirectView("redirectedUrl");
-    }
+	@RequestMapping(value = "/redirectWithRedirectView", method = RequestMethod.GET)
+	public RedirectView redirectWithUsingRedirectView(final ModelMap model) {
+		model.addAttribute("attribute", "redirectWithRedirectView");
+		return new RedirectView("redirectedUrl");
+	}
 
-    @RequestMapping(value = "/redirectWithForwardPrefix", method = RequestMethod.GET)
-    public ModelAndView redirectWithUsingForwardPrefix(final ModelMap model) {
-        model.addAttribute("attribute", "redirectWithForwardPrefix");
-        return new ModelAndView("forward:/redirectedUrl", model);
-    }
+	@RequestMapping(value = "/redirectWithForwardPrefix", method = RequestMethod.GET)
+	public ModelAndView redirectWithUsingForwardPrefix(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) {
-        model.addAttribute("redirectionAttribute", flashAttribute);
-        return new ModelAndView("redirection", model);
-    }
+	@RequestMapping(value = "/redirectedUrl", method = RequestMethod.GET)
+	public ModelAndView redirection(final ModelMap model, @ModelAttribute("flashAttribute") final Object flashAttribute) {
+		model.addAttribute("redirectionAttribute", flashAttribute);
+		return new ModelAndView("redirection", model);
+	}
 }
\ No newline at end of file
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 acab871c88..2e01bb636b 100644
--- a/spring-rest/src/main/webapp/WEB-INF/api-servlet.xml
+++ b/spring-rest/src/main/webapp/WEB-INF/api-servlet.xml
@@ -1,9 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-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">
 
-<bean id="multipartResolver"
+    <context:component-scan base-package="org.baeldung.web" />
+
+    <mvc:annotation-driven />
+    
+	<bean
+		class="org.springframework.web.servlet.view.InternalResourceViewResolver" />
+	<bean class="org.springframework.web.servlet.view.XmlViewResolver">
+		<property name="location">
+			<value>/WEB-INF/spring-views.xml</value>
+		</property>
+		<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 -->
@@ -13,4 +24,5 @@
  
     </bean>
     
+    
 </beans>
\ No newline at end of file
diff --git a/spring-rest/src/main/webapp/WEB-INF/spring-views.xml b/spring-rest/src/main/webapp/WEB-INF/spring-views.xml
new file mode 100644
index 0000000000..83c7828d9a
--- /dev/null
+++ b/spring-rest/src/main/webapp/WEB-INF/spring-views.xml
@@ -0,0 +1,10 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans 
+	http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<bean id="RedirectedUrl" class="org.springframework.web.servlet.view.RedirectView">
+		<property name="url" value="redirectedUrl" />
+	</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 9b16891336..12ac394f90 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
@@ -1,9 +1,15 @@
-package org.baeldung.redirect;
+package org.baeldung.web.controller.redirect;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
-import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.flash;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -16,46 +22,50 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.context.WebApplicationContext;
 
 @RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("file:src/main/webapp/WEB-INF/api-servlet.xml")
 @WebAppConfiguration
-@ContextConfiguration("file:src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml")
 public class RedirectControllerTest {
 
-    private MockMvc mockMvc;
+	private MockMvc mockMvc;
 
-    @Autowired
-    protected WebApplicationContext wac;
+	@Autowired
+	protected WebApplicationContext wac;
 
-    @Before
-    public void setup() {
-        this.mockMvc = webAppContextSetup(this.wac).build();
-    }
+	@Before
+	public void setup() {
+		mockMvc = webAppContextSetup(wac).build();
+	}
 
-    @Test
-    public void whenRedirectOnUrlWithUsingXMLConfig_thenStatusRedirectionAndRedirectedOnUrl() throws Exception {
-        this.mockMvc.perform(get("/redirectWithXMLConfig")).andExpect(status().is3xxRedirection()).andExpect(view().name("RedirectedUrl")).andExpect(model().attribute("attribute", is("redirectWithXMLConfig")))
-                .andExpect(redirectedUrl("redirectedUrl?attribute=redirectWithXMLConfig"));
-    }
+	@Test
+	public void whenRedirectOnUrlWithUsingXMLConfig_thenStatusRedirectionAndRedirectedOnUrl() throws Exception {
+		mockMvc.perform(get("/redirectWithXMLConfig")).andExpect(status().is3xxRedirection())
+		.andExpect(view().name("RedirectedUrl"))
+		.andExpect(model().attribute("attribute", is("redirectWithXMLConfig")))
+		.andExpect(redirectedUrl("redirectedUrl?attribute=redirectWithXMLConfig"));
+	}
 
-    @Test
-    public void whenRedirectOnUrlWithUsingRedirectPrefix_thenStatusRedirectionAndRedirectedOnUrl() throws Exception {
-        this.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 whenRedirectOnUrlWithUsingRedirectPrefix_thenStatusRedirectionAndRedirectedOnUrl() throws Exception {
+		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 {
-        this.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 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 {
-        this.mockMvc.perform(get("/redirectWithRedirectView")).andExpect(status().is3xxRedirection()).andExpect(model().attribute("attribute", is("redirectWithRedirectView"))).andExpect(redirectedUrl("redirectedUrl?attribute=redirectWithRedirectView"));
-    }
+	@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"));
+	}
 
-    @Test
-    public void whenRedirectOnUrlWithUsingForwardPrefix_thenStatusOkAndForwardedOnUrl() throws Exception {
-        this.mockMvc.perform(get("/redirectWithForwardPrefix")).andExpect(status().isOk()).andExpect(view().name("forward:/redirectedUrl")).andExpect(model().attribute("attribute", is("redirectWithForwardPrefix"))).andExpect(forwardedUrl("/redirectedUrl"));
-    }
+	@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"));
+	}
 
 }

From 877b8d2987b962ba023d8391a47d6b4f1cfec919 Mon Sep 17 00:00:00 2001
From: alex-semenyuk <alexemenyuk88@gmail.com>
Date: Tue, 21 Jul 2015 15:07:32 +0200
Subject: [PATCH 3/5] Rename some urls.

---
 .../redirect/RedirectController.java          |  7 ++--
 .../src/main/webapp/WEB-INF/api-servlet.xml   | 33 ++++++++++---------
 .../redirect/RedirectControllerTest.java      | 22 +++++++++----
 3 files changed, 38 insertions(+), 24 deletions(-)

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"));
 	}
 
 }

From 23bf5a304249b438acf80ca30a0b2a9bf6c41648 Mon Sep 17 00:00:00 2001
From: alex-semenyuk <alexemenyuk88@gmail.com>
Date: Wed, 22 Jul 2015 22:22:39 +0200
Subject: [PATCH 4/5] Fix formatting files

---
 .../redirect/RedirectController.java          | 63 ++++++++--------
 .../src/main/webapp/WEB-INF/api-servlet.xml   | 46 ++++++------
 .../src/main/webapp/WEB-INF/spring-views.xml  | 14 ++--
 spring-rest/src/main/webapp/WEB-INF/web.xml   | 63 ++++++++--------
 .../redirect/RedirectControllerTest.java      | 74 ++++++++-----------
 5 files changed, 123 insertions(+), 137 deletions(-)

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 1b87ab2816..472c0c8bf5 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
@@ -13,41 +13,40 @@ import org.springframework.web.servlet.view.RedirectView;
 @RequestMapping("/")
 public class RedirectController {
 
-	@RequestMapping(value = "/redirectWithXMLConfig", method = RequestMethod.GET)
-	public ModelAndView redirectWithUsingXMLConfig(final ModelMap model) {
-		model.addAttribute("attribute", "redirectWithXMLConfig");
-		return new ModelAndView("RedirectedUrl", model);
-	}
+    @RequestMapping(value = "/redirectWithXMLConfig", method = RequestMethod.GET)
+    public ModelAndView redirectWithUsingXMLConfig(final ModelMap model) {
+        model.addAttribute("attribute", "redirectWithXMLConfig");
+        return new ModelAndView("RedirectedUrl", model);
+    }
 
-	@RequestMapping(value = "/redirectWithRedirectPrefix", method = RequestMethod.GET)
-	public ModelAndView redirectWithUsingRedirectPrefix(final ModelMap model) {
-		model.addAttribute("attribute", "redirectWithRedirectPrefix");
-		return new ModelAndView("redirect:/redirectedUrl", model);
-	}
+    @RequestMapping(value = "/redirectWithRedirectPrefix", method = RequestMethod.GET)
+    public ModelAndView redirectWithUsingRedirectPrefix(final ModelMap model) {
+        model.addAttribute("attribute", "redirectWithRedirectPrefix");
+        return new ModelAndView("redirect:/redirectedUrl", model);
+    }
 
-	@RequestMapping(value = "/redirectWithRedirectAttributes", method = RequestMethod.GET)
-	public RedirectView redirectWithRedirectAttributes(final RedirectAttributes redirectAttributes) {
-		redirectAttributes.addFlashAttribute("flashAttribute", "redirectWithRedirectAttributes");
-		redirectAttributes.addAttribute("attribute", "redirectWithRedirectAttributes");
-		return new RedirectView("redirectedUrl");
-	}
+    @RequestMapping(value = "/redirectWithRedirectAttributes", method = RequestMethod.GET)
+    public RedirectView redirectWithRedirectAttributes(final RedirectAttributes redirectAttributes) {
+        redirectAttributes.addFlashAttribute("flashAttribute", "redirectWithRedirectAttributes");
+        redirectAttributes.addAttribute("attribute", "redirectWithRedirectAttributes");
+        return new RedirectView("redirectedUrl");
+    }
 
-	@RequestMapping(value = "/redirectWithRedirectView", method = RequestMethod.GET)
-	public RedirectView redirectWithUsingRedirectView(final ModelMap model) {
-		model.addAttribute("attribute", "redirectWithRedirectView");
-		return new RedirectView("redirectedUrl");
-	}
+    @RequestMapping(value = "/redirectWithRedirectView", method = RequestMethod.GET)
+    public RedirectView redirectWithUsingRedirectView(final ModelMap model) {
+        model.addAttribute("attribute", "redirectWithRedirectView");
+        return new RedirectView("redirectedUrl");
+    }
 
-	@RequestMapping(value = "/forwardWithForwardPrefix", method = RequestMethod.GET)
-	public ModelAndView forwardWithUsingForwardPrefix(final ModelMap model) {
-		model.addAttribute("attribute", "redirectWithForwardPrefix");
-		return new ModelAndView("forward:/redirectedUrl", 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) {
-		model.addAttribute("redirectionAttribute", flashAttribute);
-		return new ModelAndView("redirection", model);
-	}
+    @RequestMapping(value = "/redirectedUrl", method = RequestMethod.GET)
+    public ModelAndView redirection(final ModelMap model, @ModelAttribute("flashAttribute") final Object flashAttribute) {
+        model.addAttribute("redirectionAttribute", flashAttribute);
+        return new ModelAndView("redirection", model);
+    }
 }
\ No newline at end of file
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 9bcff1dfe3..5afc637ece 100644
--- a/spring-rest/src/main/webapp/WEB-INF/api-servlet.xml
+++ b/spring-rest/src/main/webapp/WEB-INF/api-servlet.xml
@@ -1,31 +1,33 @@
 <?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">
-		<property name="location">
-			<value>/WEB-INF/spring-views.xml</value>
-		</property>
-		<property name="order" value="0" />
-	</bean>
+    <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver" />
+    <bean class="org.springframework.web.servlet.view.XmlViewResolver">
+        <property name="location">
+            <value>/WEB-INF/spring-views.xml</value>
+        </property>
+        <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 -->
+    <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 -->
+        <!-- max size of file in memory (in bytes) -->
+        <property name="maxInMemorySize" value="1048576" /> <!-- 1MB -->
 
-	</bean>
+    </bean>
+
+
+</beans>
 
 
-</beans>
\ No newline at end of file
diff --git a/spring-rest/src/main/webapp/WEB-INF/spring-views.xml b/spring-rest/src/main/webapp/WEB-INF/spring-views.xml
index 83c7828d9a..2944828d6d 100644
--- a/spring-rest/src/main/webapp/WEB-INF/spring-views.xml
+++ b/spring-rest/src/main/webapp/WEB-INF/spring-views.xml
@@ -1,10 +1,10 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans 
-	http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans 
+	http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
+>
 
-	<bean id="RedirectedUrl" class="org.springframework.web.servlet.view.RedirectView">
-		<property name="url" value="redirectedUrl" />
-	</bean>
+    <bean id="RedirectedUrl" class="org.springframework.web.servlet.view.RedirectView">
+        <property name="url" value="redirectedUrl" />
+    </bean>
 
 </beans>
\ No newline at end of file
diff --git a/spring-rest/src/main/webapp/WEB-INF/web.xml b/spring-rest/src/main/webapp/WEB-INF/web.xml
index 48d4b8fe61..c28bb9a20a 100644
--- a/spring-rest/src/main/webapp/WEB-INF/web.xml
+++ b/spring-rest/src/main/webapp/WEB-INF/web.xml
@@ -1,42 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	xsi:schemaLocation="
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+    xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	id="WebApp_ID" version="3.0">
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
+>
 
-	<display-name>Spring MVC Application</display-name>
+    <display-name>Spring MVC Application</display-name>
 
-	<!-- Spring root -->
-	<context-param>
-		<param-name>contextClass</param-name>
-		<param-value>
+    <!-- Spring root -->
+    <context-param>
+        <param-name>contextClass</param-name>
+        <param-value>
         	org.springframework.web.context.support.AnnotationConfigWebApplicationContext
       	</param-value>
-	</context-param>
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>org.baeldung.config</param-value>
-	</context-param>
+    </context-param>
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>org.baeldung.config</param-value>
+    </context-param>
 
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
 
-	<!-- Spring child -->
-	<servlet>
-		<servlet-name>api</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>api</servlet-name>
-		<url-pattern>/</url-pattern>
-	</servlet-mapping>
+    <!-- Spring child -->
+    <servlet>
+        <servlet-name>api</servlet-name>
+        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>api</servlet-name>
+        <url-pattern>/</url-pattern>
+    </servlet-mapping>
 
-	<welcome-file-list>
-		<welcome-file />
-	</welcome-file-list>
+    <welcome-file-list>
+        <welcome-file />
+    </welcome-file-list>
 
-</web-app>
\ No newline at end of file
+</web-app>
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 c1ce21bef1..ab2b9f3f87 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
@@ -26,56 +26,42 @@ import org.springframework.web.context.WebApplicationContext;
 @WebAppConfiguration
 public class RedirectControllerTest {
 
-	private MockMvc mockMvc;
+    private MockMvc mockMvc;
 
-	@Autowired
-	protected WebApplicationContext wac;
+    @Autowired
+    protected WebApplicationContext wac;
 
-	@Before
-	public void setup() {
-		mockMvc = webAppContextSetup(wac).build();
-	}
+    @Before
+    public void setup() {
+        mockMvc = webAppContextSetup(wac).build();
+    }
 
-	@Test
-	public void whenRedirectOnUrlWithUsingXMLConfig_thenStatusRedirectionAndRedirectedOnUrl() throws Exception {
-		mockMvc.perform(get("/redirectWithXMLConfig")).andExpect(status().is3xxRedirection())
-		.andExpect(view().name("RedirectedUrl"))
-		.andExpect(model().attribute("attribute", is("redirectWithXMLConfig")))
-		.andExpect(redirectedUrl("redirectedUrl?attribute=redirectWithXMLConfig"));
-	}
+    @Test
+    public void whenRedirectOnUrlWithUsingXMLConfig_thenStatusRedirectionAndRedirectedOnUrl() throws Exception {
+        mockMvc.perform(get("/redirectWithXMLConfig")).andExpect(status().is3xxRedirection()).andExpect(view().name("RedirectedUrl")).andExpect(model().attribute("attribute", is("redirectWithXMLConfig")))
+        .andExpect(redirectedUrl("redirectedUrl?attribute=redirectWithXMLConfig"));
+    }
 
-	@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")))
-		.andExpect(redirectedUrl("/redirectedUrl?attribute=redirectWithRedirectPrefix"));
-	}
+    @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")))
+        .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")))
-		.andExpect(model().attribute("attribute", is("redirectWithRedirectAttributes")))
-		.andExpect(model().attribute("flashAttribute", is(nullValue())))
-		.andExpect(redirectedUrl("redirectedUrl?attribute=redirectWithRedirectAttributes"));
-	}
+    @Test
+    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"));
-	}
+    @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"));
+    }
 
-	@Test
-	public void whenRedirectOnUrlWithUsingForwardPrefix_thenStatusOkAndForwardedOnUrl() throws Exception {
-		mockMvc.perform(get("/forwardWithForwardPrefix")).andExpect(status().isOk())
-		.andExpect(view().name("forward:/redirectedUrl"))
-		.andExpect(model().attribute("attribute", is("redirectWithForwardPrefix")))
-		.andExpect(forwardedUrl("/redirectedUrl"));
-	}
+    @Test
+    public void whenRedirectOnUrlWithUsingForwardPrefix_thenStatusOkAndForwardedOnUrl() throws Exception {
+        mockMvc.perform(get("/forwardWithForwardPrefix")).andExpect(status().isOk()).andExpect(view().name("forward:/redirectedUrl")).andExpect(model().attribute("attribute", is("redirectWithForwardPrefix"))).andExpect(forwardedUrl("/redirectedUrl"));
+    }
 
 }

From b3d9ada21eed404e90a4a2a7dc9acf9f940dcd16 Mon Sep 17 00:00:00 2001
From: alex-semenyuk <alexemenyuk88@gmail.com>
Date: Wed, 22 Jul 2015 23:01:00 +0200
Subject: [PATCH 5/5] Fix formatting for pom

---
 spring-rest/pom.xml | 493 ++++++++++++++++++++++----------------------
 1 file changed, 246 insertions(+), 247 deletions(-)

diff --git a/spring-rest/pom.xml b/spring-rest/pom.xml
index ecfe1f40f0..abc28ace44 100644
--- a/spring-rest/pom.xml
+++ b/spring-rest/pom.xml
@@ -1,274 +1,273 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.baeldung</groupId>
-	<artifactId>spring-rest</artifactId>
-	<version>0.1-SNAPSHOT</version>
-	<name>spring-rest</name>
-	<packaging>war</packaging>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.baeldung</groupId>
+    <artifactId>spring-rest</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <name>spring-rest</name>
+    <packaging>war</packaging>
 
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.4.RELEASE</version>
-	</parent>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.2.4.RELEASE</version>
+    </parent>
 
-	<dependencies>
+    <dependencies>
 
-		<!-- Spring Boot Dependencies -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-thymeleaf</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
-		</dependency>
-
-		<!-- Spring -->
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${org.springframework.version}</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>commons-logging</artifactId>
-					<groupId>commons-logging</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>${org.springframework.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-oxm</artifactId>
-			<version>${org.springframework.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>1.3.1</version>
-		</dependency>
-		<!-- web -->
-
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jstl</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-
-		<!-- marshalling -->
-
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>com.thoughtworks.xstream</groupId>
-			<artifactId>xstream</artifactId>
-			<version>1.4.8</version>
-		</dependency>
-
-		<!-- util -->
-
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>${guava.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.2.1</version>
-		</dependency>
-
-		<!-- logging -->
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${org.slf4j.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>${logback.version}</version>
-			<!-- <scope>runtime</scope> -->
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<version>${org.slf4j.version}</version>
-			<!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
-		</dependency>
-		<dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
-			<groupId>org.slf4j</groupId>
-			<artifactId>log4j-over-slf4j</artifactId>
-			<version>${org.slf4j.version}</version>
-		</dependency>
-
-		<!-- test scoped -->
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit-dep</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-core</artifactId>
-			<version>${org.hamcrest.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
-			<version>${org.hamcrest.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>${mockito.version}</version>
-			<scope>test</scope>
-		</dependency>
-		
-		<dependency>
-             <groupId>org.springframework</groupId> 
-             <artifactId>spring-test</artifactId> 
-             <version>${spring.version}</version> 
+        <!-- Spring Boot Dependencies -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-		
 
-	</dependencies>
+        <!-- Spring -->
 
-	<build>
-		<finalName>spring-rest</finalName>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${org.springframework.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-oxm</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
 
-		<plugins>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.3.1</version>
+        </dependency>
+        <!-- web -->
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>${maven-compiler-plugin.version}</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.0.1</version>
+            <scope>provided</scope>
+        </dependency>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>${maven-war-plugin.version}</version>
-			</plugin>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>${maven-surefire-plugin.version}</version>
-				<configuration>
-					<excludes>
-						<!-- <exclude>**/*ProductionTest.java</exclude> -->
-					</excludes>
-					<systemPropertyVariables>
-						<!-- <provPersistenceTarget>h2</provPersistenceTarget> -->
-					</systemPropertyVariables>
-				</configuration>
-			</plugin>
+        <!-- marshalling -->
 
-			<plugin>
-				<groupId>org.codehaus.cargo</groupId>
-				<artifactId>cargo-maven2-plugin</artifactId>
-				<version>${cargo-maven2-plugin.version}</version>
-				<configuration>
-					<wait>true</wait>
-					<container>
-						<containerId>jetty8x</containerId>
-						<type>embedded</type>
-						<systemProperties>
-							<!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
-						</systemProperties>
-					</container>
-					<configuration>
-						<properties>
-							<cargo.servlet.port>8082</cargo.servlet.port>
-						</properties>
-					</configuration>
-				</configuration>
-			</plugin>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
 
-		</plugins>
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.8</version>
+        </dependency>
 
-	</build>
+        <!-- util -->
 
-	<properties>
-		<!-- Spring -->
-		<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
-		<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
 
-		<!-- persistence -->
-		<hibernate.version>4.3.10.Final</hibernate.version>
-		<mysql-connector-java.version>5.1.35</mysql-connector-java.version>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.2.1</version>
+        </dependency>
 
-		<!-- marshalling -->
+        <!-- logging -->
 
-		<jackson.version>2.5.1</jackson.version>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${org.slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+            <!-- <scope>runtime</scope> -->
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${org.slf4j.version}</version>
+            <!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
+        </dependency>
+        <dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+            <version>${org.slf4j.version}</version>
+        </dependency>
 
-		<!-- various -->
-		<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
+        <!-- test scoped -->
 
-		<!-- util -->
-		<guava.version>18.0</guava.version>
-		<commons-lang3.version>3.4</commons-lang3.version>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit-dep</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
 
-		<!-- testing -->
-		<org.hamcrest.version>1.3</org.hamcrest.version>
-		<junit.version>4.11</junit.version>
-		<mockito.version>1.10.19</mockito.version>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <version>${org.hamcrest.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>${org.hamcrest.version}</version>
+            <scope>test</scope>
+        </dependency>
 
-		<httpcore.version>4.4.1</httpcore.version>
-		<httpclient.version>4.5</httpclient.version>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>${mockito.version}</version>
+            <scope>test</scope>
+        </dependency>
 
-		<rest-assured.version>2.4.1</rest-assured.version>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
 
-		<!-- logging -->
-		<org.slf4j.version>1.7.12</org.slf4j.version>
-		<logback.version>1.1.3</logback.version>
 
-		<!-- Maven plugins -->
-		<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
-		<maven-war-plugin.version>2.6</maven-war-plugin.version>
-		<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
-		<cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
+    </dependencies>
 
-	</properties>
+    <build>
+        <finalName>spring-rest</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>${maven-war-plugin.version}</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <excludes>
+                        <!-- <exclude>**/*ProductionTest.java</exclude> -->
+                    </excludes>
+                    <systemPropertyVariables>
+                        <!-- <provPersistenceTarget>h2</provPersistenceTarget> -->
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.cargo</groupId>
+                <artifactId>cargo-maven2-plugin</artifactId>
+                <version>${cargo-maven2-plugin.version}</version>
+                <configuration>
+                    <wait>true</wait>
+                    <container>
+                        <containerId>jetty8x</containerId>
+                        <type>embedded</type>
+                        <systemProperties>
+                            <!-- <provPersistenceTarget>cargo</provPersistenceTarget> -->
+                        </systemProperties>
+                    </container>
+                    <configuration>
+                        <properties>
+                            <cargo.servlet.port>8082</cargo.servlet.port>
+                        </properties>
+                    </configuration>
+                </configuration>
+            </plugin>
+
+        </plugins>
+
+    </build>
+
+    <properties>
+        <!-- Spring -->
+        <org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+        <org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
+
+        <!-- persistence -->
+        <hibernate.version>4.3.10.Final</hibernate.version>
+        <mysql-connector-java.version>5.1.35</mysql-connector-java.version>
+
+        <!-- marshalling -->
+
+        <jackson.version>2.5.1</jackson.version>
+
+        <!-- various -->
+        <hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
+
+        <!-- util -->
+        <guava.version>18.0</guava.version>
+        <commons-lang3.version>3.4</commons-lang3.version>
+
+        <!-- testing -->
+        <org.hamcrest.version>1.3</org.hamcrest.version>
+        <junit.version>4.11</junit.version>
+        <mockito.version>1.10.19</mockito.version>
+
+        <httpcore.version>4.4.1</httpcore.version>
+        <httpclient.version>4.5</httpclient.version>
+
+        <rest-assured.version>2.4.1</rest-assured.version>
+
+        <!-- logging -->
+        <org.slf4j.version>1.7.12</org.slf4j.version>
+        <logback.version>1.1.3</logback.version>
+
+        <!-- Maven plugins -->
+        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
+        <maven-war-plugin.version>2.6</maven-war-plugin.version>
+        <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
+        <cargo-maven2-plugin.version>1.4.14</cargo-maven2-plugin.version>
+
+    </properties>
 
 </project>
\ No newline at end of file