zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Normalize http response entity with ResponseEntity by spring

Browse Source
This commit is contained in:
pbting 2019-08-09 12:33:13 +08:00
parent 68f170c930
commit 7c5b00291b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
naming/src/main/java/com/alibaba/nacos/naming/controllers/DistroController.java
View File

@ -69,7 +69,7 @@ public class DistroController {
private SwitchDomain switchDomain;
@RequestMapping(value = "/datum", method = RequestMethod.PUT)
public String onSyncDatum(HttpServletRequest request) throws Exception {
public ResponseEntity onSyncDatum(HttpServletRequest request) throws Exception {
String entity = IOUtils.toString(request.getInputStream(), "UTF-8");
@ -92,18 +92,18 @@ public class DistroController {
consistencyService.onPut(entry.getKey(), entry.getValue().value);
}
}
return "ok";
return ResponseEntity.ok("ok");
}
@RequestMapping(value = "/checksum", method = RequestMethod.PUT)
public String syncChecksum(HttpServletRequest request, HttpServletResponse response) throws Exception {
public ResponseEntity syncChecksum(HttpServletRequest request, HttpServletResponse response) throws Exception {
String source = WebUtils.required(request, "source");
String entity = IOUtils.toString(request.getInputStream(), "UTF-8");
Map<String, String> dataMap =
serializer.deserialize(entity.getBytes(), new TypeReference<Map<String, String>>() {
});
consistencyService.onReceiveChecksums(dataMap, source);
return "ok";
return ResponseEntity.ok("ok");
}
@RequestMapping(value = "/datum", method = RequestMethod.GET)
@ -126,7 +126,8 @@ public class DistroController {
}
@RequestMapping(value = "/datums", method = RequestMethod.GET)
public void getAllDatums(HttpServletRequest request, HttpServletResponse response) throws Exception {
response.getWriter().write(new String(serializer.serialize(dataStore.getDataMap()), StandardCharsets.UTF_8));
public ResponseEntity getAllDatums(HttpServletRequest request, HttpServletResponse response) throws Exception {
String content = new String(serializer.serialize(dataStore.getDataMap()), StandardCharsets.UTF_8);
return ResponseEntity.ok(content);
}
}