diff --git a/core/client/nettee-client-api/src/main/java/nettee/client/propeties/ClientProperties.java b/core/client/nettee-client-api/src/main/java/nettee/client/propeties/ClientProperties.java index d0a77774..56889a68 100644 --- a/core/client/nettee-client-api/src/main/java/nettee/client/propeties/ClientProperties.java +++ b/core/client/nettee-client-api/src/main/java/nettee/client/propeties/ClientProperties.java @@ -13,9 +13,17 @@ public record ClientProperties( Map 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 entry : url.entrySet()) { + + for (Entry entry : url.entrySet()) { + entry.setValue(entry.getValue().strip()); log.debug((entry.getKey() + ": " + entry.getValue())); } } diff --git a/gradle.properties b/gradle.properties index 7addbe4c..a3b52188 100644 --- a/gradle.properties +++ b/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 diff --git a/monolith/main-runner/build.gradle.kts b/monolith/main-runner/build.gradle.kts index 66f0e269..dd2dbe03 100644 --- a/monolith/main-runner/build.gradle.kts +++ b/monolith/main-runner/build.gradle.kts @@ -9,12 +9,11 @@ dependencies { implementation(project(":exception-handler-core")) implementation(project(":jpa-core")) implementation(project(":cors-webmvc")) + implementation(project(":rest-client")) // services implementation(project(board)) - implementation(project(":rest-client")) - // webmvc implementation("org.springframework.boot:spring-boot-starter-web") diff --git a/monolith/main-runner/src/main/java/nettee/main/MainApplication.java b/monolith/main-runner/src/main/java/nettee/main/MainApplication.java index 7c63edcc..523db272 100644 --- a/monolith/main-runner/src/main/java/nettee/main/MainApplication.java +++ b/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); } - } diff --git a/services/board/application/src/main/java/nettee/board/port/BoardCommandNetteeClientPort.java b/services/board/application/src/main/java/nettee/board/application/port/BoardCommandNetteeClientPort.java similarity index 55% rename from services/board/application/src/main/java/nettee/board/port/BoardCommandNetteeClientPort.java rename to services/board/application/src/main/java/nettee/board/application/port/BoardCommandNetteeClientPort.java index 1703ef36..115ca20b 100644 --- a/services/board/application/src/main/java/nettee/board/port/BoardCommandNetteeClientPort.java +++ b/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); } diff --git a/services/board/board.settings.gradle.kts b/services/board/board.settings.gradle.kts index f77518c7..5da57a56 100644 --- a/services/board/board.settings.gradle.kts +++ b/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 \ No newline at end of file +project(boardRestClient).projectDir = boardDirectory("board-nettee-client") \ No newline at end of file diff --git a/services/board/build.gradle.kts b/services/board/build.gradle.kts index 5f9bb4be..0116abb7 100644 --- a/services/board/build.gradle.kts +++ b/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)) } \ No newline at end of file diff --git a/services/board/driven/board-nettee-client/build.gradle.kts b/services/board/driven/board-nettee-client/build.gradle.kts index 6b926663..2f8dd022 100644 --- a/services/board/driven/board-nettee-client/build.gradle.kts +++ b/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")) } \ No newline at end of file diff --git a/services/board/driven/board-nettee-client/src/main/java/nettee/board/client/BoardCommandNetteeClient.java b/services/board/driven/board-nettee-client/src/main/java/nettee/board/client/BoardCommandNetteeClient.java deleted file mode 100644 index 655ae6a4..00000000 --- a/services/board/driven/board-nettee-client/src/main/java/nettee/board/client/BoardCommandNetteeClient.java +++ /dev/null @@ -1,24 +0,0 @@ -package nettee.board.client; - -import nettee.board.Board; -import nettee.board.port.BoardCommandNetteeClientPort; -import nettee.restclient.NetteeClient; -import netttee.client.request.NetteeRequest; -import org.springframework.stereotype.Component; - -import static nettee.board.BoardCommandErrorCode.BOARD_ALREADY_EXIST; - -@Component -public class BoardCommandNetteeClient implements BoardCommandNetteeClientPort { - - @Override - public Board save() { - return NetteeClient.post(NetteeRequest.builder() - .domain("board") - .path("/boards") - .customException(BOARD_ALREADY_EXIST::exception) - .responseType(Board.class) - .build() - ); - } -} diff --git a/services/board/driven/board-nettee-client/src/main/java/nettee/board/client/BoardCommandNetteeClientAdapter.java b/services/board/driven/board-nettee-client/src/main/java/nettee/board/client/BoardCommandNetteeClientAdapter.java new file mode 100644 index 00000000..2322cb4f --- /dev/null +++ b/services/board/driven/board-nettee-client/src/main/java/nettee/board/client/BoardCommandNetteeClientAdapter.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.builder() + .domain("board") + .path("/boards") + .body(board) + .responseType(Board.class) + .build() + ); + } +}