0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add RenderDataUtil and minor fixes.

Browse source
This commit is contained in:
Shinsuke Sugaya 2015-12-28 23:29:47 +09:00
parent e9d5761ba5
commit d05842eb15
36 changed files with 231 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java
View file

@ -164,7 +164,9 @@ public class CrawlingInfoService implements Serializable {
cb2.query().setCrawlingInfoId_InScope(crawlingInfoIdList);
});
crawlingInfoBhv.batchDelete(crawlingInfoList);
crawlingInfoBhv.batchDelete(crawlingInfoList, op -> {
op.setRefresh(true);
});
}
}
@ -185,7 +187,9 @@ public class CrawlingInfoService implements Serializable {
crawlingInfoParam.setCreatedTime(now);
}
}
crawlingInfoParamBhv.batchInsert(crawlingInfoParamList);
crawlingInfoParamBhv.batchInsert(crawlingInfoParamList, op -> {
op.setRefresh(true);
});
}
public List<CrawlingInfoParam> getCrawlingInfoParamList(final String id) {
@ -251,7 +255,9 @@ public class CrawlingInfoService implements Serializable {
crawlingInfo = new CrawlingInfo();
crawlingInfo.setSessionId(list.get(0));
crawlingInfo.setCreatedTime(formatter.parse(list.get(1)).getTime());
crawlingInfoBhv.insert(crawlingInfo);
crawlingInfoBhv.insert(crawlingInfo, op -> {
op.setRefresh(true);
});
}
final CrawlingInfoParam entity = new CrawlingInfoParam();
@ -259,7 +265,9 @@ public class CrawlingInfoService implements Serializable {
entity.setKey(list.get(2));
entity.setValue(list.get(3));
entity.setCreatedTime(formatter.parse(list.get(4)).getTime());
crawlingInfoParamBhv.insert(entity);
crawlingInfoParamBhv.insert(entity, op -> {
op.setRefresh(true);
});
} catch (final Exception e) {
log.warn("Failed to read a click log: " + list, e);
}

5
src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java
View file

@ -37,6 +37,7 @@ import org.codelibs.fess.es.config.exentity.BadWord;
import org.codelibs.fess.exception.FessSystemException;
import org.codelibs.fess.helper.SuggestHelper;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -110,7 +111,7 @@ public class AdminBadwordAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("badWordItems", badWordService.getBadWordList(badWordPager)); // page navi
RenderDataUtil.register(data, "badWordItems", badWordService.getBadWordList(badWordPager)); // page navi
// restore from pager
copyBeanToBean(badWordPager, form, op -> op.include("id"));
@ -334,7 +335,7 @@ public class AdminBadwordAction extends FessAdminAction {
// =========
private HtmlResponse asListHtml() {
return asHtml(path_AdminBadword_AdminBadwordJsp).renderWith(data -> {
data.register("badWordItems", badWordService.getBadWordList(badWordPager));
RenderDataUtil.register(data, "badWordItems", badWordService.getBadWordList(badWordPager));
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(badWordPager, form, op -> op.include("id"));

5
src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java
View file

@ -24,6 +24,7 @@ import org.codelibs.fess.app.web.CrudMode;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.es.config.exentity.BoostDocumentRule;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -92,7 +93,7 @@ public class AdminBoostdocAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("boostDocumentRuleItems", boostDocumentRuleService.getBoostDocumentRuleList(boostDocPager)); // page navi
RenderDataUtil.register(data, "boostDocumentRuleItems", boostDocumentRuleService.getBoostDocumentRuleList(boostDocPager)); // page navi
// restore from pager
copyBeanToBean(boostDocPager, form, op -> op.include("id"));
@ -256,7 +257,7 @@ public class AdminBoostdocAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminBoostdoc_AdminBoostdocJsp).renderWith(data -> {
data.register("boostDocumentRuleItems", boostDocumentRuleService.getBoostDocumentRuleList(boostDocPager));
RenderDataUtil.register(data, "boostDocumentRuleItems", boostDocumentRuleService.getBoostDocumentRuleList(boostDocPager));
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(boostDocPager, form, op -> op.include("id"));

7
src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java
View file

@ -24,6 +24,7 @@ import org.codelibs.fess.app.web.CrudMode;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.helper.JobHelper;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
@ -101,7 +102,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("crawlingInfoItems", crawlingInfoService.getCrawlingInfoList(crawlingInfoPager)); // page navi
RenderDataUtil.register(data, "crawlingInfoItems", crawlingInfoService.getCrawlingInfoList(crawlingInfoPager)); // page navi
// restore from pager
copyBeanToBean(crawlingInfoPager, form, op -> op.include("sessionId"));
@ -130,7 +131,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction {
});
});
}).renderWith(data -> {
data.register("crawlingInfoParamItems", crawlingInfoService.getCrawlingInfoParamList(id));
RenderDataUtil.register(data, "crawlingInfoParamItems", crawlingInfoService.getCrawlingInfoParamList(id));
});
}
@ -180,7 +181,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminCrawlinginfo_AdminCrawlinginfoJsp).renderWith(data -> {
data.register("crawlingInfoItems", crawlingInfoService.getCrawlingInfoList(crawlingInfoPager)); // page navi
RenderDataUtil.register(data, "crawlingInfoItems", crawlingInfoService.getCrawlingInfoList(crawlingInfoPager)); // page navi
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(crawlingInfoPager, form, op -> op.include("id"));

3
src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java
View file

@ -20,6 +20,7 @@ import javax.annotation.Resource;
import org.codelibs.fess.api.es.EsApiManager;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.ruts.process.ActionRuntime;
@ -56,7 +57,7 @@ public class AdminDashboardAction extends FessAdminAction {
public HtmlResponse index() {
esApiManager.saveToken();
return asHtml(path_AdminDashboard_AdminDashboardJsp).renderWith(data -> {
data.register("serverPath", esApiManager.getServerPath());
RenderDataUtil.register(data, "serverPath", esApiManager.getServerPath());
});
}

11
src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java
View file

@ -32,6 +32,7 @@ import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.ds.DataStoreFactory;
import org.codelibs.fess.es.config.exentity.DataConfig;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -107,7 +108,7 @@ public class AdminDataconfigAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("dataConfigItems", dataConfigService.getDataConfigList(dataConfigPager)); // page navi
RenderDataUtil.register(data, "dataConfigItems", dataConfigService.getDataConfigList(dataConfigPager)); // page navi
// restore from pager
copyBeanToBean(dataConfigPager, form, op -> op.include("id"));
@ -254,8 +255,8 @@ public class AdminDataconfigAction extends FessAdminAction {
}
protected void registerRolesAndLabels(final RenderData data) {
data.register("roleTypeItems", roleTypeService.getRoleTypeList());
data.register("labelTypeItems", labelTypeService.getLabelTypeList());
RenderDataUtil.register(data, "roleTypeItems", roleTypeService.getRoleTypeList());
RenderDataUtil.register(data, "labelTypeItems", labelTypeService.getLabelTypeList());
}
protected void registerHandlerNames(final RenderData data) {
@ -267,7 +268,7 @@ public class AdminDataconfigAction extends FessAdminAction {
map.put(Constants.ITEM_VALUE, name);
itemList.add(map);
}
data.register("handlerNameItems", itemList);
RenderDataUtil.register(data, "handlerNameItems", itemList);
}
// ===================================================================================
@ -287,7 +288,7 @@ public class AdminDataconfigAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminDataconfig_AdminDataconfigJsp).renderWith(data -> {
data.register("dataConfigItems", dataConfigService.getDataConfigList(dataConfigPager));
RenderDataUtil.register(data, "dataConfigItems", dataConfigService.getDataConfigList(dataConfigPager));
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(dataConfigPager, form, op -> op.include("id"));

3
src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java
View file

@ -22,6 +22,7 @@ import org.codelibs.fess.dict.DictionaryFile;
import org.codelibs.fess.dict.DictionaryItem;
import org.codelibs.fess.dict.DictionaryManager;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.ruts.process.ActionRuntime;
@ -55,7 +56,7 @@ public class AdminDictAction extends FessAdminAction {
public HtmlResponse index() {
return asHtml(path_AdminDict_AdminDictJsp).renderWith(data -> {
final DictionaryFile<? extends DictionaryItem>[] dictFiles = dictionaryManager.getDictionaryFiles();
data.register("dictFiles", dictFiles);
RenderDataUtil.register(data, "dictFiles", dictFiles);
});
}
}

9
src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java
View file

@ -32,6 +32,7 @@ import org.codelibs.fess.app.web.admin.dict.AdminDictAction;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.dict.kuromoji.KuromojiItem;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -111,7 +112,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
protected void searchPaging(final RenderData data, final SearchForm form) {
// page navi
data.register("kuromojiItemItems", kuromojiService.getKuromojiList(form.dictId, kuromojiPager));
RenderDataUtil.register(data, "kuromojiItemItems", kuromojiService.getKuromojiList(form.dictId, kuromojiPager));
// restore from pager
BeanUtil.copyBeanToBean(kuromojiPager, form, op -> {
@ -201,7 +202,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
});
}).renderWith(data -> {
kuromojiService.getKuromojiFile(dictId).ifPresent(file -> {
data.register("path", file.getPath());
RenderDataUtil.register(data, "path", file.getPath());
}).orElse(() -> {
throwValidationError(messages -> messages.addErrorsFailedToDownloadKuromojiFile(GLOBAL), () -> asDictIndexHtml());
});
@ -236,7 +237,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
});
}).renderWith(data -> {
kuromojiService.getKuromojiFile(dictId).ifPresent(file -> {
data.register("path", file.getPath());
RenderDataUtil.register(data, "path", file.getPath());
}).orElse(() -> {
throwValidationError(messages -> messages.addErrorsFailedToDownloadKuromojiFile(GLOBAL), () -> asDictIndexHtml());
});
@ -367,7 +368,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
private HtmlResponse asListHtml(final String dictId) {
return asHtml(path_AdminDictKuromoji_AdminDictKuromojiJsp).renderWith(data -> {
data.register("kuromojiItemItems", kuromojiService.getKuromojiList(dictId, kuromojiPager));
RenderDataUtil.register(data, "kuromojiItemItems", kuromojiService.getKuromojiList(dictId, kuromojiPager));
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(kuromojiPager, form, op -> op.include("id"));

9
src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java
View file

@ -34,6 +34,7 @@ import org.codelibs.fess.app.web.admin.dict.AdminDictAction;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.dict.synonym.SynonymItem;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -114,7 +115,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
protected void searchPaging(final RenderData data, final SearchForm form) {
// page navi
data.register("synonymItemItems", synonymService.getSynonymList(form.dictId, synonymPager));
RenderDataUtil.register(data, "synonymItemItems", synonymService.getSynonymList(form.dictId, synonymPager));
// restore from pager
BeanUtil.copyBeanToBean(synonymPager, form, op -> {
@ -205,7 +206,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
});
}).renderWith(data -> {
synonymService.getSynonymFile(dictId).ifPresent(file -> {
data.register("path", file.getPath());
RenderDataUtil.register(data, "path", file.getPath());
}).orElse(() -> {
throwValidationError(messages -> messages.addErrorsFailedToDownloadSynonymFile(GLOBAL), () -> asDictIndexHtml());
});
@ -240,7 +241,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
});
}).renderWith(data -> {
synonymService.getSynonymFile(dictId).ifPresent(file -> {
data.register("path", file.getPath());
RenderDataUtil.register(data, "path", file.getPath());
}).orElse(() -> {
throwValidationError(messages -> messages.addErrorsFailedToDownloadSynonymFile(GLOBAL), () -> asDictIndexHtml());
});
@ -405,7 +406,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
private HtmlResponse asListHtml(final String dictId) {
return asHtml(path_AdminDictSynonym_AdminDictSynonymJsp).renderWith(data -> {
data.register("synonymItemItems", synonymService.getSynonymList(dictId, synonymPager));
RenderDataUtil.register(data, "synonymItemItems", synonymService.getSynonymList(dictId, synonymPager));
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(synonymPager, form, op -> op.include("id"));

5
src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java
View file

@ -24,6 +24,7 @@ import org.codelibs.fess.app.web.CrudMode;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.es.config.exentity.DuplicateHost;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -93,7 +94,7 @@ public class AdminDuplicatehostAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("duplicateHostItems", duplicateHostService.getDuplicateHostList(duplicateHostPager)); // page navi
RenderDataUtil.register(data, "duplicateHostItems", duplicateHostService.getDuplicateHostList(duplicateHostPager)); // page navi
// restore from pager
copyBeanToBean(duplicateHostPager, form, op -> op.include("id"));
@ -256,7 +257,7 @@ public class AdminDuplicatehostAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminDuplicatehost_AdminDuplicatehostJsp).renderWith(data -> {
data.register("duplicateHostItems", duplicateHostService.getDuplicateHostList(duplicateHostPager)); // page navi
RenderDataUtil.register(data, "duplicateHostItems", duplicateHostService.getDuplicateHostList(duplicateHostPager)); // page navi
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(duplicateHostPager, form, op -> op.include("id"));

7
src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java
View file

@ -38,6 +38,7 @@ import org.codelibs.fess.es.config.exentity.ElevateWord;
import org.codelibs.fess.exception.FessSystemException;
import org.codelibs.fess.helper.SuggestHelper;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -113,7 +114,7 @@ public class AdminElevatewordAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("elevateWordItems", elevateWordService.getElevateWordList(elevateWordPager)); // page navi
RenderDataUtil.register(data, "elevateWordItems", elevateWordService.getElevateWordList(elevateWordPager)); // page navi
// restore from pager
copyBeanToBean(elevateWordPager, form, op -> op.include("id"));
@ -326,7 +327,7 @@ public class AdminElevatewordAction extends FessAdminAction {
}
protected void registerLabels(final RenderData data) {
data.register("labelTypeItems", labelTypeService.getLabelTypeList());
RenderDataUtil.register(data, "labelTypeItems", labelTypeService.getLabelTypeList());
}
// ===================================================================================
@ -349,7 +350,7 @@ public class AdminElevatewordAction extends FessAdminAction {
// =========
private HtmlResponse asListHtml() {
return asHtml(path_AdminElevateword_AdminElevatewordJsp).renderWith(data -> {
data.register("elevateWordItems", elevateWordService.getElevateWordList(elevateWordPager)); // page navi
RenderDataUtil.register(data, "elevateWordItems", elevateWordService.getElevateWordList(elevateWordPager)); // page navi
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(elevateWordPager, form, op -> op.include("id"));

5
src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java
View file

@ -23,6 +23,7 @@ import org.codelibs.fess.app.service.FailureUrlService;
import org.codelibs.fess.app.web.CrudMode;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
@ -94,7 +95,7 @@ public class AdminFailureurlAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("failureUrlItems", failureUrlService.getFailureUrlList(failureUrlPager)); // page navi
RenderDataUtil.register(data, "failureUrlItems", failureUrlService.getFailureUrlList(failureUrlPager)); // page navi
// restore from pager
copyBeanToBean(failureUrlPager, form, op -> op.include("url", "errorCountMin", "errorCountMax", "errorName"));
@ -163,7 +164,7 @@ public class AdminFailureurlAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminFailureurl_AdminFailureurlJsp).renderWith(data -> {
data.register("failureUrlItems", failureUrlService.getFailureUrlList(failureUrlPager)); // page navi
RenderDataUtil.register(data, "failureUrlItems", failureUrlService.getFailureUrlList(failureUrlPager)); // page navi
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(failureUrlPager, form, op -> op.include("url", "errorCountMin", "errorCountMax", "errorName"));

21
src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java
View file

@ -33,6 +33,7 @@ import org.codelibs.fess.es.config.exentity.FileAuthentication;
import org.codelibs.fess.es.config.exentity.FileConfig;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -106,8 +107,9 @@ public class AdminFileauthAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("fileAuthenticationItems", fileAuthenticationService.getFileAuthenticationList(fileAuthenticationPager)); // page navi
data.register("displayCreateLink", !fileConfigService.getAllFileConfigList(false, false, false, null).isEmpty());
RenderDataUtil.register(data, "fileAuthenticationItems",
fileAuthenticationService.getFileAuthenticationList(fileAuthenticationPager)); // page navi
RenderDataUtil.register(data, "displayCreateLink", !fileConfigService.getAllFileConfigList(false, false, false, null).isEmpty());
// restore from pager
copyBeanToBean(fileAuthenticationPager, form, op -> op.include("id"));
}
@ -259,7 +261,7 @@ public class AdminFileauthAction extends FessAdminAction {
final List<Map<String, String>> itemList = new ArrayList<Map<String, String>>();
final Locale locale = LaRequestUtil.getRequest().getLocale();
itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.file_auth_scheme_samba"), Constants.SAMBA));
data.register("protocolSchemeItems", itemList);
RenderDataUtil.register(data, "protocolSchemeItems", itemList);
}
protected void registerFileConfigItems(final RenderData data) {
@ -268,7 +270,7 @@ public class AdminFileauthAction extends FessAdminAction {
for (final FileConfig fileConfig : fileConfigList) {
itemList.add(createItem(fileConfig.getName(), fileConfig.getId().toString()));
}
data.register("fileConfigItems", itemList);
RenderDataUtil.register(data, "fileConfigItems", itemList);
}
protected Map<String, String> createItem(final String label, final String value) {
@ -294,10 +296,13 @@ public class AdminFileauthAction extends FessAdminAction {
// =========
private HtmlResponse asListHtml() {
return asHtml(path_AdminFileauth_AdminFileauthJsp).renderWith(data -> {
data.register("fileAuthenticationItems", fileAuthenticationService.getFileAuthenticationList(fileAuthenticationPager)); // page navi
data.register("displayCreateLink", !fileConfigService.getAllFileConfigList(false, false, false, null).isEmpty());
}).useForm(SearchForm.class, setup -> {
return asHtml(path_AdminFileauth_AdminFileauthJsp).renderWith(
data -> {
RenderDataUtil.register(data, "fileAuthenticationItems",
fileAuthenticationService.getFileAuthenticationList(fileAuthenticationPager)); // page navi
RenderDataUtil.register(data, "displayCreateLink", !fileConfigService.getAllFileConfigList(false, false, false, null)
.isEmpty());
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(fileAuthenticationPager, form, op -> op.include("id"));
});

9
src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java
View file

@ -26,6 +26,7 @@ import org.codelibs.fess.app.web.CrudMode;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.es.config.exentity.FileConfig;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -99,7 +100,7 @@ public class AdminFileconfigAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("fileConfigItems", fileConfigService.getFileConfigList(fileConfigPager)); // page navi
RenderDataUtil.register(data, "fileConfigItems", fileConfigService.getFileConfigList(fileConfigPager)); // page navi
// restore from pager
copyBeanToBean(fileConfigPager, form, op -> op.include("id"));
@ -250,8 +251,8 @@ public class AdminFileconfigAction extends FessAdminAction {
}
protected void registerRolesAndLabels(final RenderData data) {
data.register("roleTypeItems", roleTypeService.getRoleTypeList());
data.register("labelTypeItems", labelTypeService.getLabelTypeList());
RenderDataUtil.register(data, "roleTypeItems", roleTypeService.getRoleTypeList());
RenderDataUtil.register(data, "labelTypeItems", labelTypeService.getLabelTypeList());
}
// ===================================================================================
@ -271,7 +272,7 @@ public class AdminFileconfigAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminFileconfig_AdminFileconfigJsp).renderWith(data -> {
data.register("fileConfigItems", fileConfigService.getFileConfigList(fileConfigPager)); // page navi
RenderDataUtil.register(data, "fileConfigItems", fileConfigService.getFileConfigList(fileConfigPager)); // page navi
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(fileConfigPager, form, op -> op.include("id"));

5
src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java
View file

@ -26,6 +26,7 @@ import org.codelibs.fess.app.web.CrudMode;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.es.user.exentity.Group;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -95,7 +96,7 @@ public class AdminGroupAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("groupItems", groupService.getGroupList(groupPager)); // page navi
RenderDataUtil.register(data, "groupItems", groupService.getGroupList(groupPager)); // page navi
// restore from pager
copyBeanToBean(groupPager, form, op -> op.include("id"));
@ -253,7 +254,7 @@ public class AdminGroupAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminGroup_AdminGroupJsp).renderWith(data -> {
data.register("groupItems", groupService.getGroupList(groupPager)); // page navi
RenderDataUtil.register(data, "groupItems", groupService.getGroupList(groupPager)); // page navi
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(groupPager, form, op -> op.include("id"));

5
src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java
View file

@ -23,6 +23,7 @@ import org.codelibs.fess.app.service.JobLogService;
import org.codelibs.fess.app.web.CrudMode;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
@ -93,7 +94,7 @@ public class AdminJoblogAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("jobLogItems", jobLogService.getJobLogList(jobLogPager)); // page navi
RenderDataUtil.register(data, "jobLogItems", jobLogService.getJobLogList(jobLogPager)); // page navi
// restore from pager
copyBeanToBean(jobLogPager, form, op -> op.include("id"));
@ -164,7 +165,7 @@ public class AdminJoblogAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminJoblog_AdminJoblogJsp).renderWith(data -> {
data.register("jobLogItems", jobLogService.getJobLogList(jobLogPager)); // page navi
RenderDataUtil.register(data, "jobLogItems", jobLogService.getJobLogList(jobLogPager)); // page navi
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(jobLogPager, form, op -> op.include("id"));

5
src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java
View file

@ -25,6 +25,7 @@ import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.es.config.exentity.KeyMatch;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -94,7 +95,7 @@ public class AdminKeymatchAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("keyMatchItems", keyMatchService.getKeyMatchList(keyMatchPager)); // page navi
RenderDataUtil.register(data, "keyMatchItems", keyMatchService.getKeyMatchList(keyMatchPager)); // page navi
// restore from pager
copyBeanToBean(keyMatchPager, form, op -> op.include("id"));
@ -261,7 +262,7 @@ public class AdminKeymatchAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminKeymatch_AdminKeymatchJsp).renderWith(data -> {
data.register("keyMatchItems", keyMatchService.getKeyMatchList(keyMatchPager)); // page navi
RenderDataUtil.register(data, "keyMatchItems", keyMatchService.getKeyMatchList(keyMatchPager)); // page navi
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(keyMatchPager, form, op -> op.include("id"));

7
src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java
View file

@ -25,6 +25,7 @@ import org.codelibs.fess.app.web.CrudMode;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.es.config.exentity.LabelType;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -97,7 +98,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("labelTypeItems", labelTypeService.getLabelTypeList(labelTypePager)); // page navi
RenderDataUtil.register(data, "labelTypeItems", labelTypeService.getLabelTypeList(labelTypePager)); // page navi
// restore from pager
copyBeanToBean(labelTypePager, form, op -> op.include("id"));
@ -249,7 +250,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
}
protected void registerRoleTypeItems(final RenderData data) {
data.register("roleTypeItems", roleTypeService.getRoleTypeList());
RenderDataUtil.register(data, "roleTypeItems", roleTypeService.getRoleTypeList());
}
// ===================================================================================
@ -269,7 +270,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminLabeltype_AdminLabeltypeJsp).renderWith(data -> {
data.register("labelTypeItems", labelTypeService.getLabelTypeList(labelTypePager)); // page navi
RenderDataUtil.register(data, "labelTypeItems", labelTypeService.getLabelTypeList(labelTypePager)); // page navi
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(labelTypePager, form, op -> op.include("id"));

3
src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java
View file

@ -35,6 +35,7 @@ import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.exception.FessSystemException;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.lastaflute.di.exception.IORuntimeException;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.ActionResponse;
@ -106,7 +107,7 @@ public class AdminLogAction extends FessAdminAction {
private HtmlResponse asIndexHtml() {
return asHtml(path_AdminLog_AdminLogJsp).renderWith(data -> {
data.register("logFileItems", getLogFileItems());
RenderDataUtil.register(data, "logFileItems", getLogFileItems());
});
}

5
src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java
View file

@ -24,6 +24,7 @@ import org.codelibs.fess.app.web.CrudMode;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.es.config.exentity.PathMapping;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -94,7 +95,7 @@ public class AdminPathmapAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("pathMappingItems", pathMappingService.getPathMappingList(pathMapPager)); // page navi
RenderDataUtil.register(data, "pathMappingItems", pathMappingService.getPathMappingList(pathMapPager)); // page navi
// restore from pager
copyBeanToBean(pathMapPager, form, op -> op.include("id"));
@ -257,7 +258,7 @@ public class AdminPathmapAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminPathmap_AdminPathmapJsp).renderWith(data -> {
data.register("pathMappingItems", pathMappingService.getPathMappingList(pathMapPager)); // page navi
RenderDataUtil.register(data, "pathMappingItems", pathMappingService.getPathMappingList(pathMapPager)); // page navi
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(pathMapPager, form, op -> op.include("id"));

14
src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java
View file

@ -33,6 +33,7 @@ import org.codelibs.fess.es.config.exentity.RequestHeader;
import org.codelibs.fess.es.config.exentity.WebConfig;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -106,8 +107,8 @@ public class AdminReqheaderAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("requestHeaderItems", requestHeaderService.getRequestHeaderList(reqHeaderPager)); // page navi
data.register("displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty());
RenderDataUtil.register(data, "requestHeaderItems", requestHeaderService.getRequestHeaderList(reqHeaderPager)); // page navi
RenderDataUtil.register(data, "displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty());
// restore from pager
copyBeanToBean(reqHeaderPager, form, op -> op.include("id"));
@ -262,7 +263,7 @@ public class AdminReqheaderAction extends FessAdminAction {
itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.webauth_scheme_basic"), Constants.BASIC));
itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.webauth_scheme_digest"), Constants.DIGEST));
itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.webauth_scheme_ntlm"), Constants.NTLM));
data.register("protocolSchemeItems", itemList);
RenderDataUtil.register(data, "protocolSchemeItems", itemList);
}
protected void registerWebConfigItems(final RenderData data) {
@ -271,7 +272,7 @@ public class AdminReqheaderAction extends FessAdminAction {
for (final WebConfig webConfig : webConfigList) {
itemList.add(createItem(webConfig.getName(), webConfig.getId().toString()));
}
data.register("webConfigItems", itemList);
RenderDataUtil.register(data, "webConfigItems", itemList);
}
protected Map<String, String> createItem(final String label, final String value) {
@ -298,8 +299,9 @@ public class AdminReqheaderAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminReqheader_AdminReqheaderJsp).renderWith(data -> {
data.register("requestHeaderItems", requestHeaderService.getRequestHeaderList(reqHeaderPager)); // page navi
data.register("displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty());
RenderDataUtil.register(data, "requestHeaderItems", requestHeaderService.getRequestHeaderList(reqHeaderPager)); // page navi
RenderDataUtil.register(data, "displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null)
.isEmpty());
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(reqHeaderPager, form, op -> op.include("id"));

5
src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java
View file

@ -26,6 +26,7 @@ import org.codelibs.fess.app.web.CrudMode;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.es.user.exentity.Role;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -95,7 +96,7 @@ public class AdminRoleAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("roleItems", roleService.getRoleList(rolePager)); // page navi
RenderDataUtil.register(data, "roleItems", roleService.getRoleList(rolePager)); // page navi
// restore from pager
copyBeanToBean(rolePager, form, op -> op.include("id"));
@ -253,7 +254,7 @@ public class AdminRoleAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminRole_AdminRoleJsp).renderWith(data -> {
data.register("roleItems", roleService.getRoleList(rolePager)); // page navi
RenderDataUtil.register(data, "roleItems", roleService.getRoleList(rolePager)); // page navi
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(rolePager, form, op -> op.include("id"));

5
src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java
View file

@ -24,6 +24,7 @@ import org.codelibs.fess.app.web.CrudMode;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.es.config.exentity.RoleType;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -93,7 +94,7 @@ public class AdminRoletypeAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("roleTypeItems", roleTypeService.getRoleTypeList(roleTypePager)); // page navi
RenderDataUtil.register(data, "roleTypeItems", roleTypeService.getRoleTypeList(roleTypePager)); // page navi
// restore from pager
copyBeanToBean(roleTypePager, form, op -> op.include("id"));
@ -259,7 +260,7 @@ public class AdminRoletypeAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminRoletype_AdminRoletypeJsp).renderWith(data -> {
data.register("roleTypeItems", roleTypeService.getRoleTypeList(roleTypePager)); // page navi
RenderDataUtil.register(data, "roleTypeItems", roleTypeService.getRoleTypeList(roleTypePager)); // page navi
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(roleTypePager, form, op -> op.include("id"));

5
src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
View file

@ -27,6 +27,7 @@ import org.codelibs.fess.helper.JobHelper;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.job.JobExecutor;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -99,7 +100,7 @@ public class AdminSchedulerAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("scheduledJobItems", scheduledJobService.getScheduledJobList(schedulerPager)); // page navi
RenderDataUtil.register(data, "scheduledJobItems", scheduledJobService.getScheduledJobList(schedulerPager)); // page navi
// restore from pager
copyBeanToBean(schedulerPager, form, op -> op.include("id"));
@ -352,7 +353,7 @@ public class AdminSchedulerAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminScheduler_AdminSchedulerJsp).renderWith(data -> {
data.register("scheduledJobItems", scheduledJobService.getScheduledJobList(schedulerPager)); // page navi
RenderDataUtil.register(data, "scheduledJobItems", scheduledJobService.getScheduledJobList(schedulerPager)); // page navi
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(schedulerPager, form, op -> op.include("id"));

29
src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
View file

@ -32,6 +32,7 @@ import org.codelibs.fess.exception.ResultOffsetExceededException;
import org.codelibs.fess.helper.JobHelper;
import org.codelibs.fess.helper.QueryHelper;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.lastaflute.web.Execute;
@ -246,85 +247,85 @@ public class AdminSearchlistAction extends FessAdminAction {
@Override
public void setDocumentItems(final List<Map<String, Object>> documentItems) {
data.register("documentItems", documentItems);
RenderDataUtil.register(data, "documentItems", documentItems);
super.setDocumentItems(documentItems);
}
@Override
public void setExecTime(final String execTime) {
data.register("execTime", execTime);
RenderDataUtil.register(data, "execTime", execTime);
super.setExecTime(execTime);
}
@Override
public void setPageSize(final int pageSize) {
data.register("pageSize", pageSize);
RenderDataUtil.register(data, "pageSize", pageSize);
super.setPageSize(pageSize);
}
@Override
public void setCurrentPageNumber(final int currentPageNumber) {
data.register("currentPageNumber", currentPageNumber);
RenderDataUtil.register(data, "currentPageNumber", currentPageNumber);
super.setCurrentPageNumber(currentPageNumber);
}
@Override
public void setAllRecordCount(final long allRecordCount) {
data.register("allRecordCount", allRecordCount);
RenderDataUtil.register(data, "allRecordCount", allRecordCount);
super.setAllRecordCount(allRecordCount);
}
@Override
public void setAllPageCount(final int allPageCount) {
data.register("allPageCount", allPageCount);
RenderDataUtil.register(data, "allPageCount", allPageCount);
super.setAllPageCount(allPageCount);
}
@Override
public void setExistNextPage(final boolean existNextPage) {
data.register("existNextPage", existNextPage);
RenderDataUtil.register(data, "existNextPage", existNextPage);
super.setExistNextPage(existNextPage);
}
@Override
public void setExistPrevPage(final boolean existPrevPage) {
data.register("existPrevPage", existPrevPage);
RenderDataUtil.register(data, "existPrevPage", existPrevPage);
super.setExistPrevPage(existPrevPage);
}
@Override
public void setCurrentStartRecordNumber(final long currentStartRecordNumber) {
data.register("currentStartRecordNumber", currentStartRecordNumber);
RenderDataUtil.register(data, "currentStartRecordNumber", currentStartRecordNumber);
super.setCurrentStartRecordNumber(currentStartRecordNumber);
}
@Override
public void setCurrentEndRecordNumber(final long currentEndRecordNumber) {
data.register("currentEndRecordNumber", currentEndRecordNumber);
RenderDataUtil.register(data, "currentEndRecordNumber", currentEndRecordNumber);
super.setCurrentEndRecordNumber(currentEndRecordNumber);
}
@Override
public void setPageNumberList(final List<String> pageNumberList) {
data.register("pageNumberList", pageNumberList);
RenderDataUtil.register(data, "pageNumberList", pageNumberList);
super.setPageNumberList(pageNumberList);
}
@Override
public void setPartialResults(final boolean partialResults) {
data.register("partialResults", partialResults);
RenderDataUtil.register(data, "partialResults", partialResults);
super.setPartialResults(partialResults);
}
@Override
public void setQueryTime(final long queryTime) {
data.register("queryTime", queryTime);
RenderDataUtil.register(data, "queryTime", queryTime);
super.setQueryTime(queryTime);
}
@Override
public void setSearchQuery(final String searchQuery) {
data.register("searchQuery", searchQuery);
RenderDataUtil.register(data, "searchQuery", searchQuery);
super.setSearchQuery(searchQuery);
}
}

9
src/main/java/org/codelibs/fess/app/web/admin/systeminfo/AdminSysteminfoAction.java
View file

@ -27,6 +27,7 @@ import org.codelibs.core.misc.DynamicProperties;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
@ -80,7 +81,7 @@ public class AdminSysteminfoAction extends FessAdminAction {
for (final Map.Entry<String, String> entry : System.getenv().entrySet()) {
itemList.add(createItem(entry.getKey(), entry.getValue()));
}
data.register("envItems", itemList);
RenderDataUtil.register(data, "envItems", itemList);
}
protected void registerPropItems(final RenderData data) {
@ -88,7 +89,7 @@ public class AdminSysteminfoAction extends FessAdminAction {
for (final Map.Entry<Object, Object> entry : System.getProperties().entrySet()) {
itemList.add(createItem(entry.getKey(), entry.getValue()));
}
data.register("propItems", itemList);
RenderDataUtil.register(data, "propItems", itemList);
}
protected void registerFessPropItems(final RenderData data) {
@ -96,7 +97,7 @@ public class AdminSysteminfoAction extends FessAdminAction {
for (final Map.Entry<Object, Object> entry : crawlerProperties.entrySet()) {
itemList.add(createItem(entry.getKey(), entry.getValue()));
}
data.register("fessPropItems", itemList);
RenderDataUtil.register(data, "fessPropItems", itemList);
}
protected void registerBugReportItems(final RenderData data) {
@ -111,7 +112,7 @@ public class AdminSysteminfoAction extends FessAdminAction {
}
}
data.register("bugReportItems", itemList);
RenderDataUtil.register(data, "bugReportItems", itemList);
}
private boolean isBugReportTarget(final Object key) {

9
src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java
View file

@ -32,6 +32,7 @@ import org.codelibs.fess.app.web.CrudMode;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.es.user.exentity.User;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -106,14 +107,14 @@ public class AdminUserAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("userItems", userService.getUserList(userPager)); // page navi
RenderDataUtil.register(data, "userItems", userService.getUserList(userPager)); // page navi
// restore from pager
copyBeanToBean(userPager, form, op -> op.include("id"));
}
private void registerForms(final RenderData data) {
data.register("roleItems", roleService.getAvailableRoleList());
data.register("groupItems", groupService.getAvailableGroupList());
RenderDataUtil.register(data, "roleItems", roleService.getAvailableRoleList());
RenderDataUtil.register(data, "groupItems", groupService.getAvailableGroupList());
}
// ===================================================================================
@ -307,7 +308,7 @@ public class AdminUserAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminUser_AdminUserJsp).renderWith(data -> {
data.register("userItems", userService.getUserList(userPager)); // page navi
RenderDataUtil.register(data, "userItems", userService.getUserList(userPager)); // page navi
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(userPager, form, op -> op.include("id"));

14
src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java
View file

@ -33,6 +33,7 @@ import org.codelibs.fess.es.config.exentity.WebAuthentication;
import org.codelibs.fess.es.config.exentity.WebConfig;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -106,8 +107,8 @@ public class AdminWebauthAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("webAuthenticationItems", webAuthenticationService.getWebAuthenticationList(webAuthPager)); // page navi
data.register("displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty());
RenderDataUtil.register(data, "webAuthenticationItems", webAuthenticationService.getWebAuthenticationList(webAuthPager)); // page navi
RenderDataUtil.register(data, "displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty());
// restore from pager
copyBeanToBean(webAuthPager, form, op -> op.include("id"));
}
@ -261,7 +262,7 @@ public class AdminWebauthAction extends FessAdminAction {
itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.webauth_scheme_basic"), Constants.BASIC));
itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.webauth_scheme_digest"), Constants.DIGEST));
itemList.add(createItem(ComponentUtil.getMessageManager().getMessage(locale, "labels.webauth_scheme_ntlm"), Constants.NTLM));
data.register("protocolSchemeItems", itemList);
RenderDataUtil.register(data, "protocolSchemeItems", itemList);
}
protected void registerWebConfigItems(final RenderData data) {
@ -270,7 +271,7 @@ public class AdminWebauthAction extends FessAdminAction {
for (final WebConfig webConfig : webConfigList) {
itemList.add(createItem(webConfig.getName(), webConfig.getId().toString()));
}
data.register("webConfigItems", itemList);
RenderDataUtil.register(data, "webConfigItems", itemList);
}
protected Map<String, String> createItem(final String label, final String value) {
@ -297,8 +298,9 @@ public class AdminWebauthAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminWebauth_AdminWebauthJsp).renderWith(data -> {
data.register("webAuthenticationItems", webAuthenticationService.getWebAuthenticationList(webAuthPager)); // page navi
data.register("displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty());
RenderDataUtil.register(data, "webAuthenticationItems", webAuthenticationService.getWebAuthenticationList(webAuthPager)); // page navi
RenderDataUtil.register(data, "displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null)
.isEmpty());
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(webAuthPager, form, op -> op.include("id"));

9
src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java
View file

@ -27,6 +27,7 @@ import org.codelibs.fess.app.web.CrudMode;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.es.config.exentity.WebConfig;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.Execute;
@ -103,7 +104,7 @@ public class AdminWebconfigAction extends FessAdminAction {
}
protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("webConfigItems", webConfigService.getWebConfigList(webConfigPager)); // page navi
RenderDataUtil.register(data, "webConfigItems", webConfigService.getWebConfigList(webConfigPager)); // page navi
// restore from webConfigPager
copyBeanToBean(webConfigPager, form, op -> op.include("id"));
@ -250,8 +251,8 @@ public class AdminWebconfigAction extends FessAdminAction {
}
protected void registerRolesAndLabels(final RenderData data) {
data.register("roleTypeItems", roleTypeService.getRoleTypeList());
data.register("labelTypeItems", labelTypeService.getLabelTypeList());
RenderDataUtil.register(data, "roleTypeItems", roleTypeService.getRoleTypeList());
RenderDataUtil.register(data, "labelTypeItems", labelTypeService.getLabelTypeList());
}
// ===================================================================================
@ -271,7 +272,7 @@ public class AdminWebconfigAction extends FessAdminAction {
private HtmlResponse asListHtml() {
return asHtml(path_AdminWebconfig_AdminWebconfigJsp).renderWith(data -> {
data.register("webConfigItems", webConfigService.getWebConfigList(webConfigPager)); // page navi
RenderDataUtil.register(data, "webConfigItems", webConfigService.getWebConfigList(webConfigPager)); // page navi
}).useForm(SearchForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(webConfigPager, form, op -> op.include("id"));

3
src/main/java/org/codelibs/fess/app/web/help/HelpAction.java
View file

@ -17,6 +17,7 @@ package org.codelibs.fess.app.web.help;
import org.codelibs.fess.app.web.SearchForm;
import org.codelibs.fess.app.web.base.FessSearchAction;
import org.codelibs.fess.util.RenderDataUtil;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
@ -50,7 +51,7 @@ public class HelpAction extends FessSearchAction {
});
}).renderWith(data -> {
buildInitParams();
data.register("helpPage", viewHelper.getPagePath("common/help"));
RenderDataUtil.register(data, "helpPage", viewHelper.getPagePath("common/help"));
});
}

43
src/main/java/org/codelibs/fess/app/web/search/SearchAction.java
View file

@ -32,6 +32,7 @@ import org.codelibs.fess.app.web.base.FessSearchAction;
import org.codelibs.fess.entity.SearchRenderData;
import org.codelibs.fess.exception.InvalidQueryException;
import org.codelibs.fess.exception.ResultOffsetExceededException;
import org.codelibs.fess.util.RenderDataUtil;
import org.codelibs.fess.util.StreamUtil;
import org.lastaflute.taglib.function.LaFunctions;
import org.lastaflute.web.Execute;
@ -131,11 +132,11 @@ public class SearchAction extends FessSearchAction {
userInfoHelper.storeQueryId(queryId, documentItems);
if (screenShotManager != null) {
screenShotManager.storeRequest(queryId, documentItems);
data.register("screenShotSupport", true);
RenderDataUtil.register(data, "screenShotSupport", true);
}
}
data.register("displayQuery", getDisplayQuery(form, labelTypeHelper.getLabelTypeItemList()));
data.register("pagingQuery", getPagingQuery(form));
RenderDataUtil.register(data, "displayQuery", getDisplayQuery(form, labelTypeHelper.getLabelTypeItemList()));
RenderDataUtil.register(data, "pagingQuery", getPagingQuery(form));
});
} catch (final InvalidQueryException e) {
if (logger.isDebugEnabled()) {
@ -252,24 +253,24 @@ public class SearchAction extends FessSearchAction {
protected static class WebRenderData extends SearchRenderData {
public void register(RenderData data) {
data.register("queryId", queryId);
data.register("documentItems", documentItems);
data.register("facetResponse", facetResponse);
data.register("appendHighlightParams", appendHighlightParams);
data.register("execTime", execTime);
data.register("pageSize", pageSize);
data.register("currentPageNumber", currentPageNumber);
data.register("allRecordCount", allRecordCount);
data.register("allPageCount", allPageCount);
data.register("existNextPage", existNextPage);
data.register("existPrevPage", existPrevPage);
data.register("currentStartRecordNumber", currentStartRecordNumber);
data.register("currentEndRecordNumber", currentEndRecordNumber);
data.register("pageNumberList", pageNumberList);
data.register("partialResults", partialResults);
data.register("queryTime", queryTime);
data.register("searchQuery", searchQuery);
data.register("requestedTime", requestedTime);
RenderDataUtil.register(data, "queryId", queryId);
RenderDataUtil.register(data, "documentItems", documentItems);
RenderDataUtil.register(data, "facetResponse", facetResponse);
RenderDataUtil.register(data, "appendHighlightParams", appendHighlightParams);
RenderDataUtil.register(data, "execTime", execTime);
RenderDataUtil.register(data, "pageSize", pageSize);
RenderDataUtil.register(data, "currentPageNumber", currentPageNumber);
RenderDataUtil.register(data, "allRecordCount", allRecordCount);
RenderDataUtil.register(data, "allPageCount", allPageCount);
RenderDataUtil.register(data, "existNextPage", existNextPage);
RenderDataUtil.register(data, "existPrevPage", existPrevPage);
RenderDataUtil.register(data, "currentStartRecordNumber", currentStartRecordNumber);
RenderDataUtil.register(data, "currentEndRecordNumber", currentEndRecordNumber);
RenderDataUtil.register(data, "pageNumberList", pageNumberList);
RenderDataUtil.register(data, "partialResults", partialResults);
RenderDataUtil.register(data, "queryTime", queryTime);
RenderDataUtil.register(data, "searchQuery", searchQuery);
RenderDataUtil.register(data, "requestedTime", requestedTime);
}
}
}

4
src/main/java/org/codelibs/fess/exec/Crawler.java
View file

@ -260,9 +260,7 @@ public class Crawler implements Serializable {
}
buf.append(entry.getKey()).append('=').append(entry.getValue());
}
if (buf.length() != 0) {
logger.info("[CRAWL INFO] " + buf.toString());
}
logger.info("[CRAWL INFO] " + buf.toString());
// notification
try {

30
src/main/java/org/codelibs/fess/mylasta/mail/CrawlerPostcard.java
View file

@ -52,8 +52,7 @@ public class CrawlerPostcard extends LaTypicalPostcard {
protected String[] getPropertyNames() {
return new String[] { "hostname", "webFsCrawlStartTime", "webFsCrawlEndTime", "webFsCrawlExecTime", "webFsIndexExecTime",
"webFsIndexSize", "dataCrawlStartTime", "dataCrawlEndTime", "dataCrawlExecTime", "dataIndexExecTime", "dataFsIndexSize",
"commitStartTime", "commitEndTime", "commitExecTime", "optimizeStartTime", "optimizeEndTime", "optimizeExecTime",
"crawlerStartTime", "crawlerEndTime", "crawlerExecTime" };
"commitStartTime", "commitEndTime", "commitExecTime", "crawlerStartTime", "crawlerEndTime", "crawlerExecTime" };
}
// ===================================================================================
@ -227,33 +226,6 @@ public class CrawlerPostcard extends LaTypicalPostcard {
registerVariable("commitExecTime", commitExecTime);
}
/**
* Set the value of optimizeStartTime, used in parameter comment. <br>
* Even if empty string, treated as empty plainly. So "IF pmb != null" is false if empty.
* @param optimizeStartTime The parameter value of optimizeStartTime. (NotNull)
*/
public void setOptimizeStartTime(String optimizeStartTime) {
registerVariable("optimizeStartTime", optimizeStartTime);
}
/**
* Set the value of optimizeEndTime, used in parameter comment. <br>
* Even if empty string, treated as empty plainly. So "IF pmb != null" is false if empty.
* @param optimizeEndTime The parameter value of optimizeEndTime. (NotNull)
*/
public void setOptimizeEndTime(String optimizeEndTime) {
registerVariable("optimizeEndTime", optimizeEndTime);
}
/**
* Set the value of optimizeExecTime, used in parameter comment. <br>
* Even if empty string, treated as empty plainly. So "IF pmb != null" is false if empty.
* @param optimizeExecTime The parameter value of optimizeExecTime. (NotNull)
*/
public void setOptimizeExecTime(String optimizeExecTime) {
registerVariable("optimizeExecTime", optimizeExecTime);
}
/**
* Set the value of crawlerStartTime, used in parameter comment. <br>
* Even if empty string, treated as empty plainly. So "IF pmb != null" is false if empty.

47
src/main/java/org/codelibs/fess/util/RenderDataUtil.java Normal file
View file

@ -0,0 +1,47 @@
/*
* Copyright 2012-2015 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.util;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
import org.codelibs.core.beans.util.BeanUtil;
import org.dbflute.Entity;
import org.lastaflute.web.response.render.RenderData;
public class RenderDataUtil {
public static void register(RenderData data, String key, Object value) {
if (value instanceof Entity) {
data.register(key, BeanUtil.copyBeanToNewMap(value));
} else if (value instanceof Collection<?>) {
final Collection<?> coll = ((Collection<?>) value);
if (!coll.isEmpty()) {
// care performance for List that the most frequent pattern
final Object first = coll instanceof List<?> ? ((List<?>) coll).get(0) : coll.iterator().next();
if (first instanceof Entity) {
data.register(key, coll.stream().map(e -> BeanUtil.copyBeanToNewMap(e)).collect(Collectors.toList()));
return;
}
}
data.register(key, value);
} else {
data.register(key, value);
}
}
}

5
src/main/resources/mail/crawler.dfmail
View file

@ -29,11 +29,6 @@ Num of Doc: /*pmb.dataFsIndexSize*/ docs
Start Time: /*pmb.commitStartTime*/
End Time: /*pmb.commitEndTime*/
Exec Time: /*pmb.commitExecTime*/ms
/*END*//*IF pmb.optimizeEndTime*/
--- Indexer(Optimize) ---
Start Time: /*pmb.optimizeStartTime*/
End Time: /*pmb.optimizeEndTime*/
Exec Time: /*pmb.optimizeExecTime*/ms
/*END*/
--- Total ---
Start Time: /*pmb.crawlerStartTime*/

15
src/test/java/org/codelibs/fess/mylasta/FessActionDefTest.java
View file

@ -1,3 +1,18 @@
/*
* Copyright 2012-2015 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.mylasta;
import org.codelibs.fess.unit.UnitFessTestCase;