From 2f409949d2336c402c80c0f99adb2adea0657a6d Mon Sep 17 00:00:00 2001 From: johnniang <1340692778@qq.com> Date: Thu, 21 Feb 2019 00:36:05 +0800 Subject: [PATCH] Refactor ApiGalleryController --- .../controller/api/ApiGalleryController.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/main/java/cc/ryanc/halo/web/controller/api/ApiGalleryController.java b/src/main/java/cc/ryanc/halo/web/controller/api/ApiGalleryController.java index a94f4355c..8f3aa0d3d 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/api/ApiGalleryController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/api/ApiGalleryController.java @@ -52,13 +52,8 @@ public class ApiGalleryController { * @return JsonResult */ @GetMapping - public JsonResult galleries() { - final List galleries = galleryService.listAll(); - if (null != galleries && galleries.size() > 0) { - return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), galleries); - } else { - return new JsonResult(ResponseStatusEnum.EMPTY.getCode(), ResponseStatusEnum.EMPTY.getMsg()); - } + public List galleries() { + return galleryService.listAll(); } /** @@ -89,12 +84,7 @@ public class ApiGalleryController { * @return JsonResult */ @GetMapping(value = "/{id}") - public JsonResult galleries(@PathVariable("id") Long id) { - final Optional gallery = galleryService.fetchById(id); - if (gallery.isPresent()) { - return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), gallery.get()); - } else { - return new JsonResult(ResponseStatusEnum.NOTFOUND.getCode(), ResponseStatusEnum.NOTFOUND.getMsg()); - } + public Gallery galleries(@PathVariable("id") Long id) { + return galleryService.getById(id); } }