diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/BaseSearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/BaseSearchBody.java index d7e6b73b6..e49bcd2c7 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/BaseSearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/BaseSearchBody.java @@ -17,17 +17,24 @@ package org.codelibs.fess.app.web.api.admin; import org.codelibs.fess.Constants; import org.codelibs.fess.util.ComponentUtil; -import org.lastaflute.web.validation.Required; public class BaseSearchBody { - @Required public Integer size = ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); - @Required + public Integer page = Constants.DEFAULT_ADMIN_PAGE_NUMBER; - public BaseSearchBody() { - super(); + public int getPageSize() { + if (size != null) { + return size; + } + return ComponentUtil.getFessConfig().getPagingPageSizeAsInteger(); } + public int getCurrentPageNumber() { + if (page != null) { + return page; + } + return Constants.DEFAULT_ADMIN_PAGE_NUMBER; + } } \ No newline at end of file diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/ApiAdminAccesstokenAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/ApiAdminAccesstokenAction.java index 5d06d62cc..b682b6797 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/ApiAdminAccesstokenAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/ApiAdminAccesstokenAction.java @@ -62,9 +62,7 @@ public class ApiAdminAccesstokenAction extends FessApiAdminAction { @Execute public JsonResponse settings(final SearchBody body) { validateApi(body, messages -> {}); - final AccessTokenPager pager = new AccessTokenPager(); - pager.setPageSize(body.size); - pager.setCurrentPageNumber(body.page); + final AccessTokenPager pager = copyBeanToNewBean(body, AccessTokenPager.class); final List list = accessTokenService.getAccessTokenList(pager); return asJson(new ApiConfigsResponse() .settings(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/SearchBody.java index a857680e5..50f0bfffc 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/SearchBody.java @@ -18,5 +18,6 @@ package org.codelibs.fess.app.web.api.admin.accesstoken; import org.codelibs.fess.app.web.api.admin.BaseSearchBody; public class SearchBody extends BaseSearchBody { + public String id; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/badword/ApiAdminBadwordAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/badword/ApiAdminBadwordAction.java index 46c62bf6f..7ac0c3d81 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/badword/ApiAdminBadwordAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/badword/ApiAdminBadwordAction.java @@ -57,9 +57,7 @@ public class ApiAdminBadwordAction extends FessApiAdminAction { @Execute public JsonResponse settings(final SearchBody body) { validateApi(body, messages -> {}); - final BadWordPager pager = new BadWordPager(); - pager.setPageSize(body.size); - pager.setCurrentPageNumber(body.page); + final BadWordPager pager = copyBeanToNewBean(body, BadWordPager.class); final List list = badWordService.getBadWordList(pager); return asJson(new ApiResult.ApiConfigsResponse() .settings(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/badword/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/badword/SearchBody.java index de4912b3e..ec6290659 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/badword/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/badword/SearchBody.java @@ -18,5 +18,6 @@ package org.codelibs.fess.app.web.api.admin.badword; import org.codelibs.fess.app.web.api.admin.BaseSearchBody; public class SearchBody extends BaseSearchBody { + public String id; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java index 15dfc21d5..aee24bfdf 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java @@ -56,9 +56,7 @@ public class ApiAdminBoostdocAction extends FessApiAdminAction { @Execute public JsonResponse settings(final SearchBody body) { validateApi(body, messages -> {}); - final BoostDocPager pager = new BoostDocPager(); - pager.setPageSize(body.size); - pager.setCurrentPageNumber(body.page); + final BoostDocPager pager = copyBeanToNewBean(body, BoostDocPager.class); final List list = boostDocumentRuleService.getBoostDocumentRuleList(pager); return asJson(new ApiConfigsResponse() .settings(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/SearchBody.java index 397795b35..28321dfca 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/SearchBody.java @@ -18,5 +18,6 @@ package org.codelibs.fess.app.web.api.admin.boostdoc; import org.codelibs.fess.app.web.api.admin.BaseSearchBody; public class SearchBody extends BaseSearchBody { + public String id; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java index 386caa97b..424f7df7d 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java @@ -20,7 +20,6 @@ import java.util.stream.Collectors; import javax.annotation.Resource; -import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.CrawlingInfoPager; import org.codelibs.fess.app.service.CrawlingInfoService; import org.codelibs.fess.app.web.api.ApiResult; @@ -44,8 +43,6 @@ public class ApiAdminCrawlinginfoAction extends FessApiAdminAction { @Resource private CrawlingInfoService crawlingInfoService; @Resource - private CrawlingInfoPager crawlingInfoPager; - @Resource protected ProcessHelper processHelper; // =================================================================================== @@ -57,8 +54,7 @@ public class ApiAdminCrawlinginfoAction extends FessApiAdminAction { @Execute public JsonResponse logs(final SearchBody body) { validateApi(body, messages -> {}); - final CrawlingInfoPager pager = new CrawlingInfoPager(); - copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + final CrawlingInfoPager pager = copyBeanToNewBean(body, CrawlingInfoPager.class); final List list = crawlingInfoService.getCrawlingInfoList(pager); return asJson(new ApiResult.ApiLogsResponse() .logs(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())).total(pager.getAllRecordCount()) @@ -96,7 +92,6 @@ public class ApiAdminCrawlinginfoAction extends FessApiAdminAction { public JsonResponse delete$all() { try { crawlingInfoService.deleteOldSessions(processHelper.getRunningSessionIdSet()); - crawlingInfoPager.clear(); saveInfo(messages -> messages.addSuccessCrawlingInfoDeleteAll(GLOBAL)); } catch (final Exception e) { throwValidationErrorApi(messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e))); diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/SearchBody.java index be809209a..b919644ad 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/SearchBody.java @@ -15,8 +15,9 @@ */ package org.codelibs.fess.app.web.api.admin.crawlinginfo; -import org.codelibs.fess.app.web.admin.crawlinginfo.SearchForm; +import org.codelibs.fess.app.web.api.admin.BaseSearchBody; -public class SearchBody extends SearchForm { +public class SearchBody extends BaseSearchBody { + public String sessionId; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/ApiAdminDataconfigAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/ApiAdminDataconfigAction.java index 9cc3b3c86..358b616da 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/ApiAdminDataconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/ApiAdminDataconfigAction.java @@ -22,7 +22,6 @@ import java.util.stream.Collectors; import javax.annotation.Resource; -import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.DataConfigPager; import org.codelibs.fess.app.service.DataConfigService; import org.codelibs.fess.app.web.CrudMode; @@ -56,10 +55,7 @@ public class ApiAdminDataconfigAction extends FessApiAdminAction { @Execute public JsonResponse settings(final SearchBody body) { validateApi(body, messages -> {}); - final DataConfigPager pager = new DataConfigPager(); - pager.setPageSize(body.size); - pager.setCurrentPageNumber(body.page); - copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + final DataConfigPager pager = copyBeanToNewBean(body, DataConfigPager.class); final List list = dataConfigService.getDataConfigList(pager); return asJson(new ApiResult.ApiConfigsResponse() .settings(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/SearchBody.java index cd11f3a1e..3861ad21b 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/SearchBody.java @@ -18,5 +18,6 @@ package org.codelibs.fess.app.web.api.admin.dataconfig; import org.codelibs.fess.app.web.api.admin.BaseSearchBody; public class SearchBody extends BaseSearchBody { + public String id; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/BaseSearchDictBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/BaseSearchDictBody.java new file mode 100644 index 000000000..889d21590 --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/BaseSearchDictBody.java @@ -0,0 +1,9 @@ +package org.codelibs.fess.app.web.api.admin.dict; + +import org.codelibs.fess.app.web.api.admin.BaseSearchBody; +import org.lastaflute.web.validation.Required; + +public class BaseSearchDictBody extends BaseSearchBody { + @Required + public String dictId; +} diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/ApiAdminDictKuromojiAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/ApiAdminDictKuromojiAction.java index 078202df0..81a1eba7f 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/ApiAdminDictKuromojiAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/ApiAdminDictKuromojiAction.java @@ -45,10 +45,7 @@ public class ApiAdminDictKuromojiAction extends FessApiAdminAction { public JsonResponse get$settings(final String dictId, final SearchBody body) { body.dictId = dictId; validateApi(body, messages -> {}); - final KuromojiPager pager = new KuromojiPager(); - if (body.pageNumber != null) { - pager.setCurrentPageNumber(body.pageNumber); - } + final KuromojiPager pager = copyBeanToNewBean(body, KuromojiPager.class); return asJson(new ApiResult.ApiConfigsResponse() .settings( kuromojiService.getKuromojiList(body.dictId, pager).stream() diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/SearchBody.java index 194f1a97e..19f20a2af 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/kuromoji/SearchBody.java @@ -15,8 +15,7 @@ */ package org.codelibs.fess.app.web.api.admin.dict.kuromoji; -import org.codelibs.fess.app.web.admin.dict.kuromoji.SearchForm; +import org.codelibs.fess.app.web.api.admin.dict.BaseSearchDictBody; -public class SearchBody extends SearchForm { - public Integer pageNumber; +public class SearchBody extends BaseSearchDictBody { } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/ApiAdminDictMappingAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/ApiAdminDictMappingAction.java index 33214b417..626c8327c 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/ApiAdminDictMappingAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/ApiAdminDictMappingAction.java @@ -44,10 +44,7 @@ public class ApiAdminDictMappingAction extends FessApiAdminAction { public JsonResponse get$settings(final String dictId, final SearchBody body) { body.dictId = dictId; validateApi(body, messages -> {}); - final CharMappingPager pager = new CharMappingPager(); - if (body.pageNumber != null) { - pager.setCurrentPageNumber(body.pageNumber); - } + final CharMappingPager pager = copyBeanToNewBean(body, CharMappingPager.class); return asJson(new ApiResult.ApiConfigsResponse() .settings( charMappingService.getCharMappingList(body.dictId, pager).stream() diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/SearchBody.java index 4c5c84ca3..35b66a01f 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/mapping/SearchBody.java @@ -15,8 +15,7 @@ */ package org.codelibs.fess.app.web.api.admin.dict.mapping; -import org.codelibs.fess.app.web.admin.dict.mapping.SearchForm; +import org.codelibs.fess.app.web.api.admin.dict.BaseSearchDictBody; -public class SearchBody extends SearchForm { - public Integer pageNumber; +public class SearchBody extends BaseSearchDictBody { } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/ApiAdminDictProtwordsAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/ApiAdminDictProtwordsAction.java index 3a85ed574..958e4cba6 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/ApiAdminDictProtwordsAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/ApiAdminDictProtwordsAction.java @@ -44,10 +44,7 @@ public class ApiAdminDictProtwordsAction extends FessApiAdminAction { public JsonResponse get$settings(final String dictId, final SearchBody body) { body.dictId = dictId; validateApi(body, messages -> {}); - final ProtwordsPager pager = new ProtwordsPager(); - if (body.pageNumber != null) { - pager.setCurrentPageNumber(body.pageNumber); - } + final ProtwordsPager pager = copyBeanToNewBean(body, ProtwordsPager.class); return asJson(new ApiResult.ApiConfigsResponse() .settings( protwordsService.getProtwordsList(body.dictId, pager).stream() diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/SearchBody.java index 8ade29715..e13f7b423 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/protwords/SearchBody.java @@ -15,8 +15,7 @@ */ package org.codelibs.fess.app.web.api.admin.dict.protwords; -import org.codelibs.fess.app.web.admin.dict.protwords.SearchForm; +import org.codelibs.fess.app.web.api.admin.dict.BaseSearchDictBody; -public class SearchBody extends SearchForm { - public Integer pageNumber; +public class SearchBody extends BaseSearchDictBody { } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/seunjeon/ApiAdminDictSeunjeonAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/seunjeon/ApiAdminDictSeunjeonAction.java index 39f77a313..0f50bf33b 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/seunjeon/ApiAdminDictSeunjeonAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/seunjeon/ApiAdminDictSeunjeonAction.java @@ -44,10 +44,7 @@ public class ApiAdminDictSeunjeonAction extends FessApiAdminAction { public JsonResponse get$settings(final String dictId, final SearchBody body) { body.dictId = dictId; validateApi(body, messages -> {}); - final SeunjeonPager pager = new SeunjeonPager(); - if (body.pageNumber != null) { - pager.setCurrentPageNumber(body.pageNumber); - } + final SeunjeonPager pager = copyBeanToNewBean(body, SeunjeonPager.class); return asJson(new ApiResult.ApiConfigsResponse() .settings( seunjeonService.getSeunjeonList(body.dictId, pager).stream() diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/seunjeon/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/seunjeon/SearchBody.java index a6cba671c..d5c37c258 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/seunjeon/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/seunjeon/SearchBody.java @@ -15,8 +15,7 @@ */ package org.codelibs.fess.app.web.api.admin.dict.seunjeon; -import org.codelibs.fess.app.web.admin.dict.seunjeon.SearchForm; +import org.codelibs.fess.app.web.api.admin.dict.BaseSearchDictBody; -public class SearchBody extends SearchForm { - public Integer pageNumber; +public class SearchBody extends BaseSearchDictBody { } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/ApiAdminDictSynonymAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/ApiAdminDictSynonymAction.java index 2c6ae27eb..298957be5 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/ApiAdminDictSynonymAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/ApiAdminDictSynonymAction.java @@ -44,10 +44,7 @@ public class ApiAdminDictSynonymAction extends FessApiAdminAction { public JsonResponse get$settings(final String dictId, final SearchBody body) { body.dictId = dictId; validateApi(body, messages -> {}); - final SynonymPager pager = new SynonymPager(); - if (body.pageNumber != null) { - pager.setCurrentPageNumber(body.pageNumber); - } + final SynonymPager pager = copyBeanToNewBean(body, SynonymPager.class); return asJson(new ApiResult.ApiConfigsResponse() .settings( synonymService.getSynonymList(body.dictId, pager).stream() diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/SearchBody.java index b57e4654a..53b4d7112 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dict/synonym/SearchBody.java @@ -15,8 +15,8 @@ */ package org.codelibs.fess.app.web.api.admin.dict.synonym; -import org.codelibs.fess.app.web.admin.dict.synonym.SearchForm; +import org.codelibs.fess.app.web.api.admin.dict.BaseSearchDictBody; + +public class SearchBody extends BaseSearchDictBody { -public class SearchBody extends SearchForm { - public Integer pageNumber; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/ApiAdminDuplicatehostAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/ApiAdminDuplicatehostAction.java index 3b41fb801..abd535273 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/ApiAdminDuplicatehostAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/ApiAdminDuplicatehostAction.java @@ -22,7 +22,6 @@ import java.util.stream.Collectors; import javax.annotation.Resource; -import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.DuplicateHostPager; import org.codelibs.fess.app.service.DuplicateHostService; import org.codelibs.fess.app.web.CrudMode; @@ -56,8 +55,7 @@ public class ApiAdminDuplicatehostAction extends FessApiAdminAction { @Execute public JsonResponse settings(final SearchBody body) { validateApi(body, messages -> {}); - final DuplicateHostPager pager = new DuplicateHostPager(); - copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + final DuplicateHostPager pager = copyBeanToNewBean(body, DuplicateHostPager.class); final List list = duplicateHostService.getDuplicateHostList(pager); return asJson(new ApiResult.ApiConfigsResponse() .settings(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/SearchBody.java index 42af9d558..49dded592 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/SearchBody.java @@ -15,8 +15,9 @@ */ package org.codelibs.fess.app.web.api.admin.duplicatehost; -import org.codelibs.fess.app.web.admin.duplicatehost.SearchForm; +import org.codelibs.fess.app.web.api.admin.BaseSearchBody; -public class SearchBody extends SearchForm { +public class SearchBody extends BaseSearchBody { + public String id; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/ApiAdminElevatewordAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/ApiAdminElevatewordAction.java index 47f310632..9b5ca8df1 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/ApiAdminElevatewordAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/ApiAdminElevatewordAction.java @@ -61,9 +61,7 @@ public class ApiAdminElevatewordAction extends FessApiAdminAction { @Execute public JsonResponse settings(final SearchBody body) { validateApi(body, messages -> {}); - final ElevateWordPager pager = new ElevateWordPager(); - pager.setPageSize(body.size); - pager.setCurrentPageNumber(body.page); + final ElevateWordPager pager = copyBeanToNewBean(body, ElevateWordPager.class); final List list = elevateWordService.getElevateWordList(pager); return asJson(new ApiResult.ApiConfigsResponse() .settings(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/SearchBody.java index 86f9eccae..9f1464e5a 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/SearchBody.java @@ -18,4 +18,5 @@ package org.codelibs.fess.app.web.api.admin.elevateword; import org.codelibs.fess.app.web.api.admin.BaseSearchBody; public class SearchBody extends BaseSearchBody { + public String id; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java index 613bcaf95..c0841845d 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java @@ -20,7 +20,6 @@ import java.util.stream.Collectors; import javax.annotation.Resource; -import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.FailureUrlPager; import org.codelibs.fess.app.service.FailureUrlService; import org.codelibs.fess.app.web.api.ApiResult; @@ -57,8 +56,7 @@ public class ApiAdminFailureurlAction extends FessApiAdminAction { @Execute public JsonResponse logs(final SearchBody body) { validateApi(body, messages -> {}); - final FailureUrlPager pager = new FailureUrlPager(); - copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + final FailureUrlPager pager = copyBeanToNewBean(body, FailureUrlPager.class); final List list = failureUrlService.getFailureUrlList(pager); return asJson(new ApiResult.ApiLogsResponse() .logs(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())).total(pager.getAllRecordCount()) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/SearchBody.java index 4875a6ddb..585de82f6 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/SearchBody.java @@ -15,8 +15,14 @@ */ package org.codelibs.fess.app.web.api.admin.failureurl; -import org.codelibs.fess.app.web.admin.failureurl.SearchForm; +import org.codelibs.fess.app.web.api.admin.BaseSearchBody; -public class SearchBody extends SearchForm { +public class SearchBody extends BaseSearchBody { + public String url; + public Integer errorCountMin; + + public Integer errorCountMax; + + public String errorName; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/ApiAdminFileauthAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/ApiAdminFileauthAction.java index d0e578925..c818beb4f 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/ApiAdminFileauthAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/ApiAdminFileauthAction.java @@ -22,7 +22,6 @@ import java.util.stream.Collectors; import javax.annotation.Resource; -import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.FileAuthPager; import org.codelibs.fess.app.service.FileAuthenticationService; import org.codelibs.fess.app.service.FileConfigService; @@ -60,8 +59,7 @@ public class ApiAdminFileauthAction extends FessApiAdminAction { @Execute public JsonResponse settings(final SearchBody body) { validateApi(body, messages -> {}); - final FileAuthPager pager = new FileAuthPager(); - copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + final FileAuthPager pager = copyBeanToNewBean(body, FileAuthPager.class); final List list = fileAuthService.getFileAuthenticationList(pager); return asJson(new ApiResult.ApiConfigsResponse() .settings(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/SearchBody.java index 35ebcba3d..a75d3ff90 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/SearchBody.java @@ -15,8 +15,9 @@ */ package org.codelibs.fess.app.web.api.admin.fileauth; -import org.codelibs.fess.app.web.admin.fileauth.SearchForm; +import org.codelibs.fess.app.web.api.admin.BaseSearchBody; -public class SearchBody extends SearchForm { +public class SearchBody extends BaseSearchBody { + public String id; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/ApiAdminFileconfigAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/ApiAdminFileconfigAction.java index 779a94b09..70ff9a4e2 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/ApiAdminFileconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/ApiAdminFileconfigAction.java @@ -22,7 +22,6 @@ import java.util.stream.Collectors; import javax.annotation.Resource; -import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.FileConfigPager; import org.codelibs.fess.app.service.FileConfigService; import org.codelibs.fess.app.web.CrudMode; @@ -56,10 +55,7 @@ public class ApiAdminFileconfigAction extends FessApiAdminAction { @Execute public JsonResponse settings(final SearchBody body) { validateApi(body, messages -> {}); - final FileConfigPager pager = new FileConfigPager(); - pager.setPageSize(body.size); - pager.setCurrentPageNumber(body.page); - copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + final FileConfigPager pager = copyBeanToNewBean(body, FileConfigPager.class); final List list = fileConfigService.getFileConfigList(pager); return asJson(new ApiResult.ApiConfigsResponse() .settings(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/SearchBody.java index 5d580be2c..b8a7a05e3 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/SearchBody.java @@ -18,5 +18,6 @@ package org.codelibs.fess.app.web.api.admin.fileconfig; import org.codelibs.fess.app.web.api.admin.BaseSearchBody; public class SearchBody extends BaseSearchBody { + public String id; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/group/ApiAdminGroupAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/group/ApiAdminGroupAction.java index ec3817b1e..98e232e2e 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/group/ApiAdminGroupAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/group/ApiAdminGroupAction.java @@ -22,7 +22,6 @@ import java.util.stream.Collectors; import javax.annotation.Resource; -import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.GroupPager; import org.codelibs.fess.app.service.GroupService; import org.codelibs.fess.app.web.CrudMode; @@ -43,8 +42,7 @@ public class ApiAdminGroupAction extends FessApiAdminAction { @Execute public JsonResponse settings(final SearchBody body) { validateApi(body, messages -> {}); - final GroupPager pager = new GroupPager(); - copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + final GroupPager pager = copyBeanToNewBean(body, GroupPager.class); final List list = groupService.getGroupList(pager); return asJson(new ApiResult.ApiConfigsResponse() .settings(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/group/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/group/SearchBody.java index 84d99adc0..95c81b2cb 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/group/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/group/SearchBody.java @@ -15,7 +15,8 @@ */ package org.codelibs.fess.app.web.api.admin.group; -import org.codelibs.fess.app.web.admin.group.SearchForm; +import org.codelibs.fess.app.web.api.admin.BaseSearchBody; -public class SearchBody extends SearchForm { +public class SearchBody extends BaseSearchBody { + public String id; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java index 1a3dbb1ed..b30a31263 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java @@ -20,7 +20,6 @@ import java.util.stream.Collectors; import javax.annotation.Resource; -import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.JobLogPager; import org.codelibs.fess.app.service.JobLogService; import org.codelibs.fess.app.web.api.ApiResult; @@ -51,8 +50,7 @@ public class ApiAdminJoblogAction extends FessApiAdminAction { @Execute public JsonResponse logs(final SearchBody body) { validateApi(body, messages -> {}); - final JobLogPager pager = new JobLogPager(); - copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + final JobLogPager pager = copyBeanToNewBean(body, JobLogPager.class); final List list = jobLogService.getJobLogList(pager); return asJson(new ApiResult.ApiLogsResponse() .logs(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())).total(pager.getAllRecordCount()) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/SearchBody.java index cd7015e4b..bbeb264df 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/joblog/SearchBody.java @@ -15,8 +15,9 @@ */ package org.codelibs.fess.app.web.api.admin.joblog; -import org.codelibs.fess.app.web.admin.joblog.SearchForm; +import org.codelibs.fess.app.web.api.admin.BaseSearchBody; -public class SearchBody extends SearchForm { +public class SearchBody extends BaseSearchBody { + public String id; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/ApiAdminKeymatchAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/ApiAdminKeymatchAction.java index 3521b2dea..5b033bb9a 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/ApiAdminKeymatchAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/ApiAdminKeymatchAction.java @@ -22,7 +22,6 @@ import java.util.stream.Collectors; import javax.annotation.Resource; -import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.KeyMatchPager; import org.codelibs.fess.app.service.KeyMatchService; import org.codelibs.fess.app.web.CrudMode; @@ -56,10 +55,7 @@ public class ApiAdminKeymatchAction extends FessApiAdminAction { @Execute public JsonResponse settings(final SearchBody body) { validateApi(body, messages -> {}); - final KeyMatchPager pager = new KeyMatchPager(); - pager.setPageSize(body.size); - pager.setCurrentPageNumber(body.page); - copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + final KeyMatchPager pager = copyBeanToNewBean(body, KeyMatchPager.class); final List list = keyMatchService.getKeyMatchList(pager); return asJson(new ApiResult.ApiConfigsResponse() .settings(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/SearchBody.java index 2ae0fd6de..3b2f64ea6 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/SearchBody.java @@ -18,5 +18,6 @@ package org.codelibs.fess.app.web.api.admin.keymatch; import org.codelibs.fess.app.web.api.admin.BaseSearchBody; public class SearchBody extends BaseSearchBody { + public String id; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/ApiAdminLabeltypeAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/ApiAdminLabeltypeAction.java index 611e939eb..d07cf8219 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/ApiAdminLabeltypeAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/ApiAdminLabeltypeAction.java @@ -22,7 +22,6 @@ import java.util.stream.Collectors; import javax.annotation.Resource; -import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.LabelTypePager; import org.codelibs.fess.app.service.LabelTypeService; import org.codelibs.fess.app.web.CrudMode; @@ -56,10 +55,7 @@ public class ApiAdminLabeltypeAction extends FessApiAdminAction { @Execute public JsonResponse settings(final SearchBody body) { validateApi(body, messages -> {}); - final LabelTypePager pager = new LabelTypePager(); - pager.setPageSize(body.size); - pager.setCurrentPageNumber(body.page); - copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + final LabelTypePager pager = copyBeanToNewBean(body, LabelTypePager.class); final List list = labelTypeService.getLabelTypeList(pager); return asJson(new ApiResult.ApiConfigsResponse() .settings(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/SearchBody.java index 46d21b201..6eb64f9a4 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/SearchBody.java @@ -18,5 +18,6 @@ package org.codelibs.fess.app.web.api.admin.labeltype; import org.codelibs.fess.app.web.api.admin.BaseSearchBody; public class SearchBody extends BaseSearchBody { + public String id; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/ApiAdminPathmapAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/ApiAdminPathmapAction.java index 36e820f17..846b6cda6 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/ApiAdminPathmapAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/ApiAdminPathmapAction.java @@ -42,8 +42,7 @@ public class ApiAdminPathmapAction extends FessApiAdminAction { @Execute public JsonResponse settings(final SearchBody body) { validateApi(body, messages -> {}); - final PathMapPager pager = new PathMapPager(); - copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + final PathMapPager pager = copyBeanToNewBean(body, PathMapPager.class); final List list = pathMappingService.getPathMappingList(pager); return asJson(new ApiResult.ApiConfigsResponse() .settings(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/SearchBody.java index 6db0f31de..f42b15ba5 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/SearchBody.java @@ -15,7 +15,8 @@ */ package org.codelibs.fess.app.web.api.admin.pathmap; -import org.codelibs.fess.app.web.admin.pathmap.SearchForm; +import org.codelibs.fess.app.web.api.admin.BaseSearchBody; -public class SearchBody extends SearchForm { +public class SearchBody extends BaseSearchBody { + public String id; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/ApiAdminReqheaderAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/ApiAdminReqheaderAction.java index aa89c97bb..825487d46 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/ApiAdminReqheaderAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/ApiAdminReqheaderAction.java @@ -22,7 +22,6 @@ import java.util.stream.Collectors; import javax.annotation.Resource; -import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.ReqHeaderPager; import org.codelibs.fess.app.service.RequestHeaderService; import org.codelibs.fess.app.service.WebConfigService; @@ -60,8 +59,7 @@ public class ApiAdminReqheaderAction extends FessApiAdminAction { @Execute public JsonResponse settings(final SearchBody body) { validateApi(body, messages -> {}); - final ReqHeaderPager pager = new ReqHeaderPager(); - copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + final ReqHeaderPager pager = copyBeanToNewBean(body, ReqHeaderPager.class); final List list = reqHeaderService.getRequestHeaderList(pager); return asJson(new ApiResult.ApiConfigsResponse() .settings(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/SearchBody.java index 491ddaf46..f31701367 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/SearchBody.java @@ -15,8 +15,9 @@ */ package org.codelibs.fess.app.web.api.admin.reqheader; -import org.codelibs.fess.app.web.admin.reqheader.SearchForm; +import org.codelibs.fess.app.web.api.admin.BaseSearchBody; -public class SearchBody extends SearchForm { +public class SearchBody extends BaseSearchBody { + public String id; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/role/ApiAdminRoleAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/role/ApiAdminRoleAction.java index dbde051be..3f8afeb75 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/role/ApiAdminRoleAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/role/ApiAdminRoleAction.java @@ -22,7 +22,6 @@ import java.util.stream.Collectors; import javax.annotation.Resource; -import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.RolePager; import org.codelibs.fess.app.service.RoleService; import org.codelibs.fess.app.web.CrudMode; @@ -42,8 +41,7 @@ public class ApiAdminRoleAction extends FessApiAdminAction { @Execute public JsonResponse settings(final SearchBody body) { validateApi(body, messages -> {}); - final RolePager pager = new RolePager(); - copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + final RolePager pager = copyBeanToNewBean(body, RolePager.class); final List list = roleService.getRoleList(pager); return asJson(new ApiResult.ApiConfigsResponse() .settings(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/role/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/role/SearchBody.java index e48ebedc5..2d55634f0 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/role/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/role/SearchBody.java @@ -15,7 +15,8 @@ */ package org.codelibs.fess.app.web.api.admin.role; -import org.codelibs.fess.app.web.admin.role.SearchForm; +import org.codelibs.fess.app.web.api.admin.BaseSearchBody; -public class SearchBody extends SearchForm { +public class SearchBody extends BaseSearchBody { + public String id; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/ApiAdminSchedulerAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/ApiAdminSchedulerAction.java index ee3ac5ab3..ce63101dd 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/ApiAdminSchedulerAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/ApiAdminSchedulerAction.java @@ -93,8 +93,7 @@ public class ApiAdminSchedulerAction extends FessApiAdminAction { @Execute public JsonResponse settings(final SearchBody body) { validateApi(body, messages -> {}); - final SchedulerPager pager = new SchedulerPager(); - copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + final SchedulerPager pager = copyBeanToNewBean(body, SchedulerPager.class); final List list = scheduledJobService.getScheduledJobList(pager); return asJson(new ApiResult.ApiConfigsResponse() .settings(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/SearchBody.java index 4f37509b5..4b7c7ff40 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/SearchBody.java @@ -15,7 +15,8 @@ */ package org.codelibs.fess.app.web.api.admin.scheduler; -import org.codelibs.fess.app.web.admin.scheduler.SearchForm; +import org.codelibs.fess.app.web.api.admin.BaseSearchBody; -public class SearchBody extends SearchForm { +public class SearchBody extends BaseSearchBody { + public String id; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/user/ApiAdminUserAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/user/ApiAdminUserAction.java index 7007ae7a1..16008f62c 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/user/ApiAdminUserAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/user/ApiAdminUserAction.java @@ -22,7 +22,6 @@ import java.util.stream.Collectors; import javax.annotation.Resource; -import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.UserPager; import org.codelibs.fess.app.service.UserService; import org.codelibs.fess.app.web.CrudMode; @@ -42,8 +41,7 @@ public class ApiAdminUserAction extends FessApiAdminAction { @Execute public JsonResponse settings(final SearchBody body) { validateApi(body, messages -> {}); - final UserPager pager = new UserPager(); - copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + final UserPager pager = copyBeanToNewBean(body, UserPager.class); final List list = userService.getUserList(pager); return asJson(new ApiResult.ApiConfigsResponse() .settings(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/user/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/user/SearchBody.java index bbfe65bb6..eb988cfc1 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/user/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/user/SearchBody.java @@ -15,7 +15,8 @@ */ package org.codelibs.fess.app.web.api.admin.user; -import org.codelibs.fess.app.web.admin.user.SearchForm; +import org.codelibs.fess.app.web.api.admin.BaseSearchBody; -public class SearchBody extends SearchForm { +public class SearchBody extends BaseSearchBody { + public String id; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/ApiAdminWebauthAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/ApiAdminWebauthAction.java index 421154358..52f13dacc 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/ApiAdminWebauthAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/ApiAdminWebauthAction.java @@ -22,7 +22,6 @@ import java.util.stream.Collectors; import javax.annotation.Resource; -import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.WebAuthPager; import org.codelibs.fess.app.service.WebAuthenticationService; import org.codelibs.fess.app.service.WebConfigService; @@ -60,8 +59,7 @@ public class ApiAdminWebauthAction extends FessApiAdminAction { @Execute public JsonResponse settings(final SearchBody body) { validateApi(body, messages -> {}); - final WebAuthPager pager = new WebAuthPager(); - copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + final WebAuthPager pager = copyBeanToNewBean(body, WebAuthPager.class); final List list = webAuthService.getWebAuthenticationList(pager); return asJson(new ApiResult.ApiConfigsResponse() .settings(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/SearchBody.java index 60f138fc1..677ae5503 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/webauth/SearchBody.java @@ -15,8 +15,9 @@ */ package org.codelibs.fess.app.web.api.admin.webauth; -import org.codelibs.fess.app.web.admin.webauth.SearchForm; +import org.codelibs.fess.app.web.api.admin.BaseSearchBody; -public class SearchBody extends SearchForm { +public class SearchBody extends BaseSearchBody { + public String id; } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/ApiAdminWebconfigAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/ApiAdminWebconfigAction.java index 21f7bd09b..580ae514c 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/ApiAdminWebconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/ApiAdminWebconfigAction.java @@ -22,7 +22,6 @@ import java.util.stream.Collectors; import javax.annotation.Resource; -import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.WebConfigPager; import org.codelibs.fess.app.service.WebConfigService; import org.codelibs.fess.app.web.CrudMode; @@ -56,10 +55,7 @@ public class ApiAdminWebconfigAction extends FessApiAdminAction { @Execute public JsonResponse settings(final SearchBody body) { validateApi(body, messages -> {}); - final WebConfigPager pager = new WebConfigPager(); - pager.setPageSize(body.size); - pager.setCurrentPageNumber(body.page); - copyBeanToBean(body, pager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + final WebConfigPager pager = copyBeanToNewBean(body, WebConfigPager.class); final List list = webConfigService.getWebConfigList(pager); return asJson(new ApiResult.ApiConfigsResponse() .settings(list.stream().map(entity -> createEditBody(entity)).collect(Collectors.toList())) diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/SearchBody.java index 622e8fe7d..4911572b8 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/SearchBody.java @@ -18,5 +18,6 @@ package org.codelibs.fess.app.web.api.admin.webconfig; import org.codelibs.fess.app.web.api.admin.BaseSearchBody; public class SearchBody extends BaseSearchBody { + public String id; } diff --git a/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java b/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java index 5a0b5f7e8..5581eff7c 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java +++ b/src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java @@ -189,6 +189,10 @@ public abstract class FessBaseAction extends TypicalAction // has several interf BeanUtil.copyBeanToBean(src, dest, option); } + protected static T copyBeanToNewBean(final Object src, final Class destClass) { + return BeanUtil.copyBeanToNewBean(src, destClass); + } + protected String buildThrowableMessage(final Throwable t) { final StringBuilder buf = new StringBuilder(100); Throwable current = t;