From 2ae3be56f1523573f5fe093b932a5a3df6f0f2ff Mon Sep 17 00:00:00 2001 From: enpy303 Date: Mon, 23 Apr 2018 17:10:37 +0200 Subject: [PATCH 1/2] WarInitializerApplication --- .../WarInitializerApplication.java | 40 +++++++++++++++++++ .../WarInitializerApplicationTest.java | 36 +++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 spring-boot/src/main/java/com/baeldung/servletinitializer/WarInitializerApplication.java create mode 100644 spring-boot/src/test/java/com/baeldung/servletinitializer/WarInitializerApplicationTest.java diff --git a/spring-boot/src/main/java/com/baeldung/servletinitializer/WarInitializerApplication.java b/spring-boot/src/main/java/com/baeldung/servletinitializer/WarInitializerApplication.java new file mode 100644 index 0000000000..c4dbab891e --- /dev/null +++ b/spring-boot/src/main/java/com/baeldung/servletinitializer/WarInitializerApplication.java @@ -0,0 +1,40 @@ +package com.baeldung.servletinitializer; + + + + +import java.time.LocalDateTime; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.support.SpringBootServletInitializer; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@SpringBootApplication +public class WarInitializerApplication extends SpringBootServletInitializer { + + @Override + protected SpringApplicationBuilder configure (SpringApplicationBuilder builder) { + return builder.sources(WarInitializerApplication.class); + } + + public static void main (String[] args) { + SpringApplication sa = new SpringApplication(WarInitializerApplication.class); + sa.setLogStartupInfo(false); + sa.run(args); + } + + @RestController + public static class WarInitializerController { + + @RequestMapping("/") + public String handler (Model model) { + model.addAttribute("date", + LocalDateTime.now()); + return "WarInitializerApplication is up and running!"; + } + } +} \ No newline at end of file diff --git a/spring-boot/src/test/java/com/baeldung/servletinitializer/WarInitializerApplicationTest.java b/spring-boot/src/test/java/com/baeldung/servletinitializer/WarInitializerApplicationTest.java new file mode 100644 index 0000000000..8d6247545d --- /dev/null +++ b/spring-boot/src/test/java/com/baeldung/servletinitializer/WarInitializerApplicationTest.java @@ -0,0 +1,36 @@ +package com.baeldung.servletinitializer; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; + +import com.baeldung.servletinitializer.WarInitializerApplication.WarInitializerController; + +@RunWith(SpringRunner.class) +@WebMvcTest(controllers = WarInitializerController.class) +public class WarInitializerApplicationTest { + + @Autowired + private MockMvc mockMvc; + + @Test + public void whenContextRootUrlIsAccessed_thenStatusIsOk() throws Exception { + mockMvc.perform(get("/")) + .andExpect(status().is(200)); + } + + @Test + public void whenContextRootUrlIsAccesed_thenCorrectStringIsReturned() throws Exception { + mockMvc.perform(get("/")) + .andExpect(content().string(containsString("WarInitializerApplication is up and running!"))); + } + +} From ea7aae3c0f5b7cdac84658318a7d026d8901192e Mon Sep 17 00:00:00 2001 From: enpy303 Date: Mon, 23 Apr 2018 17:16:27 +0200 Subject: [PATCH 2/2] WarInitializerApplication formatting fixes --- .../WarInitializerApplication.java | 16 ++++++---------- .../WarInitializerApplicationTest.java | 4 ++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/spring-boot/src/main/java/com/baeldung/servletinitializer/WarInitializerApplication.java b/spring-boot/src/main/java/com/baeldung/servletinitializer/WarInitializerApplication.java index c4dbab891e..237026780c 100644 --- a/spring-boot/src/main/java/com/baeldung/servletinitializer/WarInitializerApplication.java +++ b/spring-boot/src/main/java/com/baeldung/servletinitializer/WarInitializerApplication.java @@ -1,8 +1,5 @@ package com.baeldung.servletinitializer; - - - import java.time.LocalDateTime; import org.springframework.boot.SpringApplication; @@ -17,11 +14,11 @@ import org.springframework.web.bind.annotation.RestController; public class WarInitializerApplication extends SpringBootServletInitializer { @Override - protected SpringApplicationBuilder configure (SpringApplicationBuilder builder) { + protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { return builder.sources(WarInitializerApplication.class); } - - public static void main (String[] args) { + + public static void main(String[] args) { SpringApplication sa = new SpringApplication(WarInitializerApplication.class); sa.setLogStartupInfo(false); sa.run(args); @@ -31,10 +28,9 @@ public class WarInitializerApplication extends SpringBootServletInitializer { public static class WarInitializerController { @RequestMapping("/") - public String handler (Model model) { - model.addAttribute("date", - LocalDateTime.now()); + public String handler(Model model) { + model.addAttribute("date", LocalDateTime.now()); return "WarInitializerApplication is up and running!"; } } -} \ No newline at end of file +} diff --git a/spring-boot/src/test/java/com/baeldung/servletinitializer/WarInitializerApplicationTest.java b/spring-boot/src/test/java/com/baeldung/servletinitializer/WarInitializerApplicationTest.java index 8d6247545d..a3ee30ef49 100644 --- a/spring-boot/src/test/java/com/baeldung/servletinitializer/WarInitializerApplicationTest.java +++ b/spring-boot/src/test/java/com/baeldung/servletinitializer/WarInitializerApplicationTest.java @@ -24,9 +24,9 @@ public class WarInitializerApplicationTest { @Test public void whenContextRootUrlIsAccessed_thenStatusIsOk() throws Exception { mockMvc.perform(get("/")) - .andExpect(status().is(200)); + .andExpect(status().is(200)); } - + @Test public void whenContextRootUrlIsAccesed_thenCorrectStringIsReturned() throws Exception { mockMvc.perform(get("/"))