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

modify tx token

Browse source
This commit is contained in:
Shinsuke Sugaya 2015-10-24 18:32:03 +09:00
parent 8ad12318ba
commit 1270ca2ef5
30 changed files with 339 additions and 525 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/AdminBoostdocumentruleAction.java
View file

@ -19,7 +19,6 @@ package org.codelibs.fess.app.web.admin.boostdocumentrule;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.BoostDocumentRulePager;
import org.codelibs.fess.app.service.BoostDocumentRuleService;
import org.codelibs.fess.app.web.CrudMode;
@ -31,6 +30,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.validation.VaErrorHook;
/**
@ -111,8 +111,7 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage() {
return asHtml(path_AdminBoostdocumentrule_EditJsp).useForm(CreateForm.class, op -> {
op.setup(form -> {
@ -122,8 +121,7 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.EDIT);
return asHtml(path_AdminBoostdocumentrule_EditJsp).useForm(EditForm.class, op -> {
@ -140,24 +138,21 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createagain(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminBoostdocumentrule_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminBoostdocumentrule_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -170,8 +165,7 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
return asHtml(path_AdminBoostdocumentrule_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.DELETE);
return asHtml(path_AdminBoostdocumentrule_ConfirmJsp).useForm(EditForm.class, op -> {
@ -188,8 +182,7 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.DELETE;
@ -222,16 +215,14 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final CreateForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.CREATE;
return asHtml(path_AdminBoostdocumentrule_ConfirmJsp);
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -241,8 +232,7 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
@ -256,8 +246,7 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());

8
src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/AdminCrawlingsessionAction.java
View file

@ -22,7 +22,6 @@ import java.util.Map;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.CrawlingSessionPager;
import org.codelibs.fess.app.service.CrawlingSessionService;
import org.codelibs.fess.app.web.CrudMode;
@ -34,6 +33,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.validation.VaErrorHook;
/**
@ -124,8 +124,7 @@ public class AdminCrawlingsessionAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id, final CrawlingSessionEditForm form) {
form.crudMode = crudMode;
form.id = id;
@ -134,8 +133,7 @@ public class AdminCrawlingsessionAction extends FessAdminAction {
return asHtml(path_AdminCrawlingsession_ConfirmJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final CrawlingSessionEditForm form) {
form.crudMode = CrudMode.DELETE;
loadCrawlingSession(form);

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

@ -24,7 +24,6 @@ import java.util.Map;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.DataConfigPager;
import org.codelibs.fess.app.service.DataConfigService;
import org.codelibs.fess.app.service.LabelTypeService;
@ -39,6 +38,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.validation.VaErrorHook;
/**
@ -126,8 +126,7 @@ public class AdminDataconfigAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage() {
return asHtml(path_AdminDataconfig_EditJsp).useForm(CreateForm.class, op -> {
op.setup(form -> {
@ -140,8 +139,7 @@ public class AdminDataconfigAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.EDIT);
return asHtml(path_AdminDataconfig_EditJsp).useForm(EditForm.class, op -> {
@ -161,8 +159,7 @@ public class AdminDataconfigAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createagain(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
@ -172,8 +169,7 @@ public class AdminDataconfigAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());
@ -183,8 +179,7 @@ public class AdminDataconfigAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -200,8 +195,7 @@ public class AdminDataconfigAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.DELETE);
return asHtml(path_AdminDataconfig_ConfirmJsp).useForm(EditForm.class, op -> {
@ -221,8 +215,7 @@ public class AdminDataconfigAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.DELETE;
@ -261,8 +254,7 @@ public class AdminDataconfigAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final CreateForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.CREATE;
@ -272,8 +264,7 @@ public class AdminDataconfigAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -286,8 +277,7 @@ public class AdminDataconfigAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
@ -301,8 +291,7 @@ public class AdminDataconfigAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());

20
src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java
View file

@ -31,7 +31,6 @@ import org.codelibs.core.io.FileUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.DynamicProperties;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.exception.FessSystemException;
import org.codelibs.fess.helper.SystemHelper;
@ -40,6 +39,7 @@ import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.ActionResponse;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.StreamResponse;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.validation.VaErrorHook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -102,8 +102,7 @@ public class AdminDesignAction extends FessAdminAction implements Serializable {
// ===================================================================================
// Execute
// =======
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse index() {
return asHtml(path_AdminDesign_AdminDesignJsp).useForm(DesignForm.class);
}
@ -190,8 +189,7 @@ public class AdminDesignAction extends FessAdminAction implements Serializable {
});
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse delete(final DesignForm form) {
final File file = getTargetFile(form);
if (file == null) {
@ -208,8 +206,7 @@ public class AdminDesignAction extends FessAdminAction implements Serializable {
// -----------------------------------------------------
// Edit
// ------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse edit(final DesignEditForm form) {
final String jspType = "view";
final File jspFile = getJspFile(form.fileName, jspType);
@ -221,8 +218,7 @@ public class AdminDesignAction extends FessAdminAction implements Serializable {
return asHtml(path_AdminDesign_AdminDesignEditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editAsUseDefault(final DesignEditForm form) {
final String jspType = "orig/view";
final File jspFile = getJspFile(form.fileName, jspType);
@ -234,8 +230,7 @@ public class AdminDesignAction extends FessAdminAction implements Serializable {
return asHtml(path_AdminDesign_AdminDesignEditJsp);
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final DesignEditForm form) {
final String jspType = "view";
final File jspFile = getJspFile(form.fileName, jspType);
@ -254,8 +249,7 @@ public class AdminDesignAction extends FessAdminAction implements Serializable {
return redirect(getClass());
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse back() {
return asHtml(path_AdminDesign_AdminDesignJsp).useForm(DesignForm.class);
}

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

@ -26,7 +26,6 @@ import org.codelibs.core.beans.util.BeanUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.DynamicProperties;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.KuromojiPager;
import org.codelibs.fess.app.service.KuromojiService;
import org.codelibs.fess.app.web.CrudMode;
@ -40,6 +39,7 @@ import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.ActionResponse;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.validation.VaErrorHook;
/**
@ -131,8 +131,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage(final String dictId) {
return asHtml(path_AdminDictKuromoji_EditJsp).useForm(CreateForm.class, op -> {
op.setup(form -> {
@ -143,8 +142,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final String dictId, final int crudMode, final long id) {
verifyCrudMode(crudMode, CrudMode.EDIT);
return asHtml(path_AdminDictKuromoji_EditJsp).useForm(EditForm.class, op -> {
@ -162,16 +160,14 @@ public class AdminDictKuromojiAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminDictKuromoji_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -183,8 +179,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
return asHtml(path_AdminDictKuromoji_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final String dictId, final int crudMode, final long id) {
verifyCrudMode(crudMode, CrudMode.DELETE);
return asHtml(path_AdminDictKuromoji_ConfirmJsp).useForm(EditForm.class, op -> {
@ -202,8 +197,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.DELETE;
@ -236,16 +230,14 @@ public class AdminDictKuromojiAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final CreateForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.CREATE;
return asHtml(path_AdminDictKuromoji_ConfirmJsp);
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -255,8 +247,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
// -----------------------------------------------------
// Download
// -------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse downloadpage(final String dictId) {
return asHtml(path_AdminDictKuromoji_DownloadJsp).useForm(DownloadForm.class, op -> {
op.setup(form -> {
@ -271,8 +262,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
});
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public ActionResponse download(final DownloadForm form) {
validate(form, messages -> {}, () -> downloadpage(form.dictId));
return kuromojiService.getKuromojiFile(form.dictId).map(file -> {
@ -288,8 +278,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
// -----------------------------------------------------
// Upload
// -------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse uploadpage(final String dictId) {
return asHtml(path_AdminDictKuromoji_UploadJsp).useForm(UploadForm.class, op -> {
op.setup(form -> {
@ -304,8 +293,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
});
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse upload(final UploadForm form) {
validate(form, messages -> {}, () -> uploadpage(form.dictId));
return kuromojiService.getKuromojiFile(form.dictId).map(file -> {
@ -328,8 +316,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
@ -346,8 +333,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());

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

@ -28,7 +28,6 @@ import org.codelibs.core.beans.util.BeanUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.DynamicProperties;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.SynonymPager;
import org.codelibs.fess.app.service.SynonymService;
import org.codelibs.fess.app.web.CrudMode;
@ -42,6 +41,7 @@ import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.ActionResponse;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.validation.VaErrorHook;
/**
@ -133,8 +133,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage(final String dictId) {
return asHtml(path_AdminDictSynonym_EditJsp).useForm(CreateForm.class, op -> {
op.setup(form -> {
@ -145,8 +144,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final String dictId, final int crudMode, final long id) {
verifyCrudMode(crudMode, CrudMode.EDIT);
return asHtml(path_AdminDictSynonym_EditJsp).useForm(EditForm.class, op -> {
@ -164,16 +162,14 @@ public class AdminDictSynonymAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminDictSynonym_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -186,8 +182,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
return asHtml(path_AdminDictSynonym_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final String dictId, final int crudMode, final long id) {
verifyCrudMode(crudMode, CrudMode.DELETE);
return asHtml(path_AdminDictSynonym_ConfirmJsp).useForm(EditForm.class, op -> {
@ -205,8 +200,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.DELETE;
@ -240,8 +234,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final CreateForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.CREATE;
@ -252,8 +245,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
return asHtml(path_AdminDictSynonym_ConfirmJsp);
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -267,8 +259,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
// -----------------------------------------------------
// Download
// -------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse downloadpage(final String dictId) {
return asHtml(path_AdminDictSynonym_DownloadJsp).useForm(DownloadForm.class, op -> {
op.setup(form -> {
@ -283,8 +274,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
});
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public ActionResponse download(final DownloadForm form) {
validate(form, messages -> {}, () -> downloadpage(form.dictId));
return synonymService.getSynonymFile(form.dictId).map(file -> {
@ -300,8 +290,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
// -----------------------------------------------------
// Upload
// -------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse uploadpage(final String dictId) {
return asHtml(path_AdminDictSynonym_UploadJsp).useForm(UploadForm.class, op -> {
op.setup(form -> {
@ -316,8 +305,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
});
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse upload(final UploadForm form) {
validate(form, messages -> {}, () -> uploadpage(form.dictId));
return synonymService.getSynonymFile(form.dictId).map(file -> {
@ -340,8 +328,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
@ -360,8 +347,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());

32
src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/AdminFileauthenticationAction.java
View file

@ -25,7 +25,6 @@ import java.util.Map;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.FileAuthenticationPager;
import org.codelibs.fess.app.service.FileAuthenticationService;
import org.codelibs.fess.app.service.FileConfigService;
@ -39,6 +38,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.util.LaRequestUtil;
import org.lastaflute.web.validation.VaErrorHook;
@ -123,8 +123,7 @@ public class AdminFileauthenticationAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage(final FileAuthenticationEditForm form) {
form.initialize();
form.crudMode = CrudMode.CREATE;
@ -134,8 +133,7 @@ public class AdminFileauthenticationAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final int crudMode, final String id, final FileAuthenticationEditForm form) {
form.crudMode = crudMode;
form.id = id;
@ -147,8 +145,7 @@ public class AdminFileauthenticationAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final FileAuthenticationEditForm form) {
return asHtml(path_AdminFileauthentication_EditJsp).renderWith(data -> {
registerProtocolSchemeItems(data);
@ -156,8 +153,7 @@ public class AdminFileauthenticationAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final FileAuthenticationEditForm form) {
form.crudMode = CrudMode.EDIT;
loadFileAuthentication(form);
@ -167,8 +163,7 @@ public class AdminFileauthenticationAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id, final FileAuthenticationEditForm form) {
form.crudMode = crudMode;
form.id = id;
@ -180,8 +175,7 @@ public class AdminFileauthenticationAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final FileAuthenticationEditForm form) {
form.crudMode = CrudMode.DELETE;
loadFileAuthentication(form);
@ -206,8 +200,7 @@ public class AdminFileauthenticationAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final FileAuthenticationEditForm form) {
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminFileauthentication_ConfirmJsp).renderWith(data -> {
@ -216,8 +209,7 @@ public class AdminFileauthenticationAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final FileAuthenticationEditForm form) {
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminFileauthentication_ConfirmJsp).renderWith(data -> {
@ -229,8 +221,7 @@ public class AdminFileauthenticationAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final FileAuthenticationEditForm form) {
validate(form, messages -> {}, toEditHtml());
fileAuthenticationService.store(createFileAuthentication(form));
@ -238,8 +229,7 @@ public class AdminFileauthenticationAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final FileAuthenticationEditForm form) {
validate(form, messages -> {}, toEditHtml());
fileAuthenticationService.store(createFileAuthentication(form));

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

@ -19,7 +19,6 @@ package org.codelibs.fess.app.web.admin.fileconfig;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.FileConfigPager;
import org.codelibs.fess.app.service.FileConfigService;
import org.codelibs.fess.app.service.LabelTypeService;
@ -33,6 +32,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.validation.VaErrorHook;
/**
@ -118,8 +118,7 @@ public class AdminFileconfigAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage() {
return asHtml(path_AdminFileconfig_EditJsp).useForm(CreateForm.class, op -> {
op.setup(form -> {
@ -131,8 +130,7 @@ public class AdminFileconfigAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.EDIT);
return asHtml(path_AdminFileconfig_EditJsp).useForm(EditForm.class, op -> {
@ -151,8 +149,7 @@ public class AdminFileconfigAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createagain(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
@ -161,8 +158,7 @@ public class AdminFileconfigAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());
@ -171,8 +167,7 @@ public class AdminFileconfigAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -187,8 +182,7 @@ public class AdminFileconfigAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.DELETE);
return asHtml(path_AdminFileconfig_ConfirmJsp).useForm(EditForm.class, op -> {
@ -207,8 +201,7 @@ public class AdminFileconfigAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.DELETE;
@ -245,8 +238,7 @@ public class AdminFileconfigAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final CreateForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.CREATE;
@ -255,8 +247,7 @@ public class AdminFileconfigAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -268,8 +259,7 @@ public class AdminFileconfigAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
@ -283,8 +273,7 @@ public class AdminFileconfigAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());

8
src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java
View file

@ -26,13 +26,13 @@ import javax.annotation.Resource;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.DynamicProperties;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.ComponentUtil;
import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.util.LaRequestUtil;
/**
@ -62,8 +62,7 @@ public class AdminGeneralAction extends FessAdminAction {
// ===================================================================================
//
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse index() {
return asHtml(path_AdminGeneral_IndexJsp).useForm(EditForm.class, setup -> {
setup.setup(form -> {
@ -72,8 +71,7 @@ public class AdminGeneralAction extends FessAdminAction {
});
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final EditForm form) {
validate(form, messages -> {}, () -> {
return asHtml(path_AdminGeneral_IndexJsp);

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

@ -23,7 +23,6 @@ import java.util.Map;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.GroupPager;
import org.codelibs.fess.app.service.GroupService;
import org.codelibs.fess.app.web.CrudMode;
@ -34,6 +33,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.validation.VaErrorHook;
/**
@ -114,16 +114,14 @@ public class AdminGroupAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage(final GroupEditForm form) {
form.initialize();
form.crudMode = CrudMode.CREATE;
return asHtml(path_AdminGroup_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final int crudMode, final String id, final GroupEditForm form) {
form.crudMode = crudMode;
form.id = id;
@ -132,22 +130,19 @@ public class AdminGroupAction extends FessAdminAction {
return asHtml(path_AdminGroup_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final GroupEditForm form) {
return asHtml(path_AdminGroup_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final GroupEditForm form) {
form.crudMode = CrudMode.EDIT;
loadGroup(form);
return asHtml(path_AdminGroup_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id, final GroupEditForm form) {
form.crudMode = crudMode;
form.id = id;
@ -156,8 +151,7 @@ public class AdminGroupAction extends FessAdminAction {
return asHtml(path_AdminGroup_ConfirmJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final GroupEditForm form) {
form.crudMode = CrudMode.DELETE;
loadGroup(form);
@ -176,15 +170,13 @@ public class AdminGroupAction extends FessAdminAction {
return asHtml(path_AdminGroup_ConfirmJsp);
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final GroupEditForm form) {
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminGroup_ConfirmJsp);
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final GroupEditForm form) {
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminGroup_ConfirmJsp);
@ -193,8 +185,7 @@ public class AdminGroupAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final GroupEditForm form) {
validate(form, messages -> {}, toEditHtml());
groupService.store(createGroup(form));
@ -202,8 +193,7 @@ public class AdminGroupAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final GroupEditForm form) {
validate(form, messages -> {}, toEditHtml());
groupService.store(createGroup(form));

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

@ -22,7 +22,6 @@ import java.util.Map;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.JobLogPager;
import org.codelibs.fess.app.service.JobLogService;
import org.codelibs.fess.app.web.CrudMode;
@ -33,6 +32,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.validation.VaErrorHook;
/**
@ -114,8 +114,7 @@ public class AdminJoblogAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id, final JobLogEditForm form) {
form.crudMode = crudMode;
form.id = id;
@ -124,8 +123,7 @@ public class AdminJoblogAction extends FessAdminAction {
return asHtml(path_AdminJoblog_ConfirmJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final JobLogEditForm form) {
form.crudMode = CrudMode.DELETE;
loadJobLog(form);

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

@ -19,7 +19,6 @@ package org.codelibs.fess.app.web.admin.keymatch;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.KeyMatchPager;
import org.codelibs.fess.app.service.KeyMatchService;
import org.codelibs.fess.app.web.CrudMode;
@ -32,6 +31,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.validation.VaErrorHook;
/**
@ -113,8 +113,7 @@ public class AdminKeymatchAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage() {
return asHtml(path_AdminKeymatch_EditJsp).useForm(CreateForm.class, op -> {
op.setup(form -> {
@ -124,8 +123,7 @@ public class AdminKeymatchAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.EDIT);
return asHtml(path_AdminKeymatch_EditJsp).useForm(EditForm.class, op -> {
@ -142,24 +140,21 @@ public class AdminKeymatchAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createagain(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminKeymatch_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminKeymatch_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -172,8 +167,7 @@ public class AdminKeymatchAction extends FessAdminAction {
return asHtml(path_AdminKeymatch_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.DELETE);
return asHtml(path_AdminKeymatch_ConfirmJsp).useForm(EditForm.class, op -> {
@ -190,8 +184,7 @@ public class AdminKeymatchAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final EditForm form) {
form.crudMode = CrudMode.DELETE;
validate(form, messages -> {}, toEditHtml());
@ -224,16 +217,14 @@ public class AdminKeymatchAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final CreateForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.CREATE;
return asHtml(path_AdminKeymatch_ConfirmJsp);
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -243,8 +234,7 @@ public class AdminKeymatchAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
@ -259,8 +249,7 @@ public class AdminKeymatchAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());

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

@ -19,7 +19,6 @@ package org.codelibs.fess.app.web.admin.labeltype;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.LabelTypePager;
import org.codelibs.fess.app.service.LabelTypeService;
import org.codelibs.fess.app.service.RoleTypeService;
@ -32,6 +31,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.validation.VaErrorHook;
/**
@ -116,8 +116,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage() {
return asHtml(path_AdminLabeltype_EditJsp).useForm(CreateForm.class, op -> {
op.setup(form -> {
@ -129,8 +128,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.EDIT);
return asHtml(path_AdminLabeltype_EditJsp).useForm(EditForm.class, op -> {
@ -149,8 +147,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createagain(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
@ -159,8 +156,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());
@ -169,8 +165,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -185,8 +180,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.DELETE);
return asHtml(path_AdminLabeltype_ConfirmJsp).useForm(EditForm.class, op -> {
@ -205,8 +199,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.DELETE;
@ -243,8 +236,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final CreateForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.CREATE;
@ -253,8 +245,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -266,8 +257,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
@ -281,8 +271,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());

35
src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/AdminOverlappinghostAction.java
View file

@ -19,7 +19,6 @@ package org.codelibs.fess.app.web.admin.overlappinghost;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.OverlappingHostPager;
import org.codelibs.fess.app.service.OverlappingHostService;
import org.codelibs.fess.app.web.CrudMode;
@ -31,6 +30,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.validation.VaErrorHook;
/**
@ -112,8 +112,7 @@ public class AdminOverlappinghostAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage() {
return asHtml(path_AdminOverlappinghost_EditJsp).useForm(CreateForm.class, op -> {
op.setup(form -> {
@ -123,8 +122,7 @@ public class AdminOverlappinghostAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.EDIT);
return asHtml(path_AdminOverlappinghost_EditJsp).useForm(EditForm.class, op -> {
@ -141,24 +139,21 @@ public class AdminOverlappinghostAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createagain(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminOverlappinghost_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminOverlappinghost_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -171,8 +166,7 @@ public class AdminOverlappinghostAction extends FessAdminAction {
return asHtml(path_AdminOverlappinghost_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.DELETE);
return asHtml(path_AdminOverlappinghost_ConfirmJsp).useForm(EditForm.class, op -> {
@ -189,8 +183,7 @@ public class AdminOverlappinghostAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.DELETE;
@ -223,16 +216,14 @@ public class AdminOverlappinghostAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final CreateForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.CREATE;
return asHtml(path_AdminOverlappinghost_ConfirmJsp);
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -242,8 +233,7 @@ public class AdminOverlappinghostAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
@ -257,8 +247,7 @@ public class AdminOverlappinghostAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());

35
src/main/java/org/codelibs/fess/app/web/admin/pathmapping/AdminPathmappingAction.java
View file

@ -19,7 +19,6 @@ package org.codelibs.fess.app.web.admin.pathmapping;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.PathMappingPager;
import org.codelibs.fess.app.service.PathMappingService;
import org.codelibs.fess.app.web.CrudMode;
@ -31,6 +30,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.validation.VaErrorHook;
/**
@ -113,8 +113,7 @@ public class AdminPathmappingAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage() {
return asHtml(path_AdminPathmapping_EditJsp).useForm(CreateForm.class, op -> {
op.setup(form -> {
@ -124,8 +123,7 @@ public class AdminPathmappingAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.EDIT);
return asHtml(path_AdminPathmapping_EditJsp).useForm(EditForm.class, op -> {
@ -142,24 +140,21 @@ public class AdminPathmappingAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createagain(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminPathmapping_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminPathmapping_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -172,8 +167,7 @@ public class AdminPathmappingAction extends FessAdminAction {
return asHtml(path_AdminPathmapping_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.DELETE);
return asHtml(path_AdminPathmapping_ConfirmJsp).useForm(EditForm.class, op -> {
@ -190,8 +184,7 @@ public class AdminPathmappingAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.DELETE;
@ -224,16 +217,14 @@ public class AdminPathmappingAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final CreateForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.CREATE;
return asHtml(path_AdminPathmapping_ConfirmJsp);
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -243,8 +234,7 @@ public class AdminPathmappingAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
@ -258,8 +248,7 @@ public class AdminPathmappingAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());

35
src/main/java/org/codelibs/fess/app/web/admin/requestheader/AdminRequestheaderAction.java
View file

@ -25,7 +25,6 @@ import java.util.Map;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.RequestHeaderPager;
import org.codelibs.fess.app.service.RequestHeaderService;
import org.codelibs.fess.app.service.WebConfigService;
@ -40,6 +39,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.util.LaRequestUtil;
import org.lastaflute.web.validation.VaErrorHook;
@ -126,8 +126,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage() {
return asHtml(path_AdminRequestheader_EditJsp).useForm(CreateForm.class, op -> {
op.setup(form -> {
@ -140,8 +139,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.EDIT);
return asHtml(path_AdminRequestheader_EditJsp).useForm(EditForm.class, op -> {
@ -161,8 +159,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createagain(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
@ -172,8 +169,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());
@ -183,8 +179,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -200,8 +195,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.DELETE);
return asHtml(path_AdminRequestheader_ConfirmJsp).useForm(EditForm.class, op -> {
@ -221,8 +215,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.DELETE;
@ -261,8 +254,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final CreateForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.CREATE;
@ -272,8 +264,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -286,8 +277,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
@ -301,8 +291,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());

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

@ -23,7 +23,6 @@ import java.util.Map;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.RolePager;
import org.codelibs.fess.app.service.RoleService;
import org.codelibs.fess.app.web.CrudMode;
@ -34,6 +33,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.validation.VaErrorHook;
/**
@ -114,16 +114,14 @@ public class AdminRoleAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage(final RoleEditForm form) {
form.initialize();
form.crudMode = CrudMode.CREATE;
return asHtml(path_AdminRole_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final int crudMode, final String id, final RoleEditForm form) {
form.crudMode = crudMode;
form.id = id;
@ -132,22 +130,19 @@ public class AdminRoleAction extends FessAdminAction {
return asHtml(path_AdminRole_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final RoleEditForm form) {
return asHtml(path_AdminRole_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final RoleEditForm form) {
form.crudMode = CrudMode.EDIT;
loadRole(form);
return asHtml(path_AdminRole_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id, final RoleEditForm form) {
form.crudMode = crudMode;
form.id = id;
@ -156,8 +151,7 @@ public class AdminRoleAction extends FessAdminAction {
return asHtml(path_AdminRole_ConfirmJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final RoleEditForm form) {
form.crudMode = CrudMode.DELETE;
loadRole(form);
@ -176,15 +170,13 @@ public class AdminRoleAction extends FessAdminAction {
return asHtml(path_AdminRole_ConfirmJsp);
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final RoleEditForm form) {
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminRole_ConfirmJsp);
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final RoleEditForm form) {
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminRole_ConfirmJsp);
@ -193,8 +185,7 @@ public class AdminRoleAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final RoleEditForm form) {
validate(form, messages -> {}, toEditHtml());
roleService.store(createRole(form));
@ -202,8 +193,7 @@ public class AdminRoleAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final RoleEditForm form) {
validate(form, messages -> {}, toEditHtml());
roleService.store(createRole(form));

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

@ -19,7 +19,6 @@ package org.codelibs.fess.app.web.admin.roletype;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.RoleTypePager;
import org.codelibs.fess.app.service.RoleTypeService;
import org.codelibs.fess.app.web.CrudMode;
@ -31,6 +30,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.validation.VaErrorHook;
/**
@ -112,8 +112,7 @@ public class AdminRoletypeAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage() {
return asHtml(path_AdminRoletype_EditJsp).useForm(CreateForm.class, op -> {
op.setup(form -> {
@ -123,8 +122,7 @@ public class AdminRoletypeAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.EDIT);
return asHtml(path_AdminRoletype_EditJsp).useForm(EditForm.class, op -> {
@ -141,24 +139,21 @@ public class AdminRoletypeAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createagain(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminRoletype_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminRoletype_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -171,8 +166,7 @@ public class AdminRoletypeAction extends FessAdminAction {
return asHtml(path_AdminRoletype_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.DELETE);
return asHtml(path_AdminRoletype_ConfirmJsp).useForm(EditForm.class, op -> {
@ -189,8 +183,7 @@ public class AdminRoletypeAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.DELETE;
@ -223,16 +216,14 @@ public class AdminRoletypeAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final CreateForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.CREATE;
return asHtml(path_AdminRoletype_ConfirmJsp);
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -242,8 +233,7 @@ public class AdminRoletypeAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
@ -257,8 +247,7 @@ public class AdminRoletypeAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());

32
src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java
View file

@ -22,7 +22,6 @@ import java.util.Map;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.ScheduledJobPager;
import org.codelibs.fess.app.service.ScheduledJobService;
import org.codelibs.fess.app.web.CrudMode;
@ -35,6 +34,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.validation.VaErrorHook;
/**
@ -122,16 +122,14 @@ public class AdminScheduledjobAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage(final ScheduledjobEditForm form) {
form.initialize();
form.crudMode = CrudMode.CREATE;
return asHtml(path_AdminScheduledjob_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final int crudMode, final String id, final ScheduledjobEditForm form) {
form.crudMode = crudMode;
form.id = id;
@ -140,22 +138,19 @@ public class AdminScheduledjobAction extends FessAdminAction {
return asHtml(path_AdminScheduledjob_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final ScheduledjobEditForm form) {
return asHtml(path_AdminScheduledjob_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final ScheduledjobEditForm form) {
form.crudMode = CrudMode.EDIT;
loadScheduledJob(form);
return asHtml(path_AdminScheduledjob_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id, final ScheduledjobEditForm form) {
form.crudMode = crudMode;
form.id = id;
@ -164,8 +159,7 @@ public class AdminScheduledjobAction extends FessAdminAction {
return asHtml(path_AdminScheduledjob_ConfirmJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final ScheduledjobEditForm form) {
form.crudMode = CrudMode.DELETE;
loadScheduledJob(form);
@ -186,8 +180,7 @@ public class AdminScheduledjobAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final ScheduledjobEditForm form) {
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminScheduledjob_ConfirmJsp).renderWith(data -> {
@ -195,8 +188,7 @@ public class AdminScheduledjobAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final ScheduledjobEditForm form) {
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminScheduledjob_ConfirmJsp).renderWith(data -> {
@ -207,8 +199,7 @@ public class AdminScheduledjobAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final ScheduledjobEditForm form) {
validate(form, messages -> {}, toEditHtml());
scheduledJobService.store(createScheduledJob(form));
@ -216,8 +207,7 @@ public class AdminScheduledjobAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final ScheduledjobEditForm form) {
validate(form, messages -> {}, toEditHtml());
scheduledJobService.store(createScheduledJob(form));

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

@ -24,7 +24,6 @@ import javax.annotation.Resource;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.es.client.FessEsClient;
import org.codelibs.fess.es.client.FessEsClient.SearchConditionBuilder;
@ -41,6 +40,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.util.LaRequestUtil;
/**
@ -226,7 +226,7 @@ public class AdminSearchlistAction extends FessAdminAction {
return asHtml(path_AdminSearchlist_ConfirmDeleteJsp);
}
@Token(save = false, validate = true)
@Execute(token = TxToken.VALIDATE)
//@Execute(validator = true, input = "index")
public HtmlResponse delete(final SearchListForm form) {
return deleteByQuery(form);

44
src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/AdminSuggestbadwordAction.java
View file

@ -36,7 +36,6 @@ import org.apache.commons.io.IOUtils;
import org.codelibs.core.io.CopyUtil;
import org.codelibs.core.misc.DynamicProperties;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.SuggestBadWordPager;
import org.codelibs.fess.app.service.SuggestBadWordService;
import org.codelibs.fess.app.web.CrudMode;
@ -48,6 +47,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.util.LaResponseUtil;
import org.lastaflute.web.validation.VaErrorHook;
@ -130,16 +130,14 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage(final SuggestBadWordEditForm form) {
form.initialize();
form.crudMode = CrudMode.CREATE;
return asHtml(path_AdminSuggestbadword_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final int crudMode, final String id, final SuggestBadWordEditForm form) {
form.crudMode = crudMode;
form.id = id;
@ -148,22 +146,19 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
return asHtml(path_AdminSuggestbadword_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final SuggestBadWordEditForm form) {
return asHtml(path_AdminSuggestbadword_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final SuggestBadWordEditForm form) {
form.crudMode = CrudMode.EDIT;
loadSuggestBadWord(form);
return asHtml(path_AdminSuggestbadword_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id, final SuggestBadWordEditForm form) {
form.crudMode = crudMode;
form.id = id;
@ -172,8 +167,7 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
return asHtml(path_AdminSuggestbadword_ConfirmJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final SuggestBadWordEditForm form) {
form.crudMode = CrudMode.DELETE;
loadSuggestBadWord(form);
@ -192,15 +186,13 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
return asHtml(path_AdminSuggestbadword_ConfirmJsp);
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final SuggestBadWordEditForm form) {
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminSuggestbadword_ConfirmJsp);
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final SuggestBadWordEditForm form) {
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminSuggestbadword_ConfirmJsp);
@ -209,14 +201,12 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
// -----------------------------------------------------
// Download
// -------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse downloadpage(final SuggestBadWordSearchForm form) {
return asHtml(path_AdminSuggestbadword_DownloadJsp);
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse download(final SuggestBadWordSearchForm form) {
final HttpServletResponse response = LaResponseUtil.getResponse();
response.setContentType("application/octet-stream");
@ -234,8 +224,7 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
// -----------------------------------------------------
// Upload
// -------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse uploadpage(final SuggestBadWordUploadForm form) {
return asHtml(path_AdminSuggestbadword_UploadJsp);
}
@ -243,8 +232,7 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final SuggestBadWordEditForm form) {
validate(form, messages -> {}, toEditHtml());
suggestBadWordService.store(createSuggestBadWord(form));
@ -252,8 +240,7 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final SuggestBadWordEditForm form) {
validate(form, messages -> {}, toEditHtml());
suggestBadWordService.store(createSuggestBadWord(form));
@ -269,8 +256,7 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse upload(final SuggestBadWordUploadForm form) {
BufferedInputStream is = null;
File tempFile = null;

44
src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/AdminSuggestelevatewordAction.java
View file

@ -36,7 +36,6 @@ import org.apache.commons.io.IOUtils;
import org.codelibs.core.io.CopyUtil;
import org.codelibs.core.misc.DynamicProperties;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.SuggestElevateWordPager;
import org.codelibs.fess.app.service.SuggestElevateWordService;
import org.codelibs.fess.app.web.CrudMode;
@ -48,6 +47,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.util.LaResponseUtil;
import org.lastaflute.web.validation.VaErrorHook;
@ -130,16 +130,14 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage(final SuggestElevateWordEditForm form) {
form.initialize();
form.crudMode = CrudMode.CREATE;
return asHtml(path_AdminSuggestelevateword_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final int crudMode, final String id, final SuggestElevateWordEditForm form) {
form.crudMode = crudMode;
form.id = id;
@ -148,22 +146,19 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
return asHtml(path_AdminSuggestelevateword_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final SuggestElevateWordEditForm form) {
return asHtml(path_AdminSuggestelevateword_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final SuggestElevateWordEditForm form) {
form.crudMode = CrudMode.EDIT;
loadSuggestElevateWord(form);
return asHtml(path_AdminSuggestelevateword_EditJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id, final SuggestElevateWordEditForm form) {
form.crudMode = crudMode;
form.id = id;
@ -172,8 +167,7 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
return asHtml(path_AdminSuggestelevateword_ConfirmJsp);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final SuggestElevateWordEditForm form) {
form.crudMode = CrudMode.DELETE;
loadSuggestElevateWord(form);
@ -192,15 +186,13 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
return asHtml(path_AdminSuggestelevateword_ConfirmJsp);
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final SuggestElevateWordEditForm form) {
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminSuggestelevateword_ConfirmJsp);
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final SuggestElevateWordEditForm form) {
validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminSuggestelevateword_ConfirmJsp);
@ -209,14 +201,12 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
// -----------------------------------------------------
// Download
// -------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse downloadpage(final SuggestElevateWordSearchForm form) {
return asHtml(path_AdminSuggestelevateword_DownloadJsp);
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse download(final SuggestElevateWordSearchForm form) {
final HttpServletResponse response = LaResponseUtil.getResponse();
response.setContentType("application/octet-stream");
@ -234,8 +224,7 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
// -----------------------------------------------------
// Upload
// -------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse uploadpage(final SuggestElevateWordUploadForm form) {
return asHtml(path_AdminSuggestelevateword_UploadJsp);
}
@ -243,8 +232,7 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final SuggestElevateWordEditForm form) {
validate(form, messages -> {}, toEditHtml());
suggestElevateWordService.store(createSuggestElevateWord(form));
@ -252,8 +240,7 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final SuggestElevateWordEditForm form) {
validate(form, messages -> {}, toEditHtml());
suggestElevateWordService.store(createSuggestElevateWord(form));
@ -269,8 +256,7 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse upload(final SuggestElevateWordUploadForm form) {
BufferedInputStream is = null;
File tempFile = null;

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

@ -24,7 +24,6 @@ import javax.annotation.Resource;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.UserPager;
import org.codelibs.fess.app.service.GroupService;
import org.codelibs.fess.app.service.RoleService;
@ -37,6 +36,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.validation.VaErrorHook;
/**
@ -132,8 +132,7 @@ public class AdminUserAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage(final UserEditForm form) {
clearStoredPassword();
form.initialize();
@ -143,8 +142,7 @@ public class AdminUserAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final int crudMode, final String id, final UserEditForm form) {
clearStoredPassword();
form.crudMode = crudMode;
@ -156,8 +154,7 @@ public class AdminUserAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final UserEditForm form) {
clearStoredPassword();
return asHtml(path_AdminUser_EditJsp).renderWith(data -> {
@ -165,8 +162,7 @@ public class AdminUserAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final UserEditForm form) {
clearStoredPassword();
form.crudMode = CrudMode.EDIT;
@ -176,8 +172,7 @@ public class AdminUserAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id, final UserEditForm form) {
clearStoredPassword();
form.crudMode = crudMode;
@ -189,8 +184,7 @@ public class AdminUserAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final UserEditForm form) {
clearStoredPassword();
form.crudMode = CrudMode.DELETE;
@ -215,8 +209,7 @@ public class AdminUserAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final UserEditForm form) {
verifyPassword(form);
storePassword(form);
@ -226,8 +219,7 @@ public class AdminUserAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final UserEditForm form) {
verifyPassword(form);
storePassword(form);
@ -240,8 +232,7 @@ public class AdminUserAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final UserEditForm form) {
validate(form, messages -> {}, toEditHtml());
verifyPassword(form);
@ -250,8 +241,7 @@ public class AdminUserAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final UserEditForm form) {
validate(form, messages -> {}, toEditHtml());
verifyPassword(form);

35
src/main/java/org/codelibs/fess/app/web/admin/webauthentication/AdminWebauthenticationAction.java
View file

@ -25,7 +25,6 @@ import java.util.Map;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.WebAuthenticationPager;
import org.codelibs.fess.app.service.WebAuthenticationService;
import org.codelibs.fess.app.service.WebConfigService;
@ -40,6 +39,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.util.LaRequestUtil;
import org.lastaflute.web.validation.VaErrorHook;
@ -125,8 +125,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage() {
return asHtml(path_AdminWebauthentication_EditJsp).useForm(CreateForm.class, op -> {
op.setup(form -> {
@ -139,8 +138,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final int crudMode, final String id) {
return asHtml(path_AdminWebauthentication_EditJsp).useForm(EditForm.class, op -> {
op.setup(form -> {
@ -159,8 +157,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createagain(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
@ -170,8 +167,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());
@ -181,8 +177,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -198,8 +193,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.DELETE);
return asHtml(path_AdminWebauthentication_ConfirmJsp).useForm(EditForm.class, op -> {
@ -219,8 +213,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.DELETE;
@ -259,8 +252,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final CreateForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.CREATE;
@ -270,8 +262,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -284,8 +275,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
@ -299,8 +289,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());

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

@ -19,7 +19,6 @@ package org.codelibs.fess.app.web.admin.webconfig;
import javax.annotation.Resource;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.WebConfigPager;
import org.codelibs.fess.app.service.LabelTypeService;
import org.codelibs.fess.app.service.RoleTypeService;
@ -33,6 +32,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.validation.VaErrorHook;
/**
@ -119,8 +119,7 @@ public class AdminWebconfigAction extends FessAdminAction {
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createpage() {
return asHtml(path_AdminWebconfig_EditJsp).useForm(CreateForm.class, op -> {
op.setup(form -> {
@ -132,8 +131,7 @@ public class AdminWebconfigAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editpage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.EDIT);
return asHtml(path_AdminWebconfig_EditJsp).useForm(EditForm.class, op -> {
@ -152,8 +150,7 @@ public class AdminWebconfigAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse createagain(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
@ -162,8 +159,7 @@ public class AdminWebconfigAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editagain(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());
@ -172,8 +168,7 @@ public class AdminWebconfigAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse editfromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -188,8 +183,7 @@ public class AdminWebconfigAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletepage(final int crudMode, final String id) {
verifyCrudMode(crudMode, CrudMode.DELETE);
return asHtml(path_AdminWebconfig_ConfirmJsp).useForm(EditForm.class, op -> {
@ -208,8 +202,7 @@ public class AdminWebconfigAction extends FessAdminAction {
});
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse deletefromconfirm(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.DELETE;
@ -246,8 +239,7 @@ public class AdminWebconfigAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromcreate(final CreateForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.CREATE;
@ -256,8 +248,7 @@ public class AdminWebconfigAction extends FessAdminAction {
});
}
@Token(save = false, validate = true, keep = true)
@Execute
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
@ -269,8 +260,7 @@ public class AdminWebconfigAction extends FessAdminAction {
// -----------------------------------------------------
// Actually Crud
// -------------
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse create(final CreateForm form) {
verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
@ -284,8 +274,7 @@ public class AdminWebconfigAction extends FessAdminAction {
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse update(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());

17
src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java
View file

@ -26,7 +26,6 @@ import org.apache.commons.lang3.StringUtils;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.DynamicProperties;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.service.FileConfigService;
import org.codelibs.fess.app.service.ScheduledJobService;
import org.codelibs.fess.app.service.WebConfigService;
@ -43,6 +42,7 @@ import org.codelibs.fess.util.ComponentUtil;
import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.token.TxToken;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -92,14 +92,12 @@ public class AdminWizardAction extends FessAdminAction {
return asHtml(path_AdminWizard_IndexJsp).useForm(IndexForm.class);
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse crawlingConfigForm() {
return asHtml(path_AdminWizard_CrawlingConfigJsp).useForm(CrawlingConfigForm.class);
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse crawlingConfig(final CrawlingConfigForm form) {
validate(form, messages -> {}, () -> {
return asHtml(path_AdminWizard_CrawlingConfigJsp);
@ -109,8 +107,7 @@ public class AdminWizardAction extends FessAdminAction {
return redirectWith(getClass(), moreUrl("crawlingConfigForm"));
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse crawlingConfigNext(final CrawlingConfigForm form) {
validate(form, messages -> {}, () -> {
return asHtml(path_AdminWizard_CrawlingConfigJsp);
@ -270,14 +267,12 @@ public class AdminWizardAction extends FessAdminAction {
return path;
}
@Token(save = true, validate = false)
@Execute
@Execute(token = TxToken.SAVE)
public HtmlResponse startCrawlingForm() {
return asHtml(path_AdminWizard_StartCrawlingJsp).useForm(StartCrawlingForm.class);
}
@Token(save = false, validate = true)
@Execute
@Execute(token = TxToken.VALIDATE)
public HtmlResponse startCrawling(final StartCrawlingForm form) {
if (!jobHelper.isCrawlProcessRunning()) {
final List<ScheduledJob> scheduledJobList = scheduledJobService.getCrawlerJobList();

10
src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
View file

@ -710,13 +710,13 @@ public class FessLabels extends ActionMessages {
/** The key of the message: Last Modified: */
public static final String LABELS_search_result_last_modified = "{labels.search_result_last_modified}";
/** The key of the message: Vote it */
/** The key of the message: Like */
public static final String LABELS_search_result_favorite = "{labels.search_result_favorite}";
/** The key of the message: Voted */
/** The key of the message: Liked */
public static final String LABELS_search_result_favorited = "{labels.search_result_favorited}";
/** The key of the message: Click: {0} */
/** The key of the message: Clicked ({0}) */
public static final String LABELS_search_click_count = "{labels.search_click_count}";
/** The key of the message: more.. */
@ -794,13 +794,13 @@ public class FessLabels extends ActionMessages {
/** The key of the message: Sort: */
public static final String LABELS_searchoptions_menu_sort = "{labels.searchoptions_menu_sort}";
/** The key of the message: Result Per Page: */
/** The key of the message: Result: */
public static final String LABELS_searchoptions_menu_num = "{labels.searchoptions_menu_num}";
/** The key of the message: {0} results */
public static final String LABELS_searchoptions_num = "{labels.searchoptions_num}";
/** The key of the message: Language: */
/** The key of the message: Languages: */
public static final String LABELS_searchoptions_menu_lang = "{labels.searchoptions_menu_lang}";
/** The key of the message: Labels: */

25
src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java
View file

@ -125,6 +125,9 @@ public class FessMessages extends FessLabels {
/** The key of the message: already existing data, so retry */
public static final String ERRORS_APP_DB_ALREADY_EXISTS = "{errors.app.db.already.exists}";
/** The key of the message: double submit might be requested */
public static final String ERRORS_APP_DOUBLE_SUBMIT_REQUEST = "{errors.app.double.submit.request}";
/** The key of the message: Failed to update parameters. Please contact to a site administrator. */
public static final String ERRORS_failed_to_update_crawler_params = "{errors.failed_to_update_crawler_params}";
@ -135,7 +138,7 @@ public class FessMessages extends FessLabels {
public static final String ERRORS_failed_to_update_solr_params = "{errors.failed_to_update_solr_params}";
/** The key of the message: Username or Password is not correct. */
public static final String ERROR_login_error = "{error.login_error}";
public static final String ERRORS_login_error = "{errors.login_error}";
/** The key of the message: Failed to commit index. */
public static final String ERRORS_failed_to_commit_solr_index = "{errors.failed_to_commit_solr_index}";
@ -980,6 +983,20 @@ public class FessMessages extends FessLabels {
return this;
}
/**
* Add the created action message for the key 'errors.app.double.submit.request' with parameters.
* <pre>
* message: double submit might be requested
* </pre>
* @param property The property name for the message. (NotNull)
* @return this. (NotNull)
*/
public FessMessages addErrorsAppDoubleSubmitRequest(String property) {
assertPropertyNotNull(property);
add(property, new ActionMessage(ERRORS_APP_DOUBLE_SUBMIT_REQUEST));
return this;
}
/**
* Add the created action message for the key 'errors.failed_to_update_crawler_params' with parameters.
* <pre>
@ -1023,16 +1040,16 @@ public class FessMessages extends FessLabels {
}
/**
* Add the created action message for the key 'error.login_error' with parameters.
* Add the created action message for the key 'errors.login_error' with parameters.
* <pre>
* message: Username or Password is not correct.
* </pre>
* @param property The property name for the message. (NotNull)
* @return this. (NotNull)
*/
public FessMessages addErrorLoginError(String property) {
public FessMessages addErrorsLoginError(String property) {
assertPropertyNotNull(property);
add(property, new ActionMessage(ERROR_login_error));
add(property, new ActionMessage(ERRORS_login_error));
return this;
}

40
src/main/java/org/codelibs/fess/mylasta/direction/FessEnv.java
View file

@ -35,6 +35,12 @@ public interface FessEnv {
/** The key of the configuration. e.g. root@localhost */
String MAIL_RETURN_PATH = "mail.return.path";
/** The key of the configuration. e.g. UTF-8 */
String TOMCAT_URIEncoding = "tomcat.URIEncoding";
/** The key of the configuration. e.g. true */
String TOMCAT_USE_BODY_ENCODING_FORURI = "tomcat.useBodyEncodingForURI";
/**
* Get the value of property as {@link String}.
* @param propertyKey The key of the property. (NotNull)
@ -156,6 +162,28 @@ public interface FessEnv {
*/
String getMailReturnPath();
/**
* Get the value for the key 'tomcat.URIEncoding'. <br>
* The value is, e.g. UTF-8 <br>
* comment: ------
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
String getTomcatURIEncoding();
/**
* Get the value for the key 'tomcat.useBodyEncodingForURI'. <br>
* The value is, e.g. true <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
String getTomcatUseBodyEncodingForuri();
/**
* Is the property for the key 'tomcat.useBodyEncodingForURI' true? <br>
* The value is, e.g. true <br>
* @return The determination, true or false. (if not found, exception but basically no way)
*/
boolean isTomcatUseBodyEncodingForuri();
/**
* The simple implementation for configuration.
* @author FreeGen
@ -216,5 +244,17 @@ public interface FessEnv {
public String getMailReturnPath() {
return get(FessEnv.MAIL_RETURN_PATH);
}
public String getTomcatURIEncoding() {
return get(FessEnv.TOMCAT_URIEncoding);
}
public String getTomcatUseBodyEncodingForuri() {
return get(FessEnv.TOMCAT_USE_BODY_ENCODING_FORURI);
}
public boolean isTomcatUseBodyEncodingForuri() {
return is(FessEnv.TOMCAT_USE_BODY_ENCODING_FORURI);
}
}
}

3
src/main/resources/fess_message.properties
View file

@ -58,6 +58,7 @@ errors.app.illegal.transition=retry because of illegal transition
errors.app.db.already.deleted=others might be updated, so retry
errors.app.db.already.updated=others might be updated, so retry
errors.app.db.already.exists=already existing data, so retry
errors.app.double.submit.request=double submit might be requested
# _/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/
# you can define your messages here:
@ -71,7 +72,7 @@ errors.app.db.already.exists=already existing data, so retry
errors.failed_to_update_crawler_params=Failed to update parameters. Please contact to a site administrator.
errors.failed_to_update_web_crawler_params=Failed to update parameters. Please contact to a site administrator.
errors.failed_to_update_solr_params=Failed to update parameters. Please contact to a site administrator.
error.login_error=Username or Password is not correct.
errors.login_error=Username or Password is not correct.
errors.failed_to_commit_solr_index=Failed to commit index.
errors.failed_to_optimize_solr_index=Failed to optimize index.
errors.failed_to_delete_solr_index=Failed to delete index.