diff --git a/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java b/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java index 069568576..392a160e2 100644 --- a/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java +++ b/src/main/java/org/codelibs/fess/helper/LabelTypeHelper.java @@ -54,9 +54,10 @@ public class LabelTypeHelper { update(); } - public void update() { + public int update() { final List labelTypeList = ComponentUtil.getComponent(LabelTypeService.class).getLabelTypeList(); buildLabelTypeItems(labelTypeList); + return labelTypeList.size(); } public void refresh(final List labelTypeList) { diff --git a/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java b/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java index 65626529c..958472e9f 100644 --- a/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java +++ b/src/main/java/org/codelibs/fess/helper/PathMappingHelper.java @@ -46,7 +46,7 @@ public class PathMappingHelper { update(); } - public void update() { + public int update() { final List ptList = new ArrayList<>(); ptList.add(Constants.PROCESS_TYPE_DISPLAYING); ptList.add(Constants.PROCESS_TYPE_BOTH); @@ -58,9 +58,11 @@ public class PathMappingHelper { cb.query().setProcessType_InScope(ptList); cb.fetchFirst(ComponentUtil.getFessConfig().getPagePathMappingMaxFetchSizeAsInteger()); }); + return cachedPathMappingList.size(); } catch (final Exception e) { logger.warn("Failed to load path mappings.", e); } + return 0; } public void setPathMappingList(final String sessionId, final List pathMappingList) { diff --git a/src/main/java/org/codelibs/fess/helper/RelatedContentHelper.java b/src/main/java/org/codelibs/fess/helper/RelatedContentHelper.java index b7908c441..387664591 100644 --- a/src/main/java/org/codelibs/fess/helper/RelatedContentHelper.java +++ b/src/main/java/org/codelibs/fess/helper/RelatedContentHelper.java @@ -49,8 +49,8 @@ public class RelatedContentHelper { reload(); } - public void update() { - reload(); + public int update() { + return reload(); } public List getAvailableRelatedContentList() { @@ -63,7 +63,7 @@ public class RelatedContentHelper { }); } - protected void reload() { + protected int reload() { final Map, List>>> relatedContentMap = new HashMap<>(); getAvailableRelatedContentList().stream().forEach(entity -> { final String key = getHostKey(entity); @@ -84,6 +84,7 @@ public class RelatedContentHelper { } }); this.relatedContentMap = relatedContentMap; + return relatedContentMap.size(); } protected String getHostKey(final RelatedContent entity) { diff --git a/src/main/java/org/codelibs/fess/helper/RelatedQueryHelper.java b/src/main/java/org/codelibs/fess/helper/RelatedQueryHelper.java index a32e7cce6..bdd0909f6 100644 --- a/src/main/java/org/codelibs/fess/helper/RelatedQueryHelper.java +++ b/src/main/java/org/codelibs/fess/helper/RelatedQueryHelper.java @@ -38,8 +38,8 @@ public class RelatedQueryHelper { reload(); } - public void update() { - reload(); + public int update() { + return reload(); } public List getAvailableRelatedQueryList() { @@ -51,7 +51,7 @@ public class RelatedQueryHelper { }); } - protected void reload() { + protected int reload() { final Map> relatedQueryMap = new HashMap<>(); getAvailableRelatedQueryList().stream().forEach(entity -> { final String key = getHostKey(entity); @@ -63,6 +63,7 @@ public class RelatedQueryHelper { map.put(toLowerCase(entity.getTerm()), entity.getQueries()); }); this.relatedQueryMap = relatedQueryMap; + return relatedQueryMap.size(); } protected String getHostKey(final RelatedQuery entity) { diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java index d075ece51..a7c558267 100644 --- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java @@ -355,11 +355,13 @@ public class SystemHelper { ComponentUtil.getRelatedQueryHelper().update(); } - public void updateConfiguration() { - ComponentUtil.getLabelTypeHelper().update(); - ComponentUtil.getPathMappingHelper().update(); - ComponentUtil.getRelatedContentHelper().update(); - ComponentUtil.getRelatedQueryHelper().update(); + public String updateConfiguration() { + final StringBuilder buf = new StringBuilder(); + buf.append("Label: ").append(ComponentUtil.getLabelTypeHelper().update()).append("\n"); + buf.append("PathMapping: ").append(ComponentUtil.getPathMappingHelper().update()).append("\n"); + buf.append("RelatedContent: ").append(ComponentUtil.getRelatedContentHelper().update()).append("\n"); + buf.append("RelatedQuery: ").append(ComponentUtil.getRelatedQueryHelper().update()).append("\n"); + return buf.toString(); } public String generateAccessToken() {