modify webflux 2.0.0.M1 & refactoring code

Author: heowc

SpringBootWebFlux/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '2.0.0.BUILD-SNAPSHOT'
+		springBootVersion = '2.0.0.M1'
 	}
 	repositories {
 		mavenCentral()

SpringBootWebFlux/src/main/java/com/tistory/heowc/SpringBootWebFluxApplication.java

@@ -1,7 +1,6 @@
 package com.tistory.heowc;
 
-import com.tistory.heowc.domain.Message;
-import com.tistory.heowc.repository.MessageRepository;
+import com.tistory.heowc.service.MessageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
@@ -11,21 +10,16 @@
 @SpringBootApplication
 public class SpringBootWebFluxApplication {
 
-	@Autowired MessageRepository messageRepository;
+	@Autowired MessageService messageService;
 
 	public static void main(String[] args) {
 		SpringApplication.run(SpringBootWebFluxApplication.class, args);
 	}
 
-//	@Bean
-//	public WebClient webClient() {
-//		return WebClient.create("http://localhost:8080/");
-//	}
-//
 	@Bean
 	public CommandLineRunner commandLineRunner() {
 		return args -> {
-			messageRepository.save(new Message("hi"));
+			messageService.insert("hi");
 		};
 	}
 }

SpringBootWebFlux/src/main/java/com/tistory/heowc/repository/MessageRepository.java

@@ -2,14 +2,9 @@
 
 import com.tistory.heowc.domain.Message;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Repository;
 
-import java.util.concurrent.CompletableFuture;
-
-@Async
 @Repository
 public interface MessageRepository extends JpaRepository<Message, Long> {
 
-    CompletableFuture<Message> findByIdx(Long idx);
 }

SpringBootWebFlux/src/main/java/com/tistory/heowc/service/MessageService.java

@@ -0,0 +1,13 @@
+package com.tistory.heowc.service;
+
+import com.tistory.heowc.domain.Message;
+
+import java.util.concurrent.CompletableFuture;
+
+public interface MessageService {
+
+    CompletableFuture<Message> findByOne(Long idx);
+    CompletableFuture<Message> insert(String content);
+    CompletableFuture<Message> update(final Message message);
+    void delete(Long idx);
+}

SpringBootWebFlux/src/main/java/com/tistory/heowc/service/MessageServiceImpl.java

@@ -0,0 +1,43 @@
+package com.tistory.heowc.service;
+
+
+import com.tistory.heowc.domain.Message;
+import com.tistory.heowc.repository.MessageRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.concurrent.CompletableFuture;
+
+@Service
+@Transactional
+@Async
+public class MessageServiceImpl implements MessageService {
+
+    @Autowired MessageRepository messageRepository;
+
+    @Override
+    public CompletableFuture<Message> findByOne(Long idx) {
+        return CompletableFuture.completedFuture(messageRepository.findById(idx).get());
+    }
+
+    @Override
+    public CompletableFuture<Message> insert(String content) {
+        return CompletableFuture.completedFuture(messageRepository.save(new Message(content)));
+    }
+
+    @Override
+    public CompletableFuture<Message> update(final Message message) {
+        return CompletableFuture.completedFuture(messageRepository.findById(message.getIdx()).get())
+                                .thenApply(msg -> {
+                                    msg.setContent(message.getContent());
+                                    return msg;
+                                });
+    }
+
+    @Override
+    public void delete(Long idx) {
+        messageRepository.deleteById(idx);
+    }
+}

SpringBootWebFlux/src/main/java/com/tistory/heowc/web/MessageController.java

@@ -1,7 +1,7 @@
 package com.tistory.heowc.web;
 
 import com.tistory.heowc.domain.Message;
-import com.tistory.heowc.repository.MessageRepository;
+import com.tistory.heowc.service.MessageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Mono;
@@ -10,20 +10,25 @@
 @RequestMapping("message")
 public class MessageController {
 
-    @Autowired MessageRepository messageRepository;
+    @Autowired MessageService messageService;
 
     @GetMapping("{idx}")
-    public Mono<Message> findBy(@PathVariable Long idx) {
-        return Mono.fromCompletionStage(messageRepository.findByIdx(idx));
+    public Mono<Message> findByOne(@PathVariable Long idx) {
+        return Mono.fromCompletionStage(messageService.findByOne(idx));
     }
 
     @PostMapping
-    public void create(@RequestBody Mono<Message> message) {
-        message.subscribe(entity -> messageRepository.save(entity));
+    public Mono<Message> insert(@RequestBody Mono<Message> message) {
+        return Mono.fromCompletionStage(messageService.insert(message.block().getContent()));
+    }
+
+    @PutMapping
+    public Mono<Message> update(@RequestBody Mono<Message> message) {
+        return Mono.fromCompletionStage(messageService.update(message.block()));
     }
 
     @DeleteMapping("{idx}")
     public void deleteByIdx(@PathVariable Long idx) {
-        messageRepository.deleteById(idx);
+        messageService.delete(idx);
     }
 }

SpringBootWebFlux/src/test/java/com/tistory/heowc/web/MessageControllerTest.java

@@ -0,0 +1,57 @@
+package com.tistory.heowc.web;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.reactive.server.WebTestClient;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class MessageControllerTest {
+
+    private WebTestClient webClient;
+
+    @Before
+    public void before_init() throws Exception {
+        webClient = WebTestClient.bindToServer().baseUrl("http://localhost:8080/").build();
+    }
+
+    @Test
+    public void test_findByOne() throws Exception {
+        webClient.get()
+                .uri("message/{idx}", 1L)
+                .exchange().expectBody()
+                .consumeAsStringWith(System.out::println);
+    }
+
+    @Test
+    public void test_insert() throws Exception {
+        webClient.post()
+                .uri("message")
+                .contentType(MediaType.APPLICATION_JSON)
+                .syncBody("{\"content\": \"h2\"}")
+                .exchange().expectBody()
+                .consumeAsStringWith(System.out::println);
+    }
+
+    @Test
+    public void test_update() throws Exception {
+        webClient.put()
+                .uri("message")
+                .contentType(MediaType.APPLICATION_JSON)
+                .syncBody("{\"idx\": 1, \"content\": \"h2\"}")
+                .exchange().expectBody()
+                .consumeAsStringWith(System.out::println);
+    }
+
+    @Test
+    public void test_deleteByIdx() throws Exception {
+        webClient.delete()
+                .uri("message/{idx}", 1L)
+                .exchange().expectStatus().isOk();
+    }
+
+}