From 8288ce100679ce7ae655f17812495662a1434e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=8C=BFDD?= Date: Sat, 19 Mar 2016 22:31:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E6=A1=88=E4=BE=8B=E9=94=99=E4=BD=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Chapter1/pom.xml | 63 ------------------- .../main/java/com/didispace/Application.java | 22 ------- .../com/didispace/web/HelloController.java | 29 --------- .../src/main/resources/application.properties | 0 .../src/main/resources/templates/index.html | 10 --- .../java/com/didispace/ApplicationTests.java | 48 -------------- Chapter3-1-2/pom.xml | 55 ---------------- .../com/didispace/Chapter1Application.java | 13 ---- .../com/didispace/web/HelloController.java | 14 ----- .../src/main/resources/application.properties | 0 .../didispace/Chapter1ApplicationTests.java | 40 ------------ 11 files changed, 294 deletions(-) delete mode 100755 Chapter1/pom.xml delete mode 100755 Chapter1/src/main/java/com/didispace/Application.java delete mode 100755 Chapter1/src/main/java/com/didispace/web/HelloController.java delete mode 100755 Chapter1/src/main/resources/application.properties delete mode 100755 Chapter1/src/main/resources/templates/index.html delete mode 100755 Chapter1/src/test/java/com/didispace/ApplicationTests.java delete mode 100755 Chapter3-1-2/pom.xml delete mode 100755 Chapter3-1-2/src/main/java/com/didispace/Chapter1Application.java delete mode 100755 Chapter3-1-2/src/main/java/com/didispace/web/HelloController.java delete mode 100755 Chapter3-1-2/src/main/resources/application.properties delete mode 100755 Chapter3-1-2/src/test/java/com/didispace/Chapter1ApplicationTests.java diff --git a/Chapter1/pom.xml b/Chapter1/pom.xml deleted file mode 100755 index 2f235cc..0000000 --- a/Chapter1/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - 4.0.0 - - com.didispace - demo - 1.0.0 - jar - - demo - Spring Boot Web project - - - org.springframework.boot - spring-boot-starter-parent - 1.3.2.RELEASE - - - - - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-starter - - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - true - - - - - - - diff --git a/Chapter1/src/main/java/com/didispace/Application.java b/Chapter1/src/main/java/com/didispace/Application.java deleted file mode 100755 index f7a9e16..0000000 --- a/Chapter1/src/main/java/com/didispace/Application.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.didispace; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * - * @author 程序猿DD - * @version 1.0.0 - * @blog http://blog.didispace.com - * - */ -@SpringBootApplication -public class Application { - - public static void main(String[] args) { - - SpringApplication.run(Application.class, args); - - } - -} diff --git a/Chapter1/src/main/java/com/didispace/web/HelloController.java b/Chapter1/src/main/java/com/didispace/web/HelloController.java deleted file mode 100755 index 66b3ea7..0000000 --- a/Chapter1/src/main/java/com/didispace/web/HelloController.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.didispace.web; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * - * @author 程序猿DD - * @version 1.0.0 - * @blog http://blog.didispace.com - * - */ -@Controller -public class HelloController { - - @RequestMapping("/hello") - public String hello() { - return "Hello World"; - } - - @RequestMapping("/") - public String index(ModelMap map) { - map.addAttribute("host", "http://blog.didispace.com"); - return "index"; - } - -} \ No newline at end of file diff --git a/Chapter1/src/main/resources/application.properties b/Chapter1/src/main/resources/application.properties deleted file mode 100755 index e69de29..0000000 diff --git a/Chapter1/src/main/resources/templates/index.html b/Chapter1/src/main/resources/templates/index.html deleted file mode 100755 index 32cbfe8..0000000 --- a/Chapter1/src/main/resources/templates/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - -

Hello World

- - \ No newline at end of file diff --git a/Chapter1/src/test/java/com/didispace/ApplicationTests.java b/Chapter1/src/test/java/com/didispace/ApplicationTests.java deleted file mode 100755 index c5b2e60..0000000 --- a/Chapter1/src/test/java/com/didispace/ApplicationTests.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.didispace; - -import com.didispace.web.HelloController; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.http.MediaType; -import org.springframework.mock.web.MockServletContext; -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 static org.hamcrest.Matchers.equalTo; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - - -/** - * - * @author 程序猿DD - * @version 1.0.0 - * @blog http://blog.didispace.com - * - */ -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = MockServletContext.class) -@WebAppConfiguration -public class ApplicationTests { - - private MockMvc mvc; - - @Before - public void setUp() throws Exception { - mvc = MockMvcBuilders.standaloneSetup( - new HelloController()).build(); - } - - @Test - public void getHello() throws Exception { - mvc.perform(MockMvcRequestBuilders.get("/hello").accept(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()) - .andExpect(content().string(equalTo("Hello World"))); - } - -} diff --git a/Chapter3-1-2/pom.xml b/Chapter3-1-2/pom.xml deleted file mode 100755 index cc4e377..0000000 --- a/Chapter3-1-2/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - 4.0.0 - - com.didispace - Chapter1 - 1.0.0 - jar - - Chapter1 - The first Spring Boot project - - - org.springframework.boot - spring-boot-starter-parent - 1.3.2.RELEASE - - - - - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-starter - - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.springframework.boot - spring-boot-starter-web - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - diff --git a/Chapter3-1-2/src/main/java/com/didispace/Chapter1Application.java b/Chapter3-1-2/src/main/java/com/didispace/Chapter1Application.java deleted file mode 100755 index 6823281..0000000 --- a/Chapter3-1-2/src/main/java/com/didispace/Chapter1Application.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.didispace; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class Chapter1Application { - - public static void main(String[] args) { - SpringApplication.run(Chapter1Application.class, args); - } - -} diff --git a/Chapter3-1-2/src/main/java/com/didispace/web/HelloController.java b/Chapter3-1-2/src/main/java/com/didispace/web/HelloController.java deleted file mode 100755 index 9455485..0000000 --- a/Chapter3-1-2/src/main/java/com/didispace/web/HelloController.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.didispace.web; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class HelloController { - - @RequestMapping("/hello") - public String index() { - return "Hello World"; - } - -} \ No newline at end of file diff --git a/Chapter3-1-2/src/main/resources/application.properties b/Chapter3-1-2/src/main/resources/application.properties deleted file mode 100755 index e69de29..0000000 diff --git a/Chapter3-1-2/src/test/java/com/didispace/Chapter1ApplicationTests.java b/Chapter3-1-2/src/test/java/com/didispace/Chapter1ApplicationTests.java deleted file mode 100755 index 0b5bfb0..0000000 --- a/Chapter3-1-2/src/test/java/com/didispace/Chapter1ApplicationTests.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.didispace; - -import com.didispace.web.HelloController; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.http.MediaType; -import org.springframework.mock.web.MockServletContext; -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 static org.hamcrest.Matchers.equalTo; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = MockServletContext.class) -@WebAppConfiguration -public class Chapter1ApplicationTests { - - private MockMvc mvc; - - @Before - public void setUp() throws Exception { - mvc = MockMvcBuilders.standaloneSetup(new HelloController()).build(); - } - - @Test - public void getHello() throws Exception { - mvc.perform(MockMvcRequestBuilders.get("/hello").accept(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()) - .andExpect(content().string(equalTo("Hello World"))); - } - -}