From 8adf79432cc447130131bf317afba3adeee63d0e Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@riseup.net>
Date: Tue, 7 May 2019 09:51:17 +0800
Subject: [PATCH] Remove deprecated option methods

---
 .../app/controller/admin/api/OptionController.java  |  7 -------
 .../java/run/halo/app/service/OptionService.java    | 13 +++++--------
 .../halo/app/service/impl/OptionServiceImpl.java    | 12 ------------
 3 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/src/main/java/run/halo/app/controller/admin/api/OptionController.java b/src/main/java/run/halo/app/controller/admin/api/OptionController.java
index e76c31029..29942c840 100644
--- a/src/main/java/run/halo/app/controller/admin/api/OptionController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/OptionController.java
@@ -50,13 +50,6 @@ public class OptionController {
         return optionService.listOptions(keys);
     }
 
-    @GetMapping("map_keys")
-    @ApiOperation("List all of options by keys, replaced by `listAllWithMapView`")
-    @Deprecated
-    public Map<String, Object> listByKeysWithMapView(@RequestParam(value = "keys") String keys) {
-        return optionService.listByKeys(keys);
-    }
-
     @PostMapping("map_view/saving")
     @ApiOperation("Saves options by option map")
     public void saveOptionsWithMapView(@RequestBody Map<String, String> optionMap) {
diff --git a/src/main/java/run/halo/app/service/OptionService.java b/src/main/java/run/halo/app/service/OptionService.java
index 6a281dda6..8edd09bd6 100755
--- a/src/main/java/run/halo/app/service/OptionService.java
+++ b/src/main/java/run/halo/app/service/OptionService.java
@@ -73,18 +73,14 @@ public interface OptionService extends CrudService<Option, Integer> {
     @NonNull
     Map<String, Object> listOptions();
 
-    @NonNull
-    Map<String, Object> listOptions(List<String> keys);
-
     /**
-     * List by keys
+     * Lists options by key list.
      *
-     * @param params params
-     * @return Map
+     * @param keys key list
+     * @return a map of option
      */
     @NonNull
-    @Deprecated
-    Map<String, Object> listByKeys(String params);
+    Map<String, Object> listOptions(@Nullable List<String> keys);
 
     /**
      * Lists all option dtos.
@@ -290,6 +286,7 @@ public interface OptionService extends CrudService<Option, Integer> {
 
     /**
      * Gets blog title.
+     *
      * @return blog title.
      */
     @NonNull
diff --git a/src/main/java/run/halo/app/service/impl/OptionServiceImpl.java b/src/main/java/run/halo/app/service/impl/OptionServiceImpl.java
index 5533c2c31..813ea0f50 100644
--- a/src/main/java/run/halo/app/service/impl/OptionServiceImpl.java
+++ b/src/main/java/run/halo/app/service/impl/OptionServiceImpl.java
@@ -193,18 +193,6 @@ public class OptionServiceImpl extends AbstractCrudService<Option, Integer> impl
         return result;
     }
 
-    @Override
-    public Map<String, Object> listByKeys(String params) {
-        Assert.notNull(params, "Keys must not be null");
-        Map<String, Object> options = listOptions();
-        Map<String, Object> result = new HashMap<>();
-        String[] keysParam = params.split(",");
-        for (String key : keysParam) {
-            result.put(key, options.get(key));
-        }
-        return result;
-    }
-
     @Override
     public List<OptionDTO> listDtos() {
         List<OptionDTO> result = new LinkedList<>();