Merge branch 'master' of https://github.com/eugenp/tutorials

Conflicts:
	spring-rest/pom.xml
	spring-rest/src/main/webapp/WEB-INF/web.xml

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)

spring-rest/pom.xml

@@ -153,6 +153,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
     </dependencies>
 
     <build>

spring-rest/src/main/java/org/baeldung/web/controller/redirect/RedirectController.java

@@ -0,0 +1,52 @@
+package org.baeldung.web.controller.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 = "/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);
+    }
+}

spring-rest/src/main/webapp/WEB-INF/api-servlet.xml

@@ -1,16 +1,33 @@
 <?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"
-        class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
+    <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 -->
-         
+
         <!-- max size of file in memory (in bytes) -->
         <property name="maxInMemorySize" value="1048576" /> <!-- 1MB -->
- 
+
     </bean>
-    
-</beans>
+
+
+</beans>
+
+

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>

spring-rest/src/main/webapp/WEB-INF/web.xml

@@ -38,4 +38,4 @@
         <welcome-file/>
     </welcome-file-list>
 
-</web-app>
+</web-app>

spring-rest/src/test/java/org/baeldung/web/controller/redirect/RedirectControllerTest.java

@@ -0,0 +1,67 @@
+package org.baeldung.web.controller.redirect;
+
+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;
+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)
+@ContextConfiguration("file:src/main/webapp/WEB-INF/api-servlet.xml")
+@WebAppConfiguration
+public class RedirectControllerTest {
+
+    private MockMvc mockMvc;
+
+    @Autowired
+    protected WebApplicationContext wac;
+
+    @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 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 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"));
+    }
+
+}