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