0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename classes for API responses

Browse source
This commit is contained in:
Keiichi Watanabe 2017-04-29 17:33:39 +09:00
parent 164a273b6d
commit 510a3e08d3
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/org/codelibs/fess/app/web/api/ApiResult.java
View file

@ -150,11 +150,11 @@ public class ApiResult {
}
public static class ApiLogFilesResponse extends ApiResponse {
protected List<Map<String, Object>> logfiles;
protected List<Map<String, Object>> files;
protected long total = 0;
public ApiLogFilesResponse logfiles(final List<Map<String, Object>> logfiles) {
this.logfiles = logfiles;
public ApiLogFilesResponse files(final List<Map<String, Object>> files) {
this.files = files;
return this;
}
@ -169,16 +169,16 @@ public class ApiResult {
}
}
public static class ApiFilesResponse extends ApiResponse {
public static class ApiBackupFilesResponse extends ApiResponse {
protected List<Map<String, String>> files;
protected long total = 0;
public ApiFilesResponse backupfiles(final List<Map<String, String>> files) {
public ApiBackupFilesResponse files(final List<Map<String, String>> files) {
this.files = files;
return this;
}
public ApiFilesResponse total(final long total) {
public ApiBackupFilesResponse total(final long total) {
this.total = total;
return this;
}

4
src/main/java/org/codelibs/fess/app/web/api/admin/backup/ApiAdminBackupAction.java
View file

@ -36,7 +36,7 @@ import java.util.function.Consumer;
import org.codelibs.elasticsearch.runner.net.Curl;
import org.codelibs.elasticsearch.runner.net.CurlResponse;
import org.codelibs.fess.app.web.api.ApiResult;
import org.codelibs.fess.app.web.api.ApiResult.ApiFilesResponse;
import org.codelibs.fess.app.web.api.ApiResult.ApiBackupFilesResponse;
import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
@ -57,7 +57,7 @@ public class ApiAdminBackupAction extends FessApiAdminAction {
@Execute
public JsonResponse<ApiResult> files() {
final List<Map<String, String>> list = getBackupItems();
return asJson(new ApiFilesResponse().backupfiles(list).total(list.size()).status(ApiResult.Status.OK).result());
return asJson(new ApiBackupFilesResponse().files(list).total(list.size()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/backup/file/{id}

10
src/main/java/org/codelibs/fess/app/web/api/admin/log/ApiAdminLogAction.java
View file

@ -42,16 +42,16 @@ public class ApiAdminLogAction extends FessApiAdminAction {
// Search Execute
// ==============
// GET /api/admin/log/logfiles
// GET /api/admin/log/files
@Execute
public JsonResponse<ApiResult> logfiles() {
public JsonResponse<ApiResult> files() {
final List<Map<String, Object>> list = getLogFileItems();
return asJson(new ApiResult.ApiLogFilesResponse().logfiles(list).total(list.size()).status(ApiResult.Status.OK).result());
return asJson(new ApiResult.ApiLogFilesResponse().files(list).total(list.size()).status(ApiResult.Status.OK).result());
}
// GET /api/admin/log/logfile/{id}
// GET /api/admin/log/file/{id}
@Execute
public StreamResponse get$logfile(final String id) {
public StreamResponse get$file(final String id) {
final String filename = new String(Base64.getDecoder().decode(id), StandardCharsets.UTF_8).replace("..", "").replaceAll("\\s", "");
final String logFilePath = systemHelper.getLogFilePath();
if (StringUtil.isNotBlank(logFilePath)) {