From d2778ddc78a37971b7e571720be969c2edd064e7 Mon Sep 17 00:00:00 2001 From: jackdaw Date: Wed, 16 Nov 2016 11:08:31 +0900 Subject: [PATCH] remove hello package --- src/main/java/hello/HelloController.java | 55 ------- src/main/java/hello/JPAConfiguration.java | 17 -- src/main/java/hello/entity/Member.java | 60 ------- .../hello/repository/MemberRepository.java | 19 --- src/test/java/hello/HelloControllerTest.java | 155 ------------------ .../repository/MemberRepositoryTest.java | 73 --------- 6 files changed, 379 deletions(-) delete mode 100644 src/main/java/hello/HelloController.java delete mode 100644 src/main/java/hello/JPAConfiguration.java delete mode 100644 src/main/java/hello/entity/Member.java delete mode 100644 src/main/java/hello/repository/MemberRepository.java delete mode 100644 src/test/java/hello/HelloControllerTest.java delete mode 100644 src/test/java/hello/repository/MemberRepositoryTest.java diff --git a/src/main/java/hello/HelloController.java b/src/main/java/hello/HelloController.java deleted file mode 100644 index c2bc6c8..0000000 --- a/src/main/java/hello/HelloController.java +++ /dev/null @@ -1,55 +0,0 @@ -package hello; - -import hello.entity.Member; -import hello.repository.MemberRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * Created by jackdaw on 16. 11. 9. - */ -@RestController -public class HelloController { - - @Autowired - MemberRepository memberRepository; - -// @RequestMapping("/member") -// public List index() { -// return memberRepository.findAll(); -// } - - @RequestMapping(value = "/member/{id}", method = RequestMethod.GET) - public Member get(@PathVariable(value = "id") long id) { - return memberRepository.findOne(id); - } - - @RequestMapping(value = "/member", method = RequestMethod.GET) - @ResponseBody - public List getList() { - return memberRepository.findAll(); - } - -// @RequestMapping(value = "/member/{id}", method = RequestMethod.PATCH) -// @ResponseBody -// public Member patch(@PathVariable(value = "id") long id, @RequestBody Member member) { -// memberRepository.save(member); -// return member; -// } -// -// @RequestMapping(value = "/member/{id}", method = RequestMethod.PUT) -// @ResponseBody -// public Member update(@PathVariable(value = "id") long id, @RequestBody Member member) { -// memberRepository.save(member); -// return member; -// } -// -// @RequestMapping(value = "/member/{id}", method = RequestMethod.DELETE) -// @ResponseBody -// public List delete(@PathVariable(value = "id") long id) { -// memberRepository.delete(id); -// return memberRepository.findAll(); -// } -} diff --git a/src/main/java/hello/JPAConfiguration.java b/src/main/java/hello/JPAConfiguration.java deleted file mode 100644 index 6003460..0000000 --- a/src/main/java/hello/JPAConfiguration.java +++ /dev/null @@ -1,17 +0,0 @@ -package hello; - - -/** - * Created by jackdaw on 16. 11. 11. - */ -//@Configuration -//public class JPAConfiguration extends RepositoryRestMvcConfiguration { -// -// @Override -// protected void configureRepositoryRestConfiguration(RepositoryRestConfiguration config) { -// config.exposeIdsFor(Member.class); -// //config.setDefaultMediaType(MediaType.APPLICATION_JSON); -// //config.useHalAsDefaultJsonMediaType(false); -// } -//} - diff --git a/src/main/java/hello/entity/Member.java b/src/main/java/hello/entity/Member.java deleted file mode 100644 index 1fda6a3..0000000 --- a/src/main/java/hello/entity/Member.java +++ /dev/null @@ -1,60 +0,0 @@ -package hello.entity; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -import javax.persistence.*; - -/** - * Created by jackdaw on 16. 11. 10. - */ - -@Entity -@JsonIgnoreProperties(ignoreUnknown = true) -public class Member { - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - private long id; - - @Column - private String name; - - @Column - private int age; - - public Member() {} - - public Member(String name, int age) { - this.name = name; - this.age = age; - } - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getAge() { - return age; - } - - public void setAge(int age) { - this.age = age; - } - - @Override - public String toString() { - return "[" + id + "] name = " + name + ", age = " + age; - } - -} diff --git a/src/main/java/hello/repository/MemberRepository.java b/src/main/java/hello/repository/MemberRepository.java deleted file mode 100644 index 4657b03..0000000 --- a/src/main/java/hello/repository/MemberRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -package hello.repository; - -import hello.entity.Member; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.rest.core.annotation.RepositoryRestResource; - -/** - * Created by jackdaw on 16. 11. 10. - */ - -@RepositoryRestResource(collectionResourceRel = "member", path = "member") -public interface MemberRepository extends JpaRepository { -// List findByNameAndAgeLessThan(String name, int age); -// -// @Query("select t from Member t where name=:name and age < :age") -// List findByNameAndAgeLessThanSQL(@Param("name") String name, @Param("age") int age); -// -// List findByNameAndAgeLessThanOrderByAgeDesc(String name, int age); -} diff --git a/src/test/java/hello/HelloControllerTest.java b/src/test/java/hello/HelloControllerTest.java deleted file mode 100644 index 7cb72f8..0000000 --- a/src/test/java/hello/HelloControllerTest.java +++ /dev/null @@ -1,155 +0,0 @@ -package hello; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.loafle.bridge.Application; -import hello.entity.Member; -import hello.repository.MemberRepository; -import org.apache.log4j.Logger; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.WebIntegrationTest; -import org.springframework.http.MediaType; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.MvcResult; - -import java.util.List; - -import static org.hamcrest.CoreMatchers.equalTo; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup; - -/** - * Created by jackdaw on 16. 11. 10. - */ - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = Application.class) -@WebIntegrationTest -public class HelloControllerTest { - - private MockMvc mockMvc; -// @Autowired -// MemberRe controller; - @Autowired - MemberRepository repo; - Logger logger = Logger.getLogger(this.getClass()); - - @Before - public void setUp() throws Exception { - mockMvc = standaloneSetup(repo).build(); - repo.save(new Member("1",1)); - repo.save(new Member("2",2)); - repo.save(new Member("2",2)); - } - - private String jsonStringFromObject(Object object) throws JsonProcessingException { - ObjectMapper mapper = new ObjectMapper(); - return mapper.writeValueAsString(object); - } - - @After - public void tearDown() throws Exception { - repo.deleteAll(); - } - - @Test - public void index() throws Exception { - - String jsonString = jsonStringFromObject(repo.findAll()); - logger.info(jsonString); - mockMvc.perform(get("/member")).andExpect(status().isOk()).andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON)) - .andExpect(content().string(equalTo(jsonString))); - } - - @Test - public void getMember() throws Exception { - List list = repo.findAll(); - String jsonString = this.jsonStringFromObject(list.get(0)); - logger.info(jsonString); - mockMvc.perform(get("/member/{id}", list.get(0).getId())) - .andExpect(status().isOk()) - .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON)) - .andExpect(content().string(equalTo(jsonString))); - } - - @Test - public void createMember() throws Exception { - Member b = new Member("111",1111); - String jsonString = this.jsonStringFromObject(b); - - MvcResult result = mockMvc.perform(post("/member") - .contentType(MediaType.APPLICATION_JSON) - .content(jsonString)) - .andExpect(status().isOk()) - .andReturn(); - - logger.info(result.getResponse().getContentAsString()); - } - - @Test - public void patchMember() throws Exception { - List list = repo.findAll(); - String jsonString = this.jsonStringFromObject(list.get(0)); - logger.info(jsonString); - list.get(0).setName("test"); - list.get(0).setAge(9999); - jsonString = this.jsonStringFromObject(list.get(0)); - - - MvcResult result = mockMvc.perform( - patch("/member/{id}",list.get(0).getId()). - contentType(MediaType.APPLICATION_JSON). - content(jsonString)). - andExpect(status().isOk()). - andReturn(); - logger.info(result.getResponse().getContentAsString()); - } - - @Test - public void updateMember() throws Exception { - List list = repo.findAll(); - String jsonString = this.jsonStringFromObject(list.get(0)); - logger.info(jsonString); - list.get(0).setName("test"); - list.get(0).setAge(9999); - jsonString = this.jsonStringFromObject(list.get(0)); - - - MvcResult result = mockMvc.perform( - put("/member/{id}",list.get(0).getId()). - contentType(MediaType.APPLICATION_JSON). - content(jsonString)). - andExpect(status().isOk()). - andReturn(); - logger.info(result.getResponse().getContentAsString()); - } - - @Test - public void deleteMember() throws Exception { - List list = repo.findAll(); - - long id = list.get(0).getId(); - String jsonString = this.jsonStringFromObject(list); - - list.remove(0); - String compareString = this.jsonStringFromObject(list); - - mockMvc.perform(delete("/member/{id}", id) - .content(jsonString)) - .andExpect(status().isOk()) - .andExpect(content().string(equalTo(compareString))); - - - - - } - -} \ No newline at end of file diff --git a/src/test/java/hello/repository/MemberRepositoryTest.java b/src/test/java/hello/repository/MemberRepositoryTest.java deleted file mode 100644 index a1ca9de..0000000 --- a/src/test/java/hello/repository/MemberRepositoryTest.java +++ /dev/null @@ -1,73 +0,0 @@ -package hello.repository; - -import com.loafle.bridge.Application; -import hello.entity.Member; -import org.junit.After; -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 java.util.List; - -import static org.junit.Assert.assertEquals; - -/** - * Created by jackdaw on 16. 11. 10. - */ - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = Application.class) -public class MemberRepositoryTest { - @Autowired - MemberRepository repo; - - @Before - public void setup() { - repo.deleteAll(); - repo.save(new Member("1",1)); - repo.save(new Member("2",2)); - repo.save(new Member("3",3)); - repo.save(new Member("4",4)); - repo.save(new Member("5",5)); - } - - @After - public void down() { - repo.deleteAll(); - } - - @Test - public void create() { - Member m = new Member("test",1); - Member n = repo.save(m); - - assertEquals(m.getId(),n.getId()); - } - - @Test - public void getAll() { - assertEquals(repo.findAll().size(),5); - } - - @Test - public void delete() { - List l = repo.findAll(); - Member m = l.get(0); - repo.delete(m.getId()); - assertEquals(repo.findAll().size(),4); - } - - @Test - public void update() { - List l = repo.findAll(); - Member m = l.get(0); - m.setName("TTTTT"); - - Member n = repo.save(m); - assertEquals(m.getName(),n.getName()); - } - -} \ No newline at end of file