Move spring-controller to spring-all

2016-07-28 08:57:51 +02:00
parent 515eaa7fbc
commit 3b100597b4
10 changed files with 13 additions and 65 deletions
@@ -0,0 +1,19 @@
+package org.baeldung.controller.controller;
+
+import org.baeldung.controller.student.Student;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class RestAnnotatedController {
+
+    @GetMapping(value = "/annotated/student/{studentId}")
+    public Student getData(@PathVariable Integer studentId) {
+        Student student = new Student();
+        student.setName("Peter");
+        student.setId(studentId);
+
+        return student;
+    }
+}
@@ -0,0 +1,21 @@
+package org.baeldung.controller.controller;
+
+import org.baeldung.controller.student.Student;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+public class RestController{
+
+	@GetMapping(value="/student/{studentId}")
+	public @ResponseBody Student getTestData(@PathVariable Integer studentId) {
+		Student student = new Student();
+		student.setName("Peter");
+		student.setId(studentId);
+
+		return student;
+
+	}
+}
@@ -0,0 +1,24 @@
+
+/**
+ * @author Prashant Dutta
+ */
+package org.baeldung.controller.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+@Controller
+@RequestMapping(value = "/test")
+public class TestController {
+
+    @GetMapping
+    public ModelAndView getTestData() {
+        ModelAndView mv = new ModelAndView();
+        mv.setViewName("welcome");
+        mv.getModel().put("data", "Welcome home man");
+
+        return mv;
+    }
+}
@@ -0,0 +1,33 @@
+package org.baeldung.controller.student;
+
+public class Student {
+	private String name;
+	
+	private int id;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+	
+	@Override
+	public int hashCode(){
+		return this.id;
+	}
+	
+	@Override
+	public boolean equals(Object obj){
+		return this.name.equals(((Student)obj).getName());
+	}
+}
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xsi:schemaLocation="
+        http://www.springframework.org/schema/beans     
+        http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+        http://www.springframework.org/schema/context
+        http://www.springframework.org/schema/context/spring-context-4.0.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.controller.controller" />
+ <mvc:annotation-driven />
+ 
+  	 <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+	        <property name="prefix">
+	            <value>/WEB-INF/</value>
+	        </property>
+	        <property name="suffix">
+	            <value>.jsp</value>
+	        </property>
+	  </bean>
+  </beans>
@@ -0,0 +1,27 @@
+<web-app
+        xmlns="http://java.sun.com/xml/ns/javaee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+        version="3.0">
+
+    <servlet>
+        <servlet-name>test-mvc</servlet-name>
+        <servlet-class>
+            org.springframework.web.servlet.DispatcherServlet
+        </servlet-class>
+        <load-on-startup>1</load-on-startup>
+        <init-param>
+            <param-name>contextConfigLocation</param-name>
+            <param-value>/WEB-INF/test-mvc.xml</param-value>
+        </init-param>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>test-mvc</servlet-name>
+        <url-pattern>/test/*</url-pattern>
+    </servlet-mapping>
+
+    <welcome-file-list>
+        <welcome-file>/WEB-INF/index.jsp</welcome-file>
+    </welcome-file-list>
+</web-app>
@@ -0,0 +1,12 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Insert title here</title>
+</head>
+<body>
+Data returned is ${data}
+</body>
+</html>
@@ -0,0 +1,83 @@
+package org.baeldung.controller;
+
+import org.junit.Assert;
+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.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.servlet.ModelAndView;
+
+import org.baeldung.controller.student.Student;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@WebAppConfiguration
+@ContextConfiguration({"classpath:test-mvc.xml"})
+public class ControllerTest {
+
+    private MockMvc mockMvc;
+
+    @Autowired
+    private WebApplicationContext wac;
+
+    private Student selectedStudent;
+
+    @Before
+    public void setUp() {
+        this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
+
+        selectedStudent = new Student();
+        selectedStudent.setId(1);
+        selectedStudent.setName("Peter");
+    }
+
+    @Test
+    public void testTestController() throws Exception {
+
+        ModelAndView mv = this.mockMvc.perform(MockMvcRequestBuilders.get("/test/"))
+          .andReturn()
+          .getModelAndView();
+
+        // validate modal data
+        Assert.assertSame(mv.getModelMap().get("data").toString(), "Welcome home man");
+
+        // validate view name
+        Assert.assertSame(mv.getViewName(), "welcome");
+    }
+
+    @Test
+    public void testRestController() throws Exception {
+
+        String responseBody = this.mockMvc.perform(MockMvcRequestBuilders.get("/student/{studentId}", 1))
+          .andReturn().getResponse()
+          .getContentAsString();
+
+        ObjectMapper reader = new ObjectMapper();
+
+        Student studentDetails = reader.readValue(responseBody, Student.class);
+
+        Assert.assertEquals(selectedStudent, studentDetails);
+
+    }
+
+    @Test
+    public void testRestAnnotatedController() throws Exception {
+
+        String responseBody = this.mockMvc.perform(MockMvcRequestBuilders.get("/annotated/student/{studentId}", 1))
+          .andReturn().getResponse()
+          .getContentAsString();
+
+        ObjectMapper reader = new ObjectMapper();
+
+        Student studentDetails = reader.readValue(responseBody, Student.class);
+
+        Assert.assertEquals(selectedStudent, studentDetails);
+    }
+}