diff --git a/src/main/java/org/codelibs/fess/app/web/admin/systeminfo/AdminSysteminfoAction.java b/src/main/java/org/codelibs/fess/app/web/admin/systeminfo/AdminSysteminfoAction.java index 512cb7f56..14f04e5e3 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/systeminfo/AdminSysteminfoAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/systeminfo/AdminSysteminfoAction.java @@ -26,6 +26,7 @@ import org.codelibs.core.lang.StringUtil; import org.codelibs.core.misc.DynamicProperties; import org.codelibs.fess.Constants; import org.codelibs.fess.app.web.base.FessAdminAction; +import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.RenderDataUtil; import org.lastaflute.web.Execute; import org.lastaflute.web.response.HtmlResponse; @@ -74,56 +75,74 @@ public class AdminSysteminfoAction extends FessAdminAction { // ============ protected void registerEnvItems(final RenderData data) { + RenderDataUtil.register(data, "envItems", getEnvItems()); + } + + protected void registerPropItems(final RenderData data) { + RenderDataUtil.register(data, "propItems", getPropItems()); + } + + protected void registerFessPropItems(final RenderData data) { + RenderDataUtil.register(data, "fessPropItems", getFessPropItems()); + } + + protected void registerBugReportItems(final RenderData data) { + RenderDataUtil.register(data, "bugReportItems", getBugReportItems()); + } + + public static List> getEnvItems() { final List> itemList = new ArrayList<>(); for (final Map.Entry entry : System.getenv().entrySet()) { itemList.add(createItem(entry.getKey(), entry.getValue())); } - RenderDataUtil.register(data, "envItems", itemList); + return itemList; } - protected void registerPropItems(final RenderData data) { + public static List> getPropItems() { final List> itemList = new ArrayList<>(); for (final Map.Entry entry : System.getProperties().entrySet()) { itemList.add(createItem(entry.getKey(), entry.getValue())); } - RenderDataUtil.register(data, "propItems", itemList); + return itemList; } - protected void registerFessPropItems(final RenderData data) { + public static List> getFessPropItems() { final List> itemList = new ArrayList<>(); + final DynamicProperties systemProperties = ComponentUtil.getSystemProperties(); for (final Map.Entry entry : systemProperties.entrySet()) { itemList.add(createItem(entry.getKey(), entry.getValue())); } - RenderDataUtil.register(data, "fessPropItems", itemList); + return itemList; } - protected void registerBugReportItems(final RenderData data) { + public static List> getBugReportItems() { final List> itemList = new ArrayList<>(); for (final String label : bugReportLabels) { itemList.add(createPropItem(label)); } + final DynamicProperties systemProperties = ComponentUtil.getSystemProperties(); for (final Map.Entry entry : systemProperties.entrySet()) { if (isBugReportTarget(entry.getKey())) { itemList.add(createItem(entry.getKey(), entry.getValue())); } } - RenderDataUtil.register(data, "bugReportItems", itemList); + return itemList; } - private boolean isBugReportTarget(final Object key) { + private static boolean isBugReportTarget(final Object key) { if ("snapshot.path".equals(key) || "label.value".equals(key)) { return false; } return true; } - protected Map createPropItem(final String key) { + protected static Map createPropItem(final String key) { return createItem(key, System.getProperty(key)); } - protected Map createItem(final Object label, final Object value) { + protected static Map createItem(final Object label, final Object value) { final Map map = new HashMap<>(2); map.put(Constants.ITEM_LABEL, label != null ? label.toString() : StringUtil.EMPTY); map.put(Constants.ITEM_VALUE, value != null ? value.toString() : StringUtil.EMPTY); 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 8d354272c..007a92430 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 @@ -189,6 +189,38 @@ public class ApiResult { } } + public static class ApiSystemInfoResponse extends ApiResponse { + protected List> envProps; + protected List> systemProps; + protected List> fessProps; + protected List> bugReportProps; + + public ApiSystemInfoResponse envProps(final List> envProps) { + this.envProps = envProps; + return this; + } + + public ApiSystemInfoResponse systemProps(final List> systemProps) { + this.systemProps = systemProps; + return this; + } + + public ApiSystemInfoResponse fessProps(final List> fessProps) { + this.fessProps = fessProps; + return this; + } + + public ApiSystemInfoResponse bugReportProps(final List> bugReportProps) { + this.bugReportProps = bugReportProps; + return this; + } + + @Override + public ApiResult result() { + return new ApiResult(this); + } + } + public static class ApiErrorResponse extends ApiResponse { protected String message; diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/systeminfo/ApiAdminSysteminfoAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/systeminfo/ApiAdminSysteminfoAction.java new file mode 100644 index 000000000..37ef953ae --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/systeminfo/ApiAdminSysteminfoAction.java @@ -0,0 +1,50 @@ +/* + * Copyright 2012-2017 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.app.web.api.admin.systeminfo; + +import static org.codelibs.fess.app.web.admin.systeminfo.AdminSysteminfoAction.getBugReportItems; +import static org.codelibs.fess.app.web.admin.systeminfo.AdminSysteminfoAction.getEnvItems; +import static org.codelibs.fess.app.web.admin.systeminfo.AdminSysteminfoAction.getFessPropItems; +import static org.codelibs.fess.app.web.admin.systeminfo.AdminSysteminfoAction.getPropItems; +import java.util.List; +import java.util.Map; + +import org.codelibs.fess.app.web.api.ApiResult; +import org.codelibs.fess.app.web.api.admin.FessApiAdminAction; +import org.lastaflute.web.Execute; +import org.lastaflute.web.response.JsonResponse; + +/** + * @author Keiichi Watanabe + */ +public class ApiAdminSysteminfoAction extends FessApiAdminAction { + + // =================================================================================== + // Search Execute + // ============== + + // GET /api/admin/systeminfo/info + @Execute + public JsonResponse info() { + final List> bugReportItems = getBugReportItems(); + final List> envItems = getEnvItems(); + final List> fessPropItems = getFessPropItems(); + final List> propItems = getPropItems(); + return asJson(new ApiResult.ApiSystemInfoResponse().bugReportProps(bugReportItems).envProps(envItems).fessProps(fessPropItems) + .systemProps(propItems).status(ApiResult.Status.OK).result()); + } + +}