diff --git a/spring-mvc-test/src/main/java/com/baeldung/spring/ApplicationConfig.java b/spring-mvc-test/src/main/java/com/baeldung/spring/ApplicationConfig.java
index 1a5b590854..09be5ee113 100644
--- a/spring-mvc-test/src/main/java/com/baeldung/spring/ApplicationConfig.java
+++ b/spring-mvc-test/src/main/java/com/baeldung/spring/ApplicationConfig.java
@@ -12,14 +12,14 @@ import org.springframework.web.servlet.view.JstlView;
 
 @EnableWebMvc
 @Configuration
-@ComponentScan(basePackages = {"com.baeldung.spring.controller"})
+@ComponentScan(basePackages = { "com.baeldung.spring.controller" })
 public class ApplicationConfig extends WebMvcConfigurerAdapter {
 
-	public ApplicationConfig() {
-		super();
-	}
-	
-	@Override
+    public ApplicationConfig() {
+        super();
+    }
+
+    @Override
     public void addViewControllers(final ViewControllerRegistry registry) {
         super.addViewControllers(registry);
         registry.addViewController("/").setViewName("index");
@@ -27,7 +27,7 @@ public class ApplicationConfig extends WebMvcConfigurerAdapter {
 
     @Bean
     public ViewResolver viewResolver() {
-    	final InternalResourceViewResolver bean = new InternalResourceViewResolver();
+        final InternalResourceViewResolver bean = new InternalResourceViewResolver();
         bean.setViewClass(JstlView.class);
         bean.setPrefix("/WEB-INF/jsp/");
         bean.setSuffix(".jsp");
diff --git a/spring-mvc-test/src/main/java/com/baeldung/spring/bean/Greeting.java b/spring-mvc-test/src/main/java/com/baeldung/spring/bean/Greeting.java
index d7ddaf2fd1..11c0a79b0e 100644
--- a/spring-mvc-test/src/main/java/com/baeldung/spring/bean/Greeting.java
+++ b/spring-mvc-test/src/main/java/com/baeldung/spring/bean/Greeting.java
@@ -1,19 +1,22 @@
 package com.baeldung.spring.bean;
 
 public class Greeting {
-	private int id;
-	private String message;
-	
-	public int getId() {
-		return id;
-	}
-	public void setId(int id) {
-		this.id = id;
-	}
-	public String getMessage() {
-		return message;
-	}
-	public void setMessage(String message) {
-		this.message = message;
-	}
+    private int id;
+    private String message;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
 }
diff --git a/spring-mvc-test/src/main/java/com/baeldung/spring/controller/GreetController.java b/spring-mvc-test/src/main/java/com/baeldung/spring/controller/GreetController.java
index 0f62df2a71..d563f80918 100644
--- a/spring-mvc-test/src/main/java/com/baeldung/spring/controller/GreetController.java
+++ b/spring-mvc-test/src/main/java/com/baeldung/spring/controller/GreetController.java
@@ -11,54 +11,54 @@ import com.baeldung.spring.bean.Greeting;
 
 @Controller
 public class GreetController {
-	
-	@RequestMapping(value = "/homePage", method = RequestMethod.GET)
-	public String index() {
-		return "index";
-	}
-	
-	@RequestMapping(value = "/greet", method = RequestMethod.GET, produces = "application/json")
-	@ResponseBody
-	public Greeting greet() {
-		Greeting greeting = new Greeting();
-		greeting.setId(1);
-		greeting.setMessage("Hello World!!!");
-		return greeting;
-	}
-	
-	@RequestMapping(value = "/greetWithPathVariable/{name}", method = RequestMethod.GET, produces = "application/json")
-	@ResponseBody
-	public Greeting greetWithPathVariable(@PathVariable("name") String name) {
-		Greeting greeting = new Greeting();
-		greeting.setId(1);
-		greeting.setMessage("Hello World " + name + "!!!");
-		return greeting;
-	}
-	
-	@RequestMapping(value = "/greetWithQueryVariable", method = RequestMethod.GET, produces = "application/json")
-	@ResponseBody
-	public Greeting greetWithQueryVariable(@RequestParam("name") String name) {
-		Greeting greeting = new Greeting();
-		greeting.setId(1);
-		greeting.setMessage("Hello World " + name + "!!!");
-		return greeting;
-	}
-	
-	@RequestMapping(value = "/greetWithPost", method = RequestMethod.POST, produces = "application/json")
-	@ResponseBody
-	public Greeting greetWithPost() {
-		Greeting greeting = new Greeting();
-		greeting.setId(1);
-		greeting.setMessage("Hello World!!!");
-		return greeting;
-	}
 
-	@RequestMapping(value = "/greetWithPostAndFormData", method = RequestMethod.POST, produces = "application/json")
-	@ResponseBody
-	public Greeting greetWithPostAndFormData(@RequestParam("id") int id, @RequestParam("name") String name) {
-		Greeting greeting = new Greeting();
-		greeting.setId(id);
-		greeting.setMessage("Hello World " + name + "!!!");
-		return greeting;
-	}
+    @RequestMapping(value = "/homePage", method = RequestMethod.GET)
+    public String index() {
+        return "index";
+    }
+
+    @RequestMapping(value = "/greet", method = RequestMethod.GET, produces = "application/json")
+    @ResponseBody
+    public Greeting greet() {
+        Greeting greeting = new Greeting();
+        greeting.setId(1);
+        greeting.setMessage("Hello World!!!");
+        return greeting;
+    }
+
+    @RequestMapping(value = "/greetWithPathVariable/{name}", method = RequestMethod.GET, produces = "application/json")
+    @ResponseBody
+    public Greeting greetWithPathVariable(@PathVariable("name") String name) {
+        Greeting greeting = new Greeting();
+        greeting.setId(1);
+        greeting.setMessage("Hello World " + name + "!!!");
+        return greeting;
+    }
+
+    @RequestMapping(value = "/greetWithQueryVariable", method = RequestMethod.GET, produces = "application/json")
+    @ResponseBody
+    public Greeting greetWithQueryVariable(@RequestParam("name") String name) {
+        Greeting greeting = new Greeting();
+        greeting.setId(1);
+        greeting.setMessage("Hello World " + name + "!!!");
+        return greeting;
+    }
+
+    @RequestMapping(value = "/greetWithPost", method = RequestMethod.POST, produces = "application/json")
+    @ResponseBody
+    public Greeting greetWithPost() {
+        Greeting greeting = new Greeting();
+        greeting.setId(1);
+        greeting.setMessage("Hello World!!!");
+        return greeting;
+    }
+
+    @RequestMapping(value = "/greetWithPostAndFormData", method = RequestMethod.POST, produces = "application/json")
+    @ResponseBody
+    public Greeting greetWithPostAndFormData(@RequestParam("id") int id, @RequestParam("name") String name) {
+        Greeting greeting = new Greeting();
+        greeting.setId(id);
+        greeting.setMessage("Hello World " + name + "!!!");
+        return greeting;
+    }
 }
\ No newline at end of file
diff --git a/spring-mvc-test/src/main/webapp/WEB-INF/jsp/index.jsp b/spring-mvc-test/src/main/webapp/WEB-INF/jsp/index.jsp
index 89c7ca6c81..2cf02bc2d8 100644
--- a/spring-mvc-test/src/main/webapp/WEB-INF/jsp/index.jsp
+++ b/spring-mvc-test/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -1,5 +1,5 @@
 <html>
-	<body>
-		<h1>Spring MVC - Integration Testing</h1>
-	</body>
+<body>
+	<h1>Spring MVC - Integration Testing</h1>
+</body>
 </html>
\ No newline at end of file
diff --git a/spring-mvc-test/src/main/webapp/WEB-INF/spring-servlet.xml b/spring-mvc-test/src/main/webapp/WEB-INF/spring-servlet.xml
index 40718ab3a4..2b8192e742 100644
--- a/spring-mvc-test/src/main/webapp/WEB-INF/spring-servlet.xml
+++ b/spring-mvc-test/src/main/webapp/WEB-INF/spring-servlet.xml
@@ -1,5 +1,5 @@
 <?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.3.xsd" >
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd">
 </beans>
\ No newline at end of file
diff --git a/spring-mvc-test/src/main/webapp/WEB-INF/web.xml b/spring-mvc-test/src/main/webapp/WEB-INF/web.xml
index 8cf7a9a37b..dc0233a7fc 100644
--- a/spring-mvc-test/src/main/webapp/WEB-INF/web.xml
+++ b/spring-mvc-test/src/main/webapp/WEB-INF/web.xml
@@ -1,34 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
-         version="3.1">
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+	version="3.1">
 
-    <display-name>Spring MVC - Integration Testing</display-name>
+	<display-name>Spring MVC - Integration Testing</display-name>
 
-    <context-param>
-        <param-name>contextClass</param-name>
-        <param-value>
+	<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>com.baeldung.spring</param-value>
-    </context-param>
-    
-    <listener>
-        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-    </listener>
+	</context-param>
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>com.baeldung.spring</param-value>
+	</context-param>
 
-    <servlet>
-        <servlet-name>spring</servlet-name>
-        <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    
-    <servlet-mapping>
-        <servlet-name>spring</servlet-name>
-        <url-pattern>/</url-pattern>
-    </servlet-mapping>
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+
+	<servlet>
+		<servlet-name>spring</servlet-name>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>spring</servlet-name>
+		<url-pattern>/</url-pattern>
+	</servlet-mapping>
 </web-app>
\ No newline at end of file
diff --git a/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerIntegrationTest.java b/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerIntegrationTest.java
index d7d697dda9..368ef6ec91 100644
--- a/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerIntegrationTest.java
+++ b/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerIntegrationTest.java
@@ -28,87 +28,62 @@ import javax.servlet.ServletContext;
 @ContextConfiguration(classes = { ApplicationConfig.class })
 public class GreetControllerIntegrationTest {
 
-	@Autowired
-	private WebApplicationContext wac;
+    @Autowired
+    private WebApplicationContext wac;
 
-	private MockMvc mockMvc;
+    private MockMvc mockMvc;
 
-	@Before
-	public void setup() throws Exception {
-		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac)
-//				.alwaysExpect(MockMvcResultMatchers.status().isOk())
-				.build();
-	}
+    @Before
+    public void setup() throws Exception {
+        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+    }
 
-	@Test
-	public void verifyWac() {
-		ServletContext servletContext = wac.getServletContext();
-		Assert.assertNotNull(servletContext);
-		Assert.assertTrue(servletContext instanceof MockServletContext);
-		Assert.assertNotNull(wac.getBean("greetController"));
-	}
+    @Test
+    public void verifyWac() {
+        ServletContext servletContext = wac.getServletContext();
+        Assert.assertNotNull(servletContext);
+        Assert.assertTrue(servletContext instanceof MockServletContext);
+        Assert.assertNotNull(wac.getBean("greetController"));
+    }
 
-	@Test
-	public void verifyIndexJspViewName() throws Exception {
-		this.mockMvc
-					.perform(MockMvcRequestBuilders.get("/homePage"))
-					.andDo(print())
-					.andExpect(MockMvcResultMatchers.view().name("index"));
-	}
+    @Test
+    public void verifyIndexJspViewName() throws Exception {
+        this.mockMvc.perform(MockMvcRequestBuilders.get("/homePage")).andDo(print()).andExpect(MockMvcResultMatchers.view().name("index"));
+    }
 
-	@Test
-	public void verifyGreet() throws Exception {
-		MvcResult mvcResult = this.mockMvc
-										.perform(MockMvcRequestBuilders.get("/greet"))
-										.andDo(print())
-										.andExpect(MockMvcResultMatchers.status().isOk())
-										.andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!"))
-										.andReturn();
-		Assert.assertEquals("application/json;charset=UTF-8", mvcResult.getResponse().getContentType());
-	}
+    @Test
+    public void verifyGreet() throws Exception {
+        MvcResult mvcResult = this.mockMvc.perform(MockMvcRequestBuilders.get("/greet")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!")).andReturn();
+        Assert.assertEquals("application/json;charset=UTF-8", mvcResult.getResponse().getContentType());
+    }
 
-	@Test
-	public void verifyGreetWithPathVariable() throws Exception {
-		this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithPathVariable/John")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk())
-				.andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8"))
-				.andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John!!!"));
-	}
+    @Test
+    public void verifyGreetWithPathVariable() throws Exception {
+        this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithPathVariable/John")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8"))
+                .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John!!!"));
+    }
 
-	@Test
-	public void verifyGreetWithPathVariable_2() throws Exception {
-		this.mockMvc
-				.perform(MockMvcRequestBuilders.get("/greetWithPathVariable/{name}", "Doe"))
-				.andDo(print())
-				.andExpect(MockMvcResultMatchers.status().isOk())
-				.andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8"))
-				.andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World Doe!!!"));
-	}
+    @Test
+    public void verifyGreetWithPathVariable_2() throws Exception {
+        this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithPathVariable/{name}", "Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8"))
+                .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World Doe!!!"));
+    }
 
-	@Test
-	public void verifyGreetWithQueryVariable() throws Exception {
-		this.mockMvc
-				.perform(MockMvcRequestBuilders.get("/greetWithQueryVariable").param("name", "John Doe"))
-				.andDo(print())
-				.andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8"))
-				.andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!"));
-	}
+    @Test
+    public void verifyGreetWithQueryVariable() throws Exception {
+        this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithQueryVariable").param("name", "John Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk())
+                .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!"));
+    }
 
-	@Test
-	public void verifyGreetWithPost() throws Exception {
-		this.mockMvc
-				.perform(MockMvcRequestBuilders.post("/greetWithPost"))
-				.andDo(print())
-				.andExpect(MockMvcResultMatchers.status().isOk())
-				.andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8"))
-				.andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!"));
-	}
+    @Test
+    public void verifyGreetWithPost() throws Exception {
+        this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPost")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8"))
+                .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!"));
+    }
 
-	@Test
-	public void verifyGreetWithPostAndFormData() throws Exception {
-		this.mockMvc
-				.perform(MockMvcRequestBuilders.post("/greetWithPostAndFormData").param("id", "1").param("name", "John Doe"))
-				.andDo(print()).andExpect(MockMvcResultMatchers.status().isOk())
-				.andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8"))
-				.andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!")).andExpect(MockMvcResultMatchers.jsonPath("$.id").value(1));
-	}
+    @Test
+    public void verifyGreetWithPostAndFormData() throws Exception {
+        this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPostAndFormData").param("id", "1").param("name", "John Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk())
+                .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!")).andExpect(MockMvcResultMatchers.jsonPath("$.id").value(1));
+    }
 }
\ No newline at end of file
diff --git a/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerTest.java b/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerTest.java
index 155b6b4a50..1631118981 100644
--- a/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerTest.java
+++ b/spring-mvc-test/src/test/java/com/baeldung/spring/controller/GreetControllerTest.java
@@ -15,69 +15,49 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
 
 public class GreetControllerTest {
-	
-	private MockMvc mockMvc;
-	
-	@Before
-	public void setup() {
-		this.mockMvc = MockMvcBuilders.standaloneSetup(new GreetController()).build();
-	}
-	
-	@Test
-	public void verifyIndexJspViewName() throws Exception {
-		this.mockMvc.perform(get("/homePage"))
-				.andExpect(view().name("index"));
-	}
-	
-	@Test
-	public void verifyGreet() throws Exception {
-		this.mockMvc.perform(get("/greet"))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json;charset=UTF-8"))
-				.andExpect(jsonPath("$.message").value("Hello World!!!"));
-	}
-	
-	@Test
-	public void verifyGreetWithPathVariable() throws Exception {
-		this.mockMvc.perform(get("/greetWithPathVariable/John"))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json;charset=UTF-8"))
-				.andExpect(jsonPath("$.message").value("Hello World John!!!"));
-	}
-	
-	@Test
-	public void verifyGreetWithPathVariable_2() throws Exception {
-		this.mockMvc.perform(get("/greetWithPathVariable/{name}","Doe"))
-				.andExpect(status().isOk())
-				.andExpect(content().contentType("application/json;charset=UTF-8"))
-				.andExpect(jsonPath("$.message").value("Hello World Doe!!!"));
-	}
-	
-	@Test
-	public void verifyGreetWithQueryVariable() throws Exception {
-		this.mockMvc
-				.perform(MockMvcRequestBuilders.get("/greetWithQueryVariable").param("name", "John Doe"))
-				.andDo(print())
-				.andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8"))
-				.andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!"));
-	}
 
-	@Test
-	public void verifyGreetWithPost() throws Exception {
-		this.mockMvc
-				.perform(MockMvcRequestBuilders.post("/greetWithPost"))
-				.andDo(print())
-				.andExpect(MockMvcResultMatchers.status().isOk())
-				.andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8"))
-				.andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!"));
-	}
+    private MockMvc mockMvc;
 
-	@Test
-	public void verifyGreetWithPostAndFormData() throws Exception {
-		this.mockMvc
-				.perform(MockMvcRequestBuilders.post("/greetWithPostAndFormData").param("id", "1").param("name", "John Doe"))
-				.andDo(print()).andExpect(MockMvcResultMatchers.status().isOk())
-				.andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8"))
-				.andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!")).andExpect(MockMvcResultMatchers.jsonPath("$.id").value(1));
-	}
+    @Before
+    public void setup() {
+        this.mockMvc = MockMvcBuilders.standaloneSetup(new GreetController()).build();
+    }
+
+    @Test
+    public void verifyIndexJspViewName() throws Exception {
+        this.mockMvc.perform(get("/homePage")).andExpect(view().name("index"));
+    }
+
+    @Test
+    public void verifyGreet() throws Exception {
+        this.mockMvc.perform(get("/greet")).andExpect(status().isOk()).andExpect(content().contentType("application/json;charset=UTF-8")).andExpect(jsonPath("$.message").value("Hello World!!!"));
+    }
+
+    @Test
+    public void verifyGreetWithPathVariable() throws Exception {
+        this.mockMvc.perform(get("/greetWithPathVariable/John")).andExpect(status().isOk()).andExpect(content().contentType("application/json;charset=UTF-8")).andExpect(jsonPath("$.message").value("Hello World John!!!"));
+    }
+
+    @Test
+    public void verifyGreetWithPathVariable_2() throws Exception {
+        this.mockMvc.perform(get("/greetWithPathVariable/{name}", "Doe")).andExpect(status().isOk()).andExpect(content().contentType("application/json;charset=UTF-8")).andExpect(jsonPath("$.message").value("Hello World Doe!!!"));
+    }
+
+    @Test
+    public void verifyGreetWithQueryVariable() throws Exception {
+        this.mockMvc.perform(MockMvcRequestBuilders.get("/greetWithQueryVariable").param("name", "John Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk())
+                .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!"));
+    }
+
+    @Test
+    public void verifyGreetWithPost() throws Exception {
+        this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPost")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8"))
+                .andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!"));
+    }
+
+    @Test
+    public void verifyGreetWithPostAndFormData() throws Exception {
+        this.mockMvc.perform(MockMvcRequestBuilders.post("/greetWithPostAndFormData").param("id", "1").param("name", "John Doe")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk())
+                .andExpect(MockMvcResultMatchers.content().contentType("application/json;charset=UTF-8")).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World John Doe!!!")).andExpect(MockMvcResultMatchers.jsonPath("$.id").value(1));
+    }
 }