Make serversetting api response to json object(key-value pairs)

th37rose · ludomikula · commit 210ddf7d2aa3 · 2024-05-20T12:01:11.000+02:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/serversetting/service/ServerSettingService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/serversetting/service/ServerSettingService.java
@@ -1,9 +1,10 @@
 package org.lowcoder.domain.serversetting.service;
 
-import org.lowcoder.domain.serversetting.model.ServerSetting;
-import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.Map;
 
 public interface ServerSettingService {
 
-    Flux<ServerSetting> findAll();
+    Mono<Map<String, String>> getServerSettingsMap();
 }
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/serversetting/service/ServerSettingServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/serversetting/service/ServerSettingServiceImpl.java
@@ -2,8 +2,6 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.lowcoder.domain.serversetting.model.ServerSetting;
-import org.lowcoder.sdk.exception.BizError;
-import org.lowcoder.sdk.exception.BizException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
@@ -39,8 +37,8 @@ public ServerSettingServiceImpl(ServerSettingRepository repository) {
     }
 
     @Override
-    public Flux<ServerSetting> findAll() {
-        return repository.findAll();
+    public Mono<Map<String, String>> getServerSettingsMap() {
+        return repository.findAll().collectMap(ServerSetting::getKey, ServerSetting::getValue);
     }
 
     @PostConstruct
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/config/ServerSettingController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/config/ServerSettingController.java
@@ -1,21 +1,21 @@
 package org.lowcoder.api.config;
 
 import lombok.RequiredArgsConstructor;
-import org.lowcoder.api.framework.view.ResponseView;
 import org.lowcoder.domain.serversetting.model.ServerSetting;
-import org.lowcoder.domain.serversetting.service.ServerSettingRepository;
 import org.lowcoder.domain.serversetting.service.ServerSettingService;
 import org.springframework.web.bind.annotation.RestController;
-import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.Map;
 
 @RequiredArgsConstructor
 @RestController
 public class ServerSettingController implements ServerSettingEndpoints
 {
     private final ServerSettingService serverSettingService;
     @Override
-    public Flux<ServerSetting> getServerSettings() {
-        return serverSettingService.findAll();
+    public Mono<Map<String, String>> getServerSettings() {
+        return serverSettingService.getServerSettingsMap();
     }
 
 }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/config/ServerSettingEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/config/ServerSettingEndpoints.java
@@ -1,14 +1,14 @@
 package org.lowcoder.api.config;
 
 import io.swagger.v3.oas.annotations.Operation;
-import org.lowcoder.api.framework.view.ResponseView;
-import org.lowcoder.domain.serversetting.model.ServerSetting;
 import org.lowcoder.infra.constant.NewUrl;
 import org.lowcoder.infra.constant.Url;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.Map;
 
 @RestController
 @RequestMapping(value = {Url.SERVER_SETTING_URL, NewUrl.SERVER_SETTING_URL})
@@ -23,5 +23,5 @@ public interface ServerSettingEndpoints
 		    description = "Retrieve the list of server settings for Lowcoder."
 	)
     @GetMapping
-    Flux<ServerSetting> getServerSettings();
+	Mono<Map<String, String>> getServerSettings();
 }
