diff --git a/src/main/java/org/codelibs/fess/app/web/api/ApiResult.java b/src/main/java/org/codelibs/fess/app/web/api/ApiResult.java index 1040a3c22..8d354272c 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/ApiResult.java +++ b/src/main/java/org/codelibs/fess/app/web/api/ApiResult.java @@ -150,11 +150,11 @@ public class ApiResult { } public static class ApiLogFilesResponse extends ApiResponse { - protected List> logfiles; + protected List> files; protected long total = 0; - public ApiLogFilesResponse logfiles(final List> logfiles) { - this.logfiles = logfiles; + public ApiLogFilesResponse files(final List> 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> files; protected long total = 0; - public ApiFilesResponse backupfiles(final List> files) { + public ApiBackupFilesResponse files(final List> files) { this.files = files; return this; } - public ApiFilesResponse total(final long total) { + public ApiBackupFilesResponse total(final long total) { this.total = total; return this; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/backup/ApiAdminBackupAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/backup/ApiAdminBackupAction.java index 71febaa28..0a239b6ac 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/backup/ApiAdminBackupAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/backup/ApiAdminBackupAction.java @@ -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 files() { final List> 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} diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/log/ApiAdminLogAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/log/ApiAdminLogAction.java index 6c02437c8..a645c52ae 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/log/ApiAdminLogAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/log/ApiAdminLogAction.java @@ -42,16 +42,16 @@ public class ApiAdminLogAction extends FessApiAdminAction { // Search Execute // ============== - // GET /api/admin/log/logfiles + // GET /api/admin/log/files @Execute - public JsonResponse logfiles() { + public JsonResponse files() { final List> 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)) {