Merge pull request #103 from nettee-space/feature/fix-board-rest-client

🐞 Board > Rest Client: 임포트, Non-static 전환 등 Nettee Client의 수정이 덜 반영된 영역을 수정

Author: silberbullet

core/client/nettee-client-api/src/main/java/nettee/client/propeties/ClientProperties.java

@@ -13,9 +13,17 @@ public record ClientProperties(
         Map<String, String> url
 ) {
     public ClientProperties {
+        if (baseUrl == null || baseUrl.isEmpty()) {
+            baseUrl = "http://localhost:8080";
+            log.warn("baseUrl is null or empty");
+        } else {
+            baseUrl = baseUrl.strip();
+        }
+
         log.debug("baseUrl url: {}", baseUrl);
-        
-        for(Entry<String, String> entry : url.entrySet()) {
+
+        for (Entry<String, String> entry : url.entrySet()) {
+            entry.setValue(entry.getValue().strip());
             log.debug((entry.getKey() + ": " + entry.getValue()));
         }
     }

gradle.properties

@@ -67,7 +67,7 @@ boardReadModel=:board:board-api:board-readmodel
 boardApplication=:board:board-application
 boardRdbAdapter=:board:board-rdb-adapter
 boardWebMvcAdapter=:board:board-webmvc
-boardRestClient=:board:board-nettee-client
+boardRestClient=:board:board-board-nettee-client
 
 # comment
 comment=:comment

monolith/main-runner/build.gradle.kts

@@ -1,9 +1,6 @@
 import org.springframework.boot.gradle.tasks.bundling.BootJar
 
 val board: String by project
-val article: String by project
-val comment: String by project
-val views: String by project
 
 version = "0.0.1-SNAPSHOT"
 
@@ -15,9 +12,7 @@ dependencies {
 
     // services
     implementation(project(board))
-    implementation(project(article))
-    implementation(project(views))
-    implementation(project(comment))
+
     implementation(project(":rest-client"))
 
     // webmvc

monolith/main-runner/src/main/java/nettee/main/MainApplication.java

@@ -11,5 +11,4 @@ public class MainApplication {
     public static void main(String[] args) {
         SpringApplication.run(MainApplication.class, args);
     }
-    
 }

services/board/application/src/main/java/nettee/board/port/BoardCommandNetteeClientPort.java renamed to services/board/application/src/main/java/nettee/board/application/port/BoardCommandNetteeClientPort.java

@@ -1,7 +1,7 @@
-package nettee.board.port;
+package nettee.board.application.port;
 
 import nettee.board.domain.Board;
 
 public interface BoardCommandNetteeClientPort {
-    Board save();
+    Board save(Board board);
 }

services/board/board.settings.gradle.kts

@@ -33,7 +33,7 @@ include(
     boardApplication,
     boardRdbAdapter,
     boardWebMvcAdapter,
-//    boardRestClient,
+    boardRestClient,
 )
 
 project(board).projectDir = boardDirectory("board")
@@ -44,4 +44,4 @@ project(boardReadModel).projectDir = boardDirectory("readmodel")
 project(boardApplication).projectDir = boardDirectory("application")
 project(boardRdbAdapter).projectDir = boardDirectory("rdb")
 project(boardWebMvcAdapter).projectDir = boardDirectory("web-mvc")
-//project(boardRestClient).projectDir = boardDirectory("board-nettee-client") // don't import yet, cuz including errors
+project(boardRestClient).projectDir = boardDirectory("board-nettee-client")

services/board/build.gradle.kts

@@ -2,10 +2,12 @@ val boardApi: String by project
 val boardApplication: String by project
 val boardRdbAdapter: String by project
 val boardWebMvcAdapter: String by project
+val boardRestClient: String by project
 
 dependencies {
     api(project(boardApi))
     api(project(boardApplication))
     api(project(boardRdbAdapter))
     api(project(boardWebMvcAdapter))
+    api(project(boardRestClient))
 }

services/board/driven/board-nettee-client/build.gradle.kts

@@ -1,4 +1,8 @@
+val boardApi: String by project
+val boardApplication: String by project
+
 dependencies {
-    api(project(":board:board-application"))
+    api(project(boardApi))
+    api(project(boardApplication))
     api(project(":rest-client"))
 }

services/board/driven/board-nettee-client/src/main/java/nettee/board/client/BoardCommandNetteeClient.java

@@ -0,0 +1,26 @@
+package nettee.board.client;
+
+import lombok.RequiredArgsConstructor;
+import nettee.board.domain.Board;
+import nettee.board.application.port.BoardCommandNetteeClientPort;
+import nettee.restclient.NetteeClient;
+import nettee.client.request.NetteeRequest;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class BoardCommandNetteeClientAdapter implements BoardCommandNetteeClientPort {
+
+    private final NetteeClient netteeClient;
+
+    @Override
+    public Board save(Board board) {
+        return netteeClient.post(NetteeRequest.<Board>builder()
+                .domain("board")
+                .path("/boards")
+                .body(board)
+                .responseType(Board.class)
+                .build()
+        );
+    }
+}