Commit210ddf7

th37rose

authored and

committed

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

1 parent8407304 commit210ddf7Copy full SHA for 210ddf7

File tree

+15

-16

lines changed

+15

-16

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`	`1`	`packageorg.lowcoder.domain.serversetting.service;`
`2`	`2`
`3`		`-importorg.lowcoder.domain.serversetting.model.ServerSetting;`
`4`		`-importreactor.core.publisher.Flux;`
	`3`	`+importreactor.core.publisher.Mono;`
	`4`	`+`
	`5`	`+importjava.util.Map;`
`5`	`6`
`6`	`7`	`publicinterfaceServerSettingService {`
`7`	`8`
`8`		`-Flux<ServerSetting>findAll();`
	`9`	`+Mono<Map<String,String>>getServerSettingsMap();`
`9`	`10`	`}`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@`
`2`	`2`
`3`	`3`	`importlombok.extern.slf4j.Slf4j;`
`4`	`4`	`importorg.lowcoder.domain.serversetting.model.ServerSetting;`
`5`		`-importorg.lowcoder.sdk.exception.BizError;`
`6`		`-importorg.lowcoder.sdk.exception.BizException;`
`7`	`5`	`importorg.springframework.beans.factory.annotation.Autowired;`
`8`	`6`	`importorg.springframework.stereotype.Service;`
`9`	`7`	`importreactor.core.publisher.Flux;`
`@@ -39,8 +37,8 @@ public ServerSettingServiceImpl(ServerSettingRepository repository) {`
`39`	`37`	`}`
`40`	`38`
`41`	`39`	`@Override`
`42`		`-publicFlux<ServerSetting>findAll() {`
`43`		`-returnrepository.findAll();`
	`40`	`+publicMono<Map<String,String>>getServerSettingsMap() {`
	`41`	`+returnrepository.findAll().collectMap(ServerSetting::getKey,ServerSetting::getValue);`
`44`	`42`	`}`
`45`	`43`
`46`	`44`	`@PostConstruct`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,21 @@`
`1`	`1`	`packageorg.lowcoder.api.config;`
`2`	`2`
`3`	`3`	`importlombok.RequiredArgsConstructor;`
`4`		`-importorg.lowcoder.api.framework.view.ResponseView;`
`5`	`4`	`importorg.lowcoder.domain.serversetting.model.ServerSetting;`
`6`		`-importorg.lowcoder.domain.serversetting.service.ServerSettingRepository;`
`7`	`5`	`importorg.lowcoder.domain.serversetting.service.ServerSettingService;`
`8`	`6`	`importorg.springframework.web.bind.annotation.RestController;`
`9`		`-importreactor.core.publisher.Flux;`
	`7`	`+importreactor.core.publisher.Mono;`
	`8`	`+`
	`9`	`+importjava.util.Map;`
`10`	`10`
`11`	`11`	`@RequiredArgsConstructor`
`12`	`12`	`@RestController`
`13`	`13`	`publicclassServerSettingControllerimplementsServerSettingEndpoints`
`14`	`14`	`{`
`15`	`15`	`privatefinalServerSettingServiceserverSettingService;`
`16`	`16`	`@Override`
`17`		`-publicFlux<ServerSetting>getServerSettings() {`
`18`		`-returnserverSettingService.findAll();`
	`17`	`+publicMono<Map<String,String>>getServerSettings() {`
	`18`	`+returnserverSettingService.getServerSettingsMap();`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`}`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`packageorg.lowcoder.api.config;`
`2`	`2`
`3`	`3`	`importio.swagger.v3.oas.annotations.Operation;`
`4`		`-importorg.lowcoder.api.framework.view.ResponseView;`
`5`		`-importorg.lowcoder.domain.serversetting.model.ServerSetting;`
`6`	`4`	`importorg.lowcoder.infra.constant.NewUrl;`
`7`	`5`	`importorg.lowcoder.infra.constant.Url;`
`8`	`6`	`importorg.springframework.web.bind.annotation.GetMapping;`
`9`	`7`	`importorg.springframework.web.bind.annotation.RequestMapping;`
`10`	`8`	`importorg.springframework.web.bind.annotation.RestController;`
`11`		`-importreactor.core.publisher.Flux;`
	`9`	`+importreactor.core.publisher.Mono;`
	`10`	`+`
	`11`	`+importjava.util.Map;`
`12`	`12`
`13`	`13`	`@RestController`
`14`	`14`	`@RequestMapping(value = {Url.SERVER_SETTING_URL,NewUrl.SERVER_SETTING_URL})`
`@@ -23,5 +23,5 @@ public interface ServerSettingEndpoints`
`23`	`23`	`description ="Retrieve the list of server settings for Lowcoder."`
`24`	`24`	`)`
`25`	`25`	`@GetMapping`
`26`		`-Flux<ServerSetting>getServerSettings();`
	`26`	`+Mono<Map<String,String>>getServerSettings();`
`27`	`27`	`}`

Comments

(0)