fix #829 use paging.page.size and paging.page.range.size

This commit is contained in:
Shinsuke Sugaya 2016-12-31 18:10:21 +09:00
parent c4d727923b
commit 007f110291
56 changed files with 115 additions and 83 deletions

View file

@ -32,8 +32,6 @@ public class Constants extends CoreLibConstants {
public static final int DEFAULT_ADMIN_PAGE_NUMBER = 1;
public static final int DEFAULT_ADMIN_PAGE_SIZE = 25;
public static final String WEB_API_VERSION = FESS_VERSION;
public static final String TRUE = "true";

View file

@ -19,6 +19,7 @@ import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class AccessTokenPager implements Serializable {
private static final long serialVersionUID = 1L;
@ -132,7 +133,7 @@ public class AccessTokenPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class BadWordPager implements Serializable {
@ -135,7 +135,7 @@ public class BadWordPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -19,6 +19,7 @@ import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class BoostDocPager implements Serializable {
private static final long serialVersionUID = 1L;
@ -138,7 +139,7 @@ public class BoostDocPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class CharMappingPager implements Serializable {
@ -52,7 +52,7 @@ public class CharMappingPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
protected int getDefaultCurrentPageNumber() {

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class CrawlingInfoPager implements Serializable {
@ -129,7 +129,7 @@ public class CrawlingInfoPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class DataConfigPager implements Serializable {
@ -147,7 +147,7 @@ public class DataConfigPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class DuplicateHostPager implements Serializable {
@ -141,7 +141,7 @@ public class DuplicateHostPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class ElevateWordPager implements Serializable {
@ -138,7 +138,7 @@ public class ElevateWordPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class FailureUrlPager implements Serializable {
@ -148,7 +148,7 @@ public class FailureUrlPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class FileAuthPager implements Serializable {
@ -141,7 +141,7 @@ public class FileAuthPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class FileConfigPager implements Serializable {
@ -153,7 +153,7 @@ public class FileConfigPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class GroupPager implements Serializable {
@ -129,7 +129,7 @@ public class GroupPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class JobLogPager implements Serializable {
@ -138,7 +138,7 @@ public class JobLogPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class KeyMatchPager implements Serializable {
@ -144,7 +144,7 @@ public class KeyMatchPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class KuromojiPager implements Serializable {
@ -52,7 +52,7 @@ public class KuromojiPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
protected int getDefaultCurrentPageNumber() {

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class LabelTypePager implements Serializable {
@ -141,7 +141,7 @@ public class LabelTypePager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class PathMapPager implements Serializable {
@ -144,7 +144,7 @@ public class PathMapPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class ProtwordsPager implements Serializable {
@ -52,7 +52,7 @@ public class ProtwordsPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
protected int getDefaultCurrentPageNumber() {

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class ReqHeaderPager implements Serializable {
@ -141,7 +141,7 @@ public class ReqHeaderPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class RolePager implements Serializable {
@ -129,7 +129,7 @@ public class RolePager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class RoleTypePager implements Serializable {
@ -141,7 +141,7 @@ public class RoleTypePager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class SchedulerPager implements Serializable {
@ -156,7 +156,7 @@ public class SchedulerPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class SeunjeonPager implements Serializable {
@ -52,7 +52,7 @@ public class SeunjeonPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
protected int getDefaultCurrentPageNumber() {

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class SynonymPager implements Serializable {
@ -52,7 +52,7 @@ public class SynonymPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
protected int getDefaultCurrentPageNumber() {

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class UserPager implements Serializable {
@ -134,7 +134,7 @@ public class UserPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class WebAuthPager implements Serializable {
@ -141,7 +141,7 @@ public class WebAuthPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -18,7 +18,7 @@ package org.codelibs.fess.app.pager;
import java.io.Serializable;
import java.util.List;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
public class WebConfigPager implements Serializable {
@ -156,7 +156,7 @@ public class WebConfigPager implements Serializable {
}
protected int getDefaultPageSize() {
return Constants.DEFAULT_ADMIN_PAGE_SIZE;
return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger();
}
}

View file

@ -46,7 +46,8 @@ public class AccessTokenService {
// update pager
BeanUtil.copyBeanToBean(accessTokenList, accessTokenPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
accessTokenPager.setPageNumberList(accessTokenList.pageRange(op -> op.rangeSize(5)).createPageNumberList());
accessTokenPager.setPageNumberList(accessTokenList.pageRange(op -> op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()))
.createPageNumberList());
return accessTokenList;
}

View file

@ -31,6 +31,7 @@ import org.codelibs.fess.es.client.FessEsClient;
import org.codelibs.fess.es.config.cbean.BadWordCB;
import org.codelibs.fess.es.config.exbhv.BadWordBhv;
import org.codelibs.fess.es.config.exentity.BadWord;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.bhv.readable.EntityRowHandler;
import org.dbflute.cbean.result.PagingResultBean;
@ -54,6 +55,9 @@ public class BadWordService {
@Resource
protected FessEsClient fessEsClient;
@Resource
protected FessConfig fessConfig;
public List<BadWord> getBadWordList(final BadWordPager badWordPager) {
final PagingResultBean<BadWord> badWordList = badWordBhv.selectPage(cb -> {
@ -63,7 +67,8 @@ public class BadWordService {
// update pager
BeanUtil.copyBeanToBean(badWordList, badWordPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
badWordPager.setPageNumberList(badWordList.pageRange(op -> op.rangeSize(5)).createPageNumberList());
badWordPager.setPageNumberList(badWordList.pageRange(op -> op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()))
.createPageNumberList());
return badWordList;
}

View file

@ -46,7 +46,8 @@ public class BoostDocumentRuleService {
// update pager
BeanUtil.copyBeanToBean(boostDocumentRuleList, boostDocumentRulePager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
boostDocumentRulePager.setPageNumberList(boostDocumentRuleList.pageRange(op -> op.rangeSize(5)).createPageNumberList());
boostDocumentRulePager.setPageNumberList(boostDocumentRuleList.pageRange(
op -> op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger())).createPageNumberList());
return boostDocumentRuleList;
}

View file

@ -27,12 +27,16 @@ import org.codelibs.fess.dict.DictionaryFile.PagingList;
import org.codelibs.fess.dict.DictionaryManager;
import org.codelibs.fess.dict.mapping.CharMappingFile;
import org.codelibs.fess.dict.mapping.CharMappingItem;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.dbflute.optional.OptionalEntity;
public class CharMappingService {
@Resource
protected DictionaryManager dictionaryManager;
@Resource
protected FessConfig fessConfig;
public List<CharMappingItem> getCharMappingList(final String dictId, final CharMappingPager charMappingPager) {
return getCharMappingFile(dictId).map(
file -> {
@ -42,7 +46,7 @@ public class CharMappingService {
// update pager
BeanUtil.copyBeanToBean(charMappingList, charMappingPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
charMappingList.setPageRangeSize(5);
charMappingList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
charMappingPager.setPageNumberList(charMappingList.createPageNumberList());
return (List<CharMappingItem>) charMappingList;

View file

@ -76,7 +76,8 @@ public class CrawlingInfoService {
// update pager
BeanUtil.copyBeanToBean(crawlingInfoList, crawlingInfoPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
crawlingInfoPager.setPageNumberList(crawlingInfoList.pageRange(op -> op.rangeSize(5)).createPageNumberList());
crawlingInfoPager.setPageNumberList(crawlingInfoList.pageRange(op -> op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger()))
.createPageNumberList());
return crawlingInfoList;
}

View file

@ -54,7 +54,7 @@ public class DataConfigService {
// update pager
BeanUtil.copyBeanToBean(dataConfigList, dataConfigPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
dataConfigPager.setPageNumberList(dataConfigList.pageRange(op -> {
op.rangeSize(5);
op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
}).createPageNumberList());
return dataConfigList;

View file

@ -47,7 +47,7 @@ public class DuplicateHostService {
// update pager
BeanUtil.copyBeanToBean(duplicateHostList, duplicateHostPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
duplicateHostPager.setPageNumberList(duplicateHostList.pageRange(op -> {
op.rangeSize(5);
op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
}).createPageNumberList());
return duplicateHostList;

View file

@ -76,7 +76,7 @@ public class ElevateWordService {
// update pager
BeanUtil.copyBeanToBean(elevateWordList, elevateWordPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
elevateWordPager.setPageNumberList(elevateWordList.pageRange(op -> {
op.rangeSize(5);
op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
}).createPageNumberList());
return elevateWordList;

View file

@ -59,7 +59,7 @@ public class FailureUrlService {
// update pager
BeanUtil.copyBeanToBean(failureUrlList, failureUrlPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
failureUrlPager.setPageNumberList(failureUrlList.pageRange(op -> {
op.rangeSize(5);
op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
}).createPageNumberList());
return failureUrlList;

View file

@ -47,7 +47,7 @@ public class FileAuthenticationService {
// update pager
BeanUtil.copyBeanToBean(fileAuthenticationList, fileAuthenticationPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
fileAuthenticationPager.setPageNumberList(fileAuthenticationList.pageRange(op -> {
op.rangeSize(5);
op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
}).createPageNumberList());
return fileAuthenticationList;

View file

@ -57,7 +57,7 @@ public class FileConfigService {
// update pager
BeanUtil.copyBeanToBean(fileConfigList, fileConfigPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
fileConfigPager.setPageNumberList(fileConfigList.pageRange(op -> {
op.rangeSize(5);
op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
}).createPageNumberList());
return fileConfigList;

View file

@ -54,7 +54,7 @@ public class GroupService {
// update pager
BeanUtil.copyBeanToBean(groupList, groupPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
groupPager.setPageNumberList(groupList.pageRange(op -> {
op.rangeSize(5);
op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
}).createPageNumberList());
return groupList;

View file

@ -25,6 +25,7 @@ import org.codelibs.fess.app.pager.JobLogPager;
import org.codelibs.fess.es.config.cbean.JobLogCB;
import org.codelibs.fess.es.config.exbhv.JobLogBhv;
import org.codelibs.fess.es.config.exentity.JobLog;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.optional.OptionalEntity;
@ -34,6 +35,9 @@ public class JobLogService {
@Resource
protected JobLogBhv jobLogBhv;
@Resource
protected FessConfig fessConfig;
protected long expiredJobInterval = 2 * 60 * 60 * 1000L; // 2hours
public List<JobLog> getJobLogList(final JobLogPager jobLogPager) {
@ -46,7 +50,7 @@ public class JobLogService {
// update pager
BeanUtil.copyBeanToBean(jobLogList, jobLogPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
jobLogPager.setPageNumberList(jobLogList.pageRange(op -> {
op.rangeSize(5);
op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
}).createPageNumberList());
return jobLogList;

View file

@ -47,7 +47,7 @@ public class KeyMatchService {
// update pager
BeanUtil.copyBeanToBean(keyMatchList, keyMatchPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
keyMatchPager.setPageNumberList(keyMatchList.pageRange(op -> {
op.rangeSize(5);
op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
}).createPageNumberList());
return keyMatchList;

View file

@ -27,12 +27,16 @@ import org.codelibs.fess.dict.DictionaryFile.PagingList;
import org.codelibs.fess.dict.DictionaryManager;
import org.codelibs.fess.dict.kuromoji.KuromojiFile;
import org.codelibs.fess.dict.kuromoji.KuromojiItem;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.dbflute.optional.OptionalEntity;
public class KuromojiService {
@Resource
protected DictionaryManager dictionaryManager;
@Resource
protected FessConfig fessConfig;
public List<KuromojiItem> getKuromojiList(final String dictId, final KuromojiPager kuromojiPager) {
return getKuromojiFile(dictId).map(file -> {
final int pageSize = kuromojiPager.getPageSize();
@ -40,7 +44,7 @@ public class KuromojiService {
// update pager
BeanUtil.copyBeanToBean(kuromojiList, kuromojiPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
kuromojiList.setPageRangeSize(5);
kuromojiList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
kuromojiPager.setPageNumberList(kuromojiList.createPageNumberList());
return (List<KuromojiItem>) kuromojiList;

View file

@ -49,7 +49,7 @@ public class LabelTypeService {
// update pager
BeanUtil.copyBeanToBean(labelTypeList, labelTypePager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
labelTypePager.setPageNumberList(labelTypeList.pageRange(op -> {
op.rangeSize(5);
op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
}).createPageNumberList());
return labelTypeList;

View file

@ -49,7 +49,7 @@ public class PathMappingService {
// update pager
BeanUtil.copyBeanToBean(pathMappingList, pathMappingPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
pathMappingPager.setPageNumberList(pathMappingList.pageRange(op -> {
op.rangeSize(5);
op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
}).createPageNumberList());
return pathMappingList;

View file

@ -27,12 +27,16 @@ import org.codelibs.fess.dict.DictionaryFile.PagingList;
import org.codelibs.fess.dict.DictionaryManager;
import org.codelibs.fess.dict.protwords.ProtwordsFile;
import org.codelibs.fess.dict.protwords.ProtwordsItem;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.dbflute.optional.OptionalEntity;
public class ProtwordsService {
@Resource
protected DictionaryManager dictionaryManager;
@Resource
protected FessConfig fessConfig;
public List<ProtwordsItem> getProtwordsList(final String dictId, final ProtwordsPager protwordsPager) {
return getProtwordsFile(dictId).map(
file -> {
@ -42,7 +46,7 @@ public class ProtwordsService {
// update pager
BeanUtil.copyBeanToBean(protwordsList, protwordsPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
protwordsList.setPageRangeSize(5);
protwordsList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
protwordsPager.setPageNumberList(protwordsList.createPageNumberList());
return (List<ProtwordsItem>) protwordsList;

View file

@ -47,7 +47,7 @@ public class RequestHeaderService {
// update pager
BeanUtil.copyBeanToBean(requestHeaderList, requestHeaderPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
requestHeaderPager.setPageNumberList(requestHeaderList.pageRange(op -> {
op.rangeSize(5);
op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
}).createPageNumberList());
return requestHeaderList;

View file

@ -54,7 +54,7 @@ public class RoleService {
// update pager
BeanUtil.copyBeanToBean(roleList, rolePager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
rolePager.setPageNumberList(roleList.pageRange(op -> {
op.rangeSize(5);
op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
}).createPageNumberList());
return roleList;

View file

@ -47,7 +47,7 @@ public class RoleTypeService {
// update pager
BeanUtil.copyBeanToBean(roleTypeList, roleTypePager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
roleTypePager.setPageNumberList(roleTypeList.pageRange(op -> {
op.rangeSize(5);
op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
}).createPageNumberList());
return roleTypeList;

View file

@ -53,7 +53,7 @@ public class ScheduledJobService {
// update pager
BeanUtil.copyBeanToBean(scheduledJobList, scheduledJobPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
scheduledJobPager.setPageNumberList(scheduledJobList.pageRange(op -> {
op.rangeSize(5);
op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
}).createPageNumberList());
return scheduledJobList;

View file

@ -27,12 +27,16 @@ import org.codelibs.fess.dict.DictionaryFile.PagingList;
import org.codelibs.fess.dict.DictionaryManager;
import org.codelibs.fess.dict.seunjeon.SeunjeonFile;
import org.codelibs.fess.dict.seunjeon.SeunjeonItem;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.dbflute.optional.OptionalEntity;
public class SeunjeonService {
@Resource
protected DictionaryManager dictionaryManager;
@Resource
protected FessConfig fessConfig;
public List<SeunjeonItem> getSeunjeonList(final String dictId, final SeunjeonPager seunjeonPager) {
return getSeunjeonFile(dictId).map(file -> {
final int pageSize = seunjeonPager.getPageSize();
@ -40,7 +44,7 @@ public class SeunjeonService {
// update pager
BeanUtil.copyBeanToBean(seunjeonList, seunjeonPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
seunjeonList.setPageRangeSize(5);
seunjeonList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
seunjeonPager.setPageNumberList(seunjeonList.createPageNumberList());
return (List<SeunjeonItem>) seunjeonList;

View file

@ -27,12 +27,16 @@ import org.codelibs.fess.dict.DictionaryFile.PagingList;
import org.codelibs.fess.dict.DictionaryManager;
import org.codelibs.fess.dict.synonym.SynonymFile;
import org.codelibs.fess.dict.synonym.SynonymItem;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.dbflute.optional.OptionalEntity;
public class SynonymService {
@Resource
protected DictionaryManager dictionaryManager;
@Resource
protected FessConfig fessConfig;
public List<SynonymItem> getSynonymList(final String dictId, final SynonymPager synonymPager) {
return getSynonymFile(dictId).map(file -> {
final int pageSize = synonymPager.getPageSize();
@ -40,7 +44,7 @@ public class SynonymService {
// update pager
BeanUtil.copyBeanToBean(synonymList, synonymPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
synonymList.setPageRangeSize(5);
synonymList.setPageRangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
synonymPager.setPageNumberList(synonymList.createPageNumberList());
return (List<SynonymItem>) synonymList;

View file

@ -54,7 +54,7 @@ public class UserService {
// update pager
BeanUtil.copyBeanToBean(userList, userPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
userPager.setPageNumberList(userList.pageRange(op -> {
op.rangeSize(5);
op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
}).createPageNumberList());
return userList;

View file

@ -47,7 +47,7 @@ public class WebAuthenticationService {
// update pager
BeanUtil.copyBeanToBean(webAuthenticationList, webAuthenticationPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
webAuthenticationPager.setPageNumberList(webAuthenticationList.pageRange(op -> {
op.rangeSize(5);
op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
}).createPageNumberList());
return webAuthenticationList;

View file

@ -61,7 +61,7 @@ public class WebConfigService {
// update pager
BeanUtil.copyBeanToBean(webConfigList, webConfigPager, option -> option.include(Constants.PAGER_CONVERSION_RULE));
webConfigPager.setPageNumberList(webConfigList.pageRange(op -> {
op.rangeSize(5);
op.rangeSize(fessConfig.getPagingPageRangeSizeAsInteger());
}).createPageNumberList());
return webConfigList;

View file

@ -315,10 +315,10 @@ cookie.remember.me.harbor.key = FES
# Paging
# ------
# The size of one page for paging
paging.page.size = 4
paging.page.size = 25
# The size of page range for paging
paging.page.range.size = 3
paging.page.range.size = 5
# The option 'fillLimit' of page range for paging
paging.page.range.fill.limit = true