github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove deprecated option methods

pull/146/head
johnniang 2019-05-07 09:51:17 +08:00
parent b82c39e620
commit 8adf79432c
3 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/run/halo/app/controller/admin/api/OptionController.java
View File

@ -50,13 +50,6 @@ public class OptionController {
return optionService.listOptions(keys); 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") @PostMapping("map_view/saving")
@ApiOperation("Saves options by option map") @ApiOperation("Saves options by option map")
public void saveOptionsWithMapView(@RequestBody Map<String, String> optionMap) { public void saveOptionsWithMapView(@RequestBody Map<String, String> optionMap) {

13
src/main/java/run/halo/app/service/OptionService.java
View File

@ -73,18 +73,14 @@ public interface OptionService extends CrudService<Option, Integer> {
@NonNull @NonNull
Map<String, Object> listOptions(); Map<String, Object> listOptions();
@NonNull
Map<String, Object> listOptions(List<String> keys);
/** /**
* List by keys * Lists options by key list.
* *
* @param params params * @param keys key list
* @return Map * @return a map of option
*/ */
@NonNull @NonNull
@Deprecated Map<String, Object> listOptions(@Nullable List<String> keys);
Map<String, Object> listByKeys(String params);
/** /**
* Lists all option dtos. * Lists all option dtos.
@ -290,6 +286,7 @@ public interface OptionService extends CrudService<Option, Integer> {
/** /**
* Gets blog title. * Gets blog title.
*
* @return blog title. * @return blog title.
*/ */
@NonNull @NonNull

12
src/main/java/run/halo/app/service/impl/OptionServiceImpl.java
View File

@ -193,18 +193,6 @@ public class OptionServiceImpl extends AbstractCrudService<Option, Integer> impl
return result; 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 @Override
public List<OptionDTO> listDtos() { public List<OptionDTO> listDtos() {
List<OptionDTO> result = new LinkedList<>(); List<OptionDTO> result = new LinkedList<>();