diff --git a/pom.xml b/pom.xml index 095b9fa82..f572849f1 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,6 @@ org/codelibs/fess/app/web/admin/OverlappingHostForm.java org/codelibs/fess/app/web/admin/DocumentAction.java org/codelibs/fess/app/web/admin/SystemInfoForm.java - org/codelibs/fess/app/web/admin/RoleTypeAction.java org/codelibs/fess/app/web/admin/JobLogForm.java org/codelibs/fess/app/web/admin/DataConfigForm.java org/codelibs/fess/app/web/admin/SystemAction.java @@ -116,7 +115,6 @@ org/codelibs/fess/app/web/admin/DataForm.java org/codelibs/fess/app/web/admin/SuggestBadWordAction.java org/codelibs/fess/app/web/admin/IndexAction.java - org/codelibs/fess/app/web/admin/RoleTypeForm.java org/codelibs/fess/app/web/admin/LogAction.java org/codelibs/fess/app/web/admin/FailureUrlAction.java org/codelibs/fess/app/web/admin/DictAction.java @@ -385,7 +383,7 @@ javax.servlet jstl 1.2 - diff --git a/src/main/java/org/codelibs/fess/app/web/admin/RoleTypeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/RoleTypeAction.java deleted file mode 100644 index 8e1184508..000000000 --- a/src/main/java/org/codelibs/fess/app/web/admin/RoleTypeAction.java +++ /dev/null @@ -1,321 +0,0 @@ -/* - * Copyright 2009-2015 the CodeLibs Project and the Others. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ - -package org.codelibs.fess.app.web.admin; - -import java.beans.Beans; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.codelibs.core.beans.util.BeanUtil; -import org.codelibs.fess.annotation.Token; -import org.codelibs.fess.app.web.base.FessAdminAction; -import org.codelibs.fess.beans.FessBeans; -import org.codelibs.fess.crud.CommonConstants; -import org.codelibs.fess.crud.CrudMessageException; -import org.codelibs.fess.crud.util.SAStrutsUtil; -import org.codelibs.fess.es.exentity.RoleType; -import org.codelibs.fess.exception.SSCActionMessagesException; -import org.codelibs.fess.helper.SystemHelper; -import org.codelibs.fess.app.pager.RoleTypePager; -import org.codelibs.fess.app.service.RoleTypeService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class RoleTypeAction extends FessAdminAction { - private static final Logger logger = LoggerFactory.getLogger(RoleTypeAction.class); - - @Resource - protected SystemHelper systemHelper; - - // for list - - public List roleTypeItems; - - // for edit/confirm/delete - - //@ActionForm - @Resource - protected RoleTypeForm roleTypeForm; - - @Resource - protected RoleTypeService roleTypeService; - - @Resource - protected RoleTypePager roleTypePager; - - public String getHelpLink() { - return systemHelper.getHelpLink("roleType"); - } - - @Token(save = false, validate = true, keep = true) - //@Execute(validator = true, input = "edit.jsp") - public String confirmfromcreate() { - roleTypeForm.value = roleTypeForm.value.trim(); - return "confirm.jsp"; - } - - @Token(save = false, validate = true, keep = true) - //@Execute(validator = true, input = "edit.jsp") - public String confirmfromupdate() { - roleTypeForm.value = roleTypeForm.value.trim(); - return "confirm.jsp"; - } - - //@Execute(validator = false, input = "error.jsp") - public String index() { - return displayList(false); - } - - //@Execute(validator = false, input = "error.jsp", urlPattern = "list/{pageNumber}") - public String list() { - // page navi - if (StringUtil.isNotBlank(roleTypeForm.pageNumber)) { - try { - roleTypePager.setCurrentPageNumber(Integer.parseInt(roleTypeForm.pageNumber)); - } catch (final NumberFormatException e) { - if (logger.isDebugEnabled()) { - logger.debug("Invalid value: " + roleTypeForm.pageNumber, e); - } - } - } - - return displayList(false); - } - - //@Execute(validator = false, input = "error.jsp") - public String search() { - BeanUtil.copyBeanToBean(roleTypeForm.searchParams, roleTypePager, option -> option.exclude(CommonConstants.PAGER_CONVERSION_RULE)); - - return displayList(false); - } - - //@Execute(validator = false, input = "error.jsp") - public String reset() { - roleTypePager.clear(); - - return displayList(false); - } - - //@Execute(validator = false, input = "error.jsp") - public String back() { - return displayList(false); - } - - @Token(save = true, validate = false) - //@Execute(validator = false, input = "error.jsp") - public String editagain() { - return "edit.jsp"; - } - - //@Execute(validator = false, input = "error.jsp", urlPattern = "confirmpage/{crudMode}/{id}") - public String confirmpage() { - if (roleTypeForm.crudMode != CommonConstants.CONFIRM_MODE) { - throw new ActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.CONFIRM_MODE, - roleTypeForm.crudMode }); - } - - loadRoleType(); - - return "confirm.jsp"; - } - - @Token(save = true, validate = false) - //@Execute(validator = false, input = "error.jsp") - public String createpage() { - // page navi - roleTypeForm.initialize(); - roleTypeForm.crudMode = CommonConstants.CREATE_MODE; - - return "edit.jsp"; - } - - @Token(save = true, validate = false) - //@Execute(validator = false, input = "error.jsp", urlPattern = "editpage/{crudMode}/{id}") - public String editpage() { - if (roleTypeForm.crudMode != CommonConstants.EDIT_MODE) { - throw new ActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.EDIT_MODE, roleTypeForm.crudMode }); - } - - loadRoleType(); - - return "edit.jsp"; - } - - @Token(save = true, validate = false) - //@Execute(validator = false, input = "error.jsp") - public String editfromconfirm() { - roleTypeForm.crudMode = CommonConstants.EDIT_MODE; - - loadRoleType(); - - return "edit.jsp"; - } - - @Token(save = true, validate = false) - //@Execute(validator = false, input = "error.jsp", urlPattern = "deletepage/{crudMode}/{id}") - public String deletepage() { - if (roleTypeForm.crudMode != CommonConstants.DELETE_MODE) { - throw new ActionMessagesException("errors.crud_invalid_mode", - new Object[] { CommonConstants.DELETE_MODE, roleTypeForm.crudMode }); - } - - loadRoleType(); - - return "confirm.jsp"; - } - - @Token(save = true, validate = false) - //@Execute(validator = false, input = "error.jsp") - public String deletefromconfirm() { - roleTypeForm.crudMode = CommonConstants.DELETE_MODE; - - loadRoleType(); - - return "confirm.jsp"; - } - - @Token(save = false, validate = true) - //@Execute(validator = true, input = "edit.jsp") - public String create() { - try { - final RoleType roleType = createRoleType(); - roleTypeService.store(roleType); - SAStrutsUtil.addSessionMessage("success.crud_create_crud_table"); - - return displayList(true); - } catch (final ActionMessagesException e) { - logger.error(e.getMessage(), e); - throw e; - } catch (final CrudMessageException e) { - logger.error(e.getMessage(), e); - throw new ActionMessagesException(e.getMessageId(), e.getArgs()); - } catch (final Exception e) { - logger.error(e.getMessage(), e); - throw new ActionMessagesException("errors.crud_failed_to_create_crud_table"); - } - } - - @Token(save = false, validate = true) - //@Execute(validator = true, input = "edit.jsp") - public String update() { - try { - final RoleType roleType = createRoleType(); - roleTypeService.store(roleType); - SAStrutsUtil.addSessionMessage("success.crud_update_crud_table"); - - return displayList(true); - } catch (final ActionMessagesException e) { - logger.error(e.getMessage(), e); - throw e; - } catch (final CrudMessageException e) { - logger.error(e.getMessage(), e); - throw new ActionMessagesException(e.getMessageId(), e.getArgs()); - } catch (final Exception e) { - logger.error(e.getMessage(), e); - throw new ActionMessagesException("errors.crud_failed_to_update_crud_table"); - } - } - - protected void loadRoleType() { - final RoleType roleType = roleTypeService.getRoleType(createKeyMap()); - if (roleType == null) { - // throw an exception - throw new SSCActionMessagesException("errors.crud_could_not_find_crud_table", new Object[] { roleTypeForm.id }); - } - - BeanUtil.copyBeanToBean(roleType, roleTypeForm, option -> option.exclude("searchParams", "mode")); - } - - protected Map createKeyMap() { - final Map keys = new HashMap(); - - keys.put("id", roleTypeForm.id); - - return keys; - } - - protected RoleType createRoleType() { - RoleType roleType; - final String username = systemHelper.getUsername(); - final long currentTime = systemHelper.getCurrentTimeAsLong(); - if (roleTypeForm.crudMode == CommonConstants.EDIT_MODE) { - roleType = roleTypeService.getRoleType(createKeyMap()); - if (roleType == null) { - // throw an exception - throw new SSCActionMessagesException("errors.crud_could_not_find_crud_table", new Object[] { roleTypeForm.id }); - } - } else { - roleType = new RoleType(); - roleType.setCreatedBy(username); - roleType.setCreatedTime(currentTime); - } - roleType.setUpdatedBy(username); - roleType.setUpdatedTime(currentTime); - roleTypeForm.value = roleTypeForm.value.trim(); - BeanUtil.copyBeanToBean(roleTypeForm, roleType, option -> option.exclude(CommonConstants.COMMON_CONVERSION_RULE)); - - return roleType; - } - - @Token(save = false, validate = true) - //@Execute(validator = false, input = "error.jsp") - public String delete() { - if (roleTypeForm.crudMode != CommonConstants.DELETE_MODE) { - throw new SSCActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.DELETE_MODE, - roleTypeForm.crudMode }); - } - - try { - final RoleType roleType = roleTypeService.getRoleType(createKeyMap()); - if (roleType == null) { - // throw an exception - throw new SSCActionMessagesException("errors.crud_could_not_find_crud_table", new Object[] { roleTypeForm.id }); - } - - roleTypeService.delete(roleType); - SAStrutsUtil.addSessionMessage("success.crud_delete_crud_table"); - - return displayList(true); - } catch (final ActionMessagesException e) { - logger.error(e.getMessage(), e); - throw e; - } catch (final CrudMessageException e) { - logger.error(e.getMessage(), e); - throw new SSCActionMessagesException(e, e.getMessageId(), e.getArgs()); - } catch (final Exception e) { - logger.error(e.getMessage(), e); - throw new SSCActionMessagesException(e, "errors.crud_failed_to_delete_crud_table"); - } - } - - protected String displayList(final boolean redirect) { - // page navi - roleTypeItems = roleTypeService.getRoleTypeList(roleTypePager); - - // restore from pager - BeanUtil.copyBeanToBean(roleTypePager, roleTypeForm.searchParams, option -> option.exclude(CommonConstants.PAGER_CONVERSION_RULE)); - - if (redirect) { - return "index?redirect=true"; - } else { - return "index.jsp"; - } - } -} diff --git a/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java new file mode 100644 index 000000000..1a21a90eb --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java @@ -0,0 +1,274 @@ +/* + * Copyright 2009-2015 the CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ + +package org.codelibs.fess.app.web.admin.roletype; + +import java.util.HashMap; +import java.util.Map; + +import javax.annotation.Resource; + +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.base.FessAdminAction; +import org.codelibs.fess.crud.CommonConstants; +import org.codelibs.fess.es.exentity.RoleType; +import org.codelibs.fess.helper.SystemHelper; +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.validation.VaErrorHook; + +/** + * @author codelibs + * @author jflute + */ +public class AdminRoletypeAction extends FessAdminAction { + + // =================================================================================== + // Attribute + // ========= + @Resource + private RoleTypeService roleTypeService; + @Resource + private RoleTypePager roleTypePager; + @Resource + private SystemHelper systemHelper; + + // =================================================================================== + // Hook + // ====== + @Override + protected void setupHtmlData(ActionRuntime runtime) { + super.setupHtmlData(runtime); + runtime.registerData("helpLink", systemHelper.getHelpLink("roleType")); + } + + // =================================================================================== + // Search Execute + // ============== + @Execute + public HtmlResponse index(RoleTypeSearchForm form) { + return asHtml(path_AdminRoletype_IndexJsp).renderWith(data -> { + searchPaging(data, form); + }); + } + + @Execute + public HtmlResponse list(Integer pageNumber, RoleTypeSearchForm form) { + roleTypePager.setCurrentPageNumber(pageNumber); + return asHtml(path_AdminRoletype_IndexJsp).renderWith(data -> { + searchPaging(data, form); + }); + } + + @Execute + public HtmlResponse search(RoleTypeSearchForm form) { + copyBeanToBean(form.searchParams, roleTypePager, op -> op.exclude(CommonConstants.PAGER_CONVERSION_RULE)); + return asHtml(path_AdminRoletype_IndexJsp).renderWith(data -> { + searchPaging(data, form); + }); + } + + @Execute + public HtmlResponse reset(RoleTypeSearchForm form) { + roleTypePager.clear(); + return asHtml(path_AdminRoletype_IndexJsp).renderWith(data -> { + searchPaging(data, form); + }); + } + + @Execute + public HtmlResponse back(RoleTypeSearchForm form) { + return asHtml(path_AdminRoletype_IndexJsp).renderWith(data -> { + searchPaging(data, form); + }); + } + + protected void searchPaging(RenderData data, RoleTypeSearchForm form) { + data.register("roleTypeItems", roleTypeService.getRoleTypeList(roleTypePager)); // page navi + + // restore from pager + copyBeanToBean(roleTypePager, form.searchParams, op -> op.exclude(CommonConstants.PAGER_CONVERSION_RULE)); + } + + // =================================================================================== + // Edit Execute + // ============ + // ----------------------------------------------------- + // Entry Page + // ---------- + @Token(save = true, validate = false) + @Execute + public HtmlResponse createpage(RoleTypeEditForm form) { + form.crudMode = CommonConstants.CREATE_MODE; + return asHtml(path_AdminRoletype_EditJsp); + } + + @Token(save = true, validate = false) + @Execute + public HtmlResponse editpage(int crudMode, String id, RoleTypeEditForm form) { + form.crudMode = crudMode; + form.id = id; + verifyCrudMode(form, CommonConstants.EDIT_MODE); + loadRoleType(form); + return asHtml(path_AdminRoletype_EditJsp); + } + + @Token(save = true, validate = false) + @Execute + public HtmlResponse editagain(RoleTypeEditForm form) { + return asHtml(path_AdminRoletype_EditJsp); + } + + @Token(save = true, validate = false) + @Execute + public HtmlResponse editfromconfirm(RoleTypeEditForm form) { + form.crudMode = CommonConstants.EDIT_MODE; + loadRoleType(form); + return asHtml(path_AdminRoletype_EditJsp); + } + + @Token(save = true, validate = false) + @Execute + public HtmlResponse deletepage(int crudMode, String id, RoleTypeEditForm form) { + form.crudMode = crudMode; + form.id = id; + verifyCrudMode(form, CommonConstants.DELETE_MODE); + loadRoleType(form); + return asHtml(path_AdminRoletype_ConfirmJsp); + } + + @Token(save = true, validate = false) + @Execute + public HtmlResponse deletefromconfirm(RoleTypeEditForm form) { + form.crudMode = CommonConstants.DELETE_MODE; + loadRoleType(form); + return asHtml(path_AdminRoletype_ConfirmJsp); + } + + // ----------------------------------------------------- + // Confirm + // ------- + @Execute + public HtmlResponse confirmpage(int crudMode, String id, RoleTypeEditForm form) { + form.crudMode = crudMode; + form.id = id; + verifyCrudMode(form, CommonConstants.CONFIRM_MODE); + loadRoleType(form); + return asHtml(path_AdminRoletype_ConfirmJsp); + } + + @Token(save = false, validate = true, keep = true) + @Execute + public HtmlResponse confirmfromcreate(RoleTypeEditForm form) { + validate(form, messages -> {}, toEditHtml()); + return asHtml(path_AdminRoletype_ConfirmJsp); + } + + @Token(save = false, validate = true, keep = true) + @Execute + public HtmlResponse confirmfromupdate(RoleTypeEditForm form) { + validate(form, messages -> {}, toEditHtml()); + return asHtml(path_AdminRoletype_ConfirmJsp); + } + + // ----------------------------------------------------- + // Actually Crud + // ------------- + @Token(save = false, validate = true) + @Execute + public HtmlResponse create(RoleTypeEditForm form) { + validate(form, messages -> {}, toEditHtml()); + roleTypeService.store(createRoleType(form)); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + return redirect(getClass()); + } + + @Token(save = false, validate = true) + @Execute + public HtmlResponse update(RoleTypeEditForm form) { + validate(form, messages -> {}, toEditHtml()); + roleTypeService.store(createRoleType(form)); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + return redirect(getClass()); + } + + @Execute + public HtmlResponse delete(RoleTypeEditForm form) { + verifyCrudMode(form, CommonConstants.DELETE_MODE); + roleTypeService.delete(getRoleType(form)); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + return redirect(getClass()); + } + + // =================================================================================== + // Assist Logic + // ============ + protected void loadRoleType(RoleTypeEditForm form) { + copyBeanToBean(getRoleType(form), form, op -> op.exclude("crudMode")); + } + + protected RoleType getRoleType(RoleTypeEditForm form) { + final RoleType roleType = roleTypeService.getRoleType(createKeyMap(form)); + if (roleType == null) { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), toEditHtml()); + } + return roleType; + } + + protected RoleType createRoleType(RoleTypeEditForm form) { + RoleType roleType; + final String username = systemHelper.getUsername(); + final long currentTime = systemHelper.getCurrentTimeAsLong(); + if (form.crudMode == CommonConstants.EDIT_MODE) { + roleType = getRoleType(form); + } else { + roleType = new RoleType(); + roleType.setCreatedBy(username); + roleType.setCreatedTime(currentTime); + } + roleType.setUpdatedBy(username); + roleType.setUpdatedTime(currentTime); + copyBeanToBean(form, roleType, op -> op.exclude(CommonConstants.COMMON_CONVERSION_RULE)); + return roleType; + } + + protected Map createKeyMap(RoleTypeEditForm form) { + final Map keys = new HashMap(); + keys.put("id", form.id); + return keys; + } + + // =================================================================================== + // Small Helper + // ============ + protected void verifyCrudMode(RoleTypeEditForm form, int expectedMode) { + if (form.crudMode != expectedMode) { + throwValidationError(messages -> { + messages.addErrorsCrudInvalidMode(GLOBAL, String.valueOf(expectedMode), String.valueOf(form.crudMode)); + }, toEditHtml()); + } + } + + protected VaErrorHook toEditHtml() { + return () -> { + return asHtml(path_AdminRoletype_EditJsp); + }; + } +} diff --git a/src/main/java/org/codelibs/fess/app/web/admin/RoleTypeForm.java b/src/main/java/org/codelibs/fess/app/web/admin/roletype/RoleTypeEditForm.java similarity index 86% rename from src/main/java/org/codelibs/fess/app/web/admin/RoleTypeForm.java rename to src/main/java/org/codelibs/fess/app/web/admin/roletype/RoleTypeEditForm.java index 7a7f02d05..d513f0ae4 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/RoleTypeForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/roletype/RoleTypeEditForm.java @@ -14,30 +14,23 @@ * governing permissions and limitations under the License. */ -package org.codelibs.fess.app.web.admin; +package org.codelibs.fess.app.web.admin.roletype; import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; import org.codelibs.fess.util.ComponentUtil; -public class RoleTypeForm implements Serializable { +/** + * @author codelibs + * @author jflute + */ +public class RoleTypeEditForm implements Serializable { private static final long serialVersionUID = 1L; - //@IntegerType - public String pageNumber; - - public Map searchParams = new HashMap(); - //@IntegerType public int crudMode; - public String getCurrentPageNumber() { - return pageNumber; - } - //@Required(target = "confirmfromupdate,update,delete") //@Maxbytelength(maxbytelength = 1000) public String id; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/roletype/RoleTypeSearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/roletype/RoleTypeSearchForm.java new file mode 100644 index 000000000..4fc7e89eb --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/admin/roletype/RoleTypeSearchForm.java @@ -0,0 +1,32 @@ +/* + * Copyright 2009-2015 the CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ + +package org.codelibs.fess.app.web.admin.roletype; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + +/** + * @author codelibs + * @author jflute + */ +public class RoleTypeSearchForm implements Serializable { + + private static final long serialVersionUID = 1L; + + public Map searchParams = new HashMap(); +} diff --git a/src/main/webapp/WEB-INF/view/common/admin2/sidebar.jsp b/src/main/webapp/WEB-INF/view/common/admin2/sidebar.jsp index b85431c4c..4e72526a0 100644 --- a/src/main/webapp/WEB-INF/view/common/admin2/sidebar.jsp +++ b/src/main/webapp/WEB-INF/view/common/admin2/sidebar.jsp @@ -132,10 +132,10 @@ -
  • class="active"> +
  • class="active"> -
    • +
  • active"> - -