From 14530149a4dd63a969025e071e5f0a956f5dab6f Mon Sep 17 00:00:00 2001 From: Fujita Yuko Date: Mon, 28 Jan 2019 17:35:29 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=E3=83=97=E3=83=AD=E3=82=AD=E3=82=B7?= =?UTF-8?q?=E5=AF=BE=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .mvn/jvm.config | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .mvn/jvm.config diff --git a/.mvn/jvm.config b/.mvn/jvm.config new file mode 100644 index 0000000..156bfdf --- /dev/null +++ b/.mvn/jvm.config @@ -0,0 +1,4 @@ +-Dhttp.proxyHost=oskproxy.intra.tis.co.jp +-Dhttp.proxyPort=8080 +-Dhttps.proxyHost=oskproxy.intra.tis.co.jp +-Dhttps.proxyPort=8080 \ No newline at end of file From 97a92f491d0880cee1b2e271eed14c90b6f64c1b Mon Sep 17 00:00:00 2001 From: Fujita Yuko Date: Thu, 31 Jan 2019 12:22:57 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BD=BF=E3=82=8F=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=82=AF=E3=83=A9=E3=82=B9=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/DemoApplication.java | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 src/main/java/com/example/demo/DemoApplication.java diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java deleted file mode 100644 index 3f3d9f6..0000000 --- a/src/main/java/com/example/demo/DemoApplication.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.demo; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class DemoApplication { - - public static void main(String[] args) { - SpringApplication.run(DemoApplication.class, args); - } - -} - From babc334c53d1ea29b6071eba728aaf36719c090e Mon Sep 17 00:00:00 2001 From: Fujita Yuko Date: Thu, 31 Jan 2019 12:23:56 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=81=AEid=E6=A4=9C=E7=B4=A2=E3=80=81=E5=85=A8?= =?UTF-8?q?=E4=BB=B6=E6=A4=9C=E7=B4=A2=E6=A9=9F=E8=83=BD=E3=82=92=E5=AE=9F?= =?UTF-8?q?=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/message/Message.java | 14 ++++++ .../example/message/MessageApplication.java | 44 +++++++++++++++++++ .../java/com/example/message/MessageDao.java | 23 ++++++++++ .../example/message/MessageDao/selectAll.sql | 5 +++ .../example/message/MessageDao/selectById.sql | 1 + 5 files changed, 87 insertions(+) create mode 100644 src/main/java/com/example/message/Message.java create mode 100644 src/main/java/com/example/message/MessageApplication.java create mode 100644 src/main/java/com/example/message/MessageDao.java create mode 100644 src/main/resources/META-INF/com/example/message/MessageDao/selectAll.sql create mode 100644 src/main/resources/META-INF/com/example/message/MessageDao/selectById.sql diff --git a/src/main/java/com/example/message/Message.java b/src/main/java/com/example/message/Message.java new file mode 100644 index 0000000..1cf43c9 --- /dev/null +++ b/src/main/java/com/example/message/Message.java @@ -0,0 +1,14 @@ +package com.example.message; + +import org.seasar.doma.Entity; +import org.seasar.doma.GeneratedValue; +import org.seasar.doma.GenerationType; +import org.seasar.doma.Id; + +@Entity +public class Message { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + public long id; + public String content; +} diff --git a/src/main/java/com/example/message/MessageApplication.java b/src/main/java/com/example/message/MessageApplication.java new file mode 100644 index 0000000..1306309 --- /dev/null +++ b/src/main/java/com/example/message/MessageApplication.java @@ -0,0 +1,44 @@ +package com.example.message; + +import java.util.Arrays; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@SpringBootApplication +@RestController +public class MessageApplication { + + public static void main(String[] args) { + SpringApplication.run(MessageApplication.class, args); + } + + @Autowired + MessageDao messageDao; + + @Bean + CommandLineRunner runner() { + return args -> Arrays.asList("なぶ", "Nab", "ナブラーク", "Nablarch").forEach(s -> { + Message r = new Message(); + r.content = s; + messageDao.insert(r); + }); + } + + @RequestMapping(path = "/") + List all() { + return messageDao.selectAll(); + } + + @RequestMapping(path = "/search") + Message select(@RequestParam(value="id", defaultValue="1") int id) { + return messageDao.selectById(id); + } +} \ No newline at end of file diff --git a/src/main/java/com/example/message/MessageDao.java b/src/main/java/com/example/message/MessageDao.java new file mode 100644 index 0000000..0be6039 --- /dev/null +++ b/src/main/java/com/example/message/MessageDao.java @@ -0,0 +1,23 @@ +package com.example.message; + +import java.util.List; + +import org.seasar.doma.Dao; +import org.seasar.doma.Insert; +import org.seasar.doma.Select; +import org.seasar.doma.boot.ConfigAutowireable; +import org.springframework.transaction.annotation.Transactional; + +@ConfigAutowireable +@Dao +public interface MessageDao { + @Select + List selectAll(); + + @Insert + @Transactional + int insert(Message message); + + @Select + Message selectById(int id); +} \ No newline at end of file diff --git a/src/main/resources/META-INF/com/example/message/MessageDao/selectAll.sql b/src/main/resources/META-INF/com/example/message/MessageDao/selectAll.sql new file mode 100644 index 0000000..59c52cd --- /dev/null +++ b/src/main/resources/META-INF/com/example/message/MessageDao/selectAll.sql @@ -0,0 +1,5 @@ +SELECT + id, + content +FROM message +ORDER BY id ASC \ No newline at end of file diff --git a/src/main/resources/META-INF/com/example/message/MessageDao/selectById.sql b/src/main/resources/META-INF/com/example/message/MessageDao/selectById.sql new file mode 100644 index 0000000..345fba7 --- /dev/null +++ b/src/main/resources/META-INF/com/example/message/MessageDao/selectById.sql @@ -0,0 +1 @@ +SELECT id,content FROM message WHERE id = /* id */0 \ No newline at end of file From 72a221934199d729cd4473c34c6d0e14a23db361 Mon Sep 17 00:00:00 2001 From: Fujita Yuko Date: Thu, 31 Jan 2019 12:24:36 +0900 Subject: [PATCH 4/7] =?UTF-8?q?message=E3=83=86=E3=83=BC=E3=83=96=E3=83=AB?= =?UTF-8?q?=E4=BD=9C=E6=88=90sql=E3=82=92flyway=E7=AE=A1=E7=90=86=E8=AA=B2?= =?UTF-8?q?=E3=81=AB=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V1.2__Create_messages_table.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 src/main/resources/db/migration/V1.2__Create_messages_table.sql diff --git a/src/main/resources/db/migration/V1.2__Create_messages_table.sql b/src/main/resources/db/migration/V1.2__Create_messages_table.sql new file mode 100644 index 0000000..d7da745 --- /dev/null +++ b/src/main/resources/db/migration/V1.2__Create_messages_table.sql @@ -0,0 +1,5 @@ +CREATE TABLE message ( + id serial , + content VARCHAR(100), + CONSTRAINT "PK" PRIMARY KEY (id) +); \ No newline at end of file From a9182620f80ee952c2256d3a5e6178d8c1f351f6 Mon Sep 17 00:00:00 2001 From: Fujita Yuko Date: Thu, 31 Jan 2019 14:35:49 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=E5=85=A8=E4=BB=B6=E6=A4=9C=E7=B4=A2?= =?UTF-8?q?=E3=81=AEmethod=E6=8C=87=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/message/MessageApplication.java | 51 ++++++++++--------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/example/message/MessageApplication.java b/src/main/java/com/example/message/MessageApplication.java index 1306309..1ecbc2a 100644 --- a/src/main/java/com/example/message/MessageApplication.java +++ b/src/main/java/com/example/message/MessageApplication.java @@ -9,6 +9,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -16,29 +17,29 @@ @RestController public class MessageApplication { - public static void main(String[] args) { - SpringApplication.run(MessageApplication.class, args); - } - - @Autowired - MessageDao messageDao; - - @Bean - CommandLineRunner runner() { - return args -> Arrays.asList("なぶ", "Nab", "ナブラーク", "Nablarch").forEach(s -> { - Message r = new Message(); - r.content = s; - messageDao.insert(r); - }); - } - - @RequestMapping(path = "/") - List all() { - return messageDao.selectAll(); - } - - @RequestMapping(path = "/search") - Message select(@RequestParam(value="id", defaultValue="1") int id) { - return messageDao.selectById(id); - } + public static void main(String[] args) { + SpringApplication.run(MessageApplication.class, args); + } + + @Autowired + MessageDao messageDao; + + @Bean + CommandLineRunner runner() { + return args -> Arrays.asList("なぶ", "Nab", "ナブラーク", "Nablarch").forEach(s -> { + Message r = new Message(); + r.content = s; + messageDao.insert(r); + }); + } + + @RequestMapping(method = RequestMethod.GET, path = "/") + List all() { + return messageDao.selectAll(); + } + + @RequestMapping(path = "/search") + Message select(@RequestParam(value = "id", defaultValue = "1") int id) { + return messageDao.selectById(id); + } } \ No newline at end of file From 56c347b7c9109a0b39d85cf8fc9a96a77b1182d3 Mon Sep 17 00:00:00 2001 From: Fujita Yuko Date: Thu, 31 Jan 2019 16:19:40 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=81=AE=E8=BF=BD=E5=8A=A0=E3=83=BB=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=83=BB=E6=9B=B4=E6=96=B0=E6=A9=9F=E8=83=BD=E3=82=92=E5=AE=9F?= =?UTF-8?q?=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/message/MessageApplication.java | 34 ++++++++++++------- .../java/com/example/message/MessageDao.java | 22 ++++++++---- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/example/message/MessageApplication.java b/src/main/java/com/example/message/MessageApplication.java index 1ecbc2a..de83d63 100644 --- a/src/main/java/com/example/message/MessageApplication.java +++ b/src/main/java/com/example/message/MessageApplication.java @@ -1,13 +1,10 @@ package com.example.message; -import java.util.Arrays; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; @@ -24,22 +21,33 @@ public static void main(String[] args) { @Autowired MessageDao messageDao; - @Bean - CommandLineRunner runner() { - return args -> Arrays.asList("なぶ", "Nab", "ナブラーク", "Nablarch").forEach(s -> { - Message r = new Message(); - r.content = s; - messageDao.insert(r); - }); - } - @RequestMapping(method = RequestMethod.GET, path = "/") List all() { return messageDao.selectAll(); } - @RequestMapping(path = "/search") + @RequestMapping(method = RequestMethod.GET, path = "/search") Message select(@RequestParam(value = "id", defaultValue = "1") int id) { return messageDao.selectById(id); } + + @RequestMapping(method = RequestMethod.POST, path = "/register") + void insert(@RequestParam(value = "content") String content) { + Message message = new Message(); + message.content = content; + messageDao.insert(message); + } + + @RequestMapping(method = RequestMethod.POST, path = "/delete") + void delete(@RequestParam(value = "id") int id) { + Message message = messageDao.selectById(id); + messageDao.delete(message); + } + + @RequestMapping(method = RequestMethod.POST, path = "/update") + void update(@RequestParam int id, String content) { + Message message = messageDao.selectById(id); + message.content = content; + messageDao.update(message); + } } \ No newline at end of file diff --git a/src/main/java/com/example/message/MessageDao.java b/src/main/java/com/example/message/MessageDao.java index 0be6039..34b10f5 100644 --- a/src/main/java/com/example/message/MessageDao.java +++ b/src/main/java/com/example/message/MessageDao.java @@ -3,21 +3,29 @@ import java.util.List; import org.seasar.doma.Dao; +import org.seasar.doma.Delete; import org.seasar.doma.Insert; import org.seasar.doma.Select; +import org.seasar.doma.Update; import org.seasar.doma.boot.ConfigAutowireable; import org.springframework.transaction.annotation.Transactional; @ConfigAutowireable @Dao public interface MessageDao { - @Select - List selectAll(); + @Select + List selectAll(); - @Insert - @Transactional - int insert(Message message); + @Insert + @Transactional + int insert(Message message); - @Select - Message selectById(int id); + @Select + Message selectById(int id); + + @Delete + int delete(Message message); + + @Update + int update(Message message); } \ No newline at end of file From 3caa3cb5fead9989a6c1a5a2186312e0c235202a Mon Sep 17 00:00:00 2001 From: Fujita Yuko Date: Fri, 1 Feb 2019 15:53:44 +0900 Subject: [PATCH 7/7] =?UTF-8?q?id=E3=82=92URL=E3=81=8B=E3=82=89=E5=8F=96?= =?UTF-8?q?=E5=BE=97=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/message/MessageApplication.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/example/message/MessageApplication.java b/src/main/java/com/example/message/MessageApplication.java index de83d63..de42c9a 100644 --- a/src/main/java/com/example/message/MessageApplication.java +++ b/src/main/java/com/example/message/MessageApplication.java @@ -5,13 +5,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @SpringBootApplication @RestController +@RequestMapping("/message") public class MessageApplication { public static void main(String[] args) { @@ -21,31 +24,31 @@ public static void main(String[] args) { @Autowired MessageDao messageDao; - @RequestMapping(method = RequestMethod.GET, path = "/") + @GetMapping("/") List all() { return messageDao.selectAll(); } - @RequestMapping(method = RequestMethod.GET, path = "/search") - Message select(@RequestParam(value = "id", defaultValue = "1") int id) { + @GetMapping("/{id}") + Message select(@PathVariable("id") int id) { return messageDao.selectById(id); } - @RequestMapping(method = RequestMethod.POST, path = "/register") - void insert(@RequestParam(value = "content") String content) { + @PostMapping("/register") + void insert(@RequestParam String content) { Message message = new Message(); message.content = content; messageDao.insert(message); } - @RequestMapping(method = RequestMethod.POST, path = "/delete") - void delete(@RequestParam(value = "id") int id) { + @PostMapping("/delete") + void delete(@RequestParam int id) { Message message = messageDao.selectById(id); messageDao.delete(message); } - @RequestMapping(method = RequestMethod.POST, path = "/update") - void update(@RequestParam int id, String content) { + @PostMapping("/update/{id}") + void update(@PathVariable int id, @RequestParam String content) { Message message = messageDao.selectById(id); message.content = content; messageDao.update(message);