diff --git a/src/main/java/org/codelibs/fess/app/service/OverlappingHostService.java b/src/main/java/org/codelibs/fess/app/service/OverlappingHostService.java index ede4a0063..5ba093079 100644 --- a/src/main/java/org/codelibs/fess/app/service/OverlappingHostService.java +++ b/src/main/java/org/codelibs/fess/app/service/OverlappingHostService.java @@ -29,6 +29,7 @@ import org.codelibs.fess.es.cbean.OverlappingHostCB; import org.codelibs.fess.es.exbhv.OverlappingHostBhv; import org.codelibs.fess.es.exentity.OverlappingHost; import org.dbflute.cbean.result.PagingResultBean; +import org.dbflute.optional.OptionalEntity; public class OverlappingHostService implements Serializable { @@ -57,17 +58,8 @@ public class OverlappingHostService implements Serializable { return overlappingHostList; } - public OverlappingHost getOverlappingHost(final Map keys) { - final OverlappingHost overlappingHost = overlappingHostBhv.selectEntity(cb -> { - cb.query().docMeta().setId_Equal(keys.get("id")); - setupEntityCondition(cb, keys); - }).orElse(null);//TODO - if (overlappingHost == null) { - // TODO exception? - return null; - } - - return overlappingHost; + public OptionalEntity getOverlappingHost(final String id) { + return overlappingHostBhv.selectByPK(id); } public void store(final OverlappingHost overlappingHost) { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/AdminOverlappinghostAction.java b/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/AdminOverlappinghostAction.java index 4b48748b3..e44c5faad 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/AdminOverlappinghostAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/AdminOverlappinghostAction.java @@ -16,9 +16,6 @@ package org.codelibs.fess.app.web.admin.overlappinghost; -import java.util.HashMap; -import java.util.Map; - import javax.annotation.Resource; import org.codelibs.fess.Constants; @@ -29,6 +26,7 @@ import org.codelibs.fess.app.web.CrudMode; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.exentity.OverlappingHost; import org.codelibs.fess.helper.SystemHelper; +import org.dbflute.optional.OptionalEntity; import org.lastaflute.web.Execute; import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; @@ -64,14 +62,14 @@ public class AdminOverlappinghostAction extends FessAdminAction { // Search Execute // ============== @Execute - public HtmlResponse index(final OverlappingHostSearchForm form) { + public HtmlResponse index(final SearchForm form) { return asHtml(path_AdminOverlappinghost_IndexJsp).renderWith(data -> { searchPaging(data, form); }); } @Execute - public HtmlResponse list(final Integer pageNumber, final OverlappingHostSearchForm form) { + public HtmlResponse list(final Integer pageNumber, final SearchForm form) { overlappingHostPager.setCurrentPageNumber(pageNumber); return asHtml(path_AdminOverlappinghost_IndexJsp).renderWith(data -> { searchPaging(data, form); @@ -79,15 +77,15 @@ public class AdminOverlappinghostAction extends FessAdminAction { } @Execute - public HtmlResponse search(final OverlappingHostSearchForm form) { - copyBeanToBean(form.searchParams, overlappingHostPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + public HtmlResponse search(final SearchForm form) { + copyBeanToBean(form, overlappingHostPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); return asHtml(path_AdminOverlappinghost_IndexJsp).renderWith(data -> { searchPaging(data, form); }); } @Execute - public HtmlResponse reset(final OverlappingHostSearchForm form) { + public HtmlResponse reset(final SearchForm form) { overlappingHostPager.clear(); return asHtml(path_AdminOverlappinghost_IndexJsp).renderWith(data -> { searchPaging(data, form); @@ -95,17 +93,17 @@ public class AdminOverlappinghostAction extends FessAdminAction { } @Execute - public HtmlResponse back(final OverlappingHostSearchForm form) { + public HtmlResponse back(final SearchForm form) { return asHtml(path_AdminOverlappinghost_IndexJsp).renderWith(data -> { searchPaging(data, form); }); } - protected void searchPaging(final RenderData data, final OverlappingHostSearchForm form) { + protected void searchPaging(final RenderData data, final SearchForm form) { data.register("overlappingHostItems", overlappingHostService.getOverlappingHostList(overlappingHostPager)); // page navi // restore from pager - copyBeanToBean(overlappingHostPager, form.searchParams, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + copyBeanToBean(overlappingHostPager, form, op -> op.include("id")); } // =================================================================================== @@ -116,51 +114,92 @@ public class AdminOverlappinghostAction extends FessAdminAction { // ---------- @Token(save = true, validate = false) @Execute - public HtmlResponse createpage(final OverlappingHostEditForm form) { - form.initialize(); - form.crudMode = CrudMode.CREATE; + public HtmlResponse createpage() { + return asHtml(path_AdminOverlappinghost_EditJsp).useForm(CreateForm.class, op -> { + op.setup(form -> { + form.initialize(); + form.crudMode = CrudMode.CREATE; + }); + }); + } + + @Token(save = true, validate = false) + @Execute + public HtmlResponse editpage(final int crudMode, final String id) { + verifyCrudMode(crudMode, CrudMode.EDIT); + return asHtml(path_AdminOverlappinghost_EditJsp).useForm(EditForm.class, op -> { + op.setup(form -> { + overlappingHostService.getOverlappingHost(id).ifPresent(entity -> { + copyBeanToBean(entity, form, copyOp -> { + copyOp.excludeNull(); + }); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); + form.crudMode = crudMode; + }); + }); + } + + @Token(save = true, validate = false) + @Execute + 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 - public HtmlResponse editpage(final int crudMode, final String id, final OverlappingHostEditForm form) { - form.crudMode = crudMode; - form.id = id; - verifyCrudMode(form, CrudMode.EDIT); - loadOverlappingHost(form); + 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 - public HtmlResponse editagain(final OverlappingHostEditForm form) { - return asHtml(path_AdminOverlappinghost_EditJsp); - } - - @Token(save = true, validate = false) - @Execute - public HtmlResponse editfromconfirm(final OverlappingHostEditForm form) { + public HtmlResponse editfromconfirm(final EditForm form) { + validate(form, messages -> {}, toEditHtml()); form.crudMode = CrudMode.EDIT; - loadOverlappingHost(form); + final String id = form.id; + overlappingHostService.getOverlappingHost(id).ifPresent(entity -> { + copyBeanToBean(entity, form, op -> {}); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); return asHtml(path_AdminOverlappinghost_EditJsp); } @Token(save = true, validate = false) @Execute - public HtmlResponse deletepage(final int crudMode, final String id, final OverlappingHostEditForm form) { - form.crudMode = crudMode; - form.id = id; - verifyCrudMode(form, CrudMode.DELETE); - loadOverlappingHost(form); - return asHtml(path_AdminOverlappinghost_ConfirmJsp); + public HtmlResponse deletepage(final int crudMode, final String id) { + verifyCrudMode(crudMode, CrudMode.DELETE); + return asHtml(path_AdminOverlappinghost_ConfirmJsp).useForm(EditForm.class, op -> { + op.setup(form -> { + overlappingHostService.getOverlappingHost(id).ifPresent(entity -> { + copyBeanToBean(entity, form, copyOp -> { + copyOp.excludeNull(); + }); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); + form.crudMode = crudMode; + }); + }); } @Token(save = true, validate = false) @Execute - public HtmlResponse deletefromconfirm(final OverlappingHostEditForm form) { + public HtmlResponse deletefromconfirm(final EditForm form) { + validate(form, messages -> {}, toEditHtml()); form.crudMode = CrudMode.DELETE; - loadOverlappingHost(form); + final String id = form.id; + overlappingHostService.getOverlappingHost(id).ifPresent(entity -> { + copyBeanToBean(entity, form, op -> {}); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); return asHtml(path_AdminOverlappinghost_ConfirmJsp); } @@ -168,25 +207,35 @@ public class AdminOverlappinghostAction extends FessAdminAction { // Confirm // ------- @Execute - public HtmlResponse confirmpage(final int crudMode, final String id, final OverlappingHostEditForm form) { - form.crudMode = crudMode; - form.id = id; - verifyCrudMode(form, CrudMode.CONFIRM); - loadOverlappingHost(form); + public HtmlResponse confirmpage(final int crudMode, final String id) { + verifyCrudMode(crudMode, CrudMode.CONFIRM); + return asHtml(path_AdminOverlappinghost_ConfirmJsp).useForm(EditForm.class, op -> { + op.setup(form -> { + overlappingHostService.getOverlappingHost(id).ifPresent(entity -> { + copyBeanToBean(entity, form, copyOp -> { + copyOp.excludeNull(); + }); + form.crudMode = crudMode; + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); + }); + }); + } + + @Token(save = false, validate = true, keep = true) + @Execute + 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 - public HtmlResponse confirmfromcreate(final OverlappingHostEditForm form) { - validate(form, messages -> {}, toEditHtml()); - return asHtml(path_AdminOverlappinghost_ConfirmJsp); - } - - @Token(save = false, validate = true, keep = true) - @Execute - public HtmlResponse confirmfromupdate(final OverlappingHostEditForm form) { + public HtmlResponse confirmfromupdate(final EditForm form) { validate(form, messages -> {}, toEditHtml()); + form.crudMode = CrudMode.EDIT; return asHtml(path_AdminOverlappinghost_ConfirmJsp); } @@ -195,75 +244,87 @@ public class AdminOverlappinghostAction extends FessAdminAction { // ------------- @Token(save = false, validate = true) @Execute - public HtmlResponse create(final OverlappingHostEditForm form) { + public HtmlResponse create(final CreateForm form) { + verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - overlappingHostService.store(createOverlappingHost(form)); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + createOverlappingHost(form).ifPresent(entity -> { + copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); + overlappingHostService.store(entity); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL), toEditHtml()); + }); return redirect(getClass()); } @Token(save = false, validate = true) @Execute - public HtmlResponse update(final OverlappingHostEditForm form) { + public HtmlResponse update(final EditForm form) { + verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - overlappingHostService.store(createOverlappingHost(form)); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + createOverlappingHost(form).ifPresent(entity -> { + copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); + overlappingHostService.store(entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), toEditHtml()); + }); return redirect(getClass()); } @Execute - public HtmlResponse delete(final OverlappingHostEditForm form) { - verifyCrudMode(form, CrudMode.DELETE); - overlappingHostService.delete(getOverlappingHost(form)); - saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + public HtmlResponse delete(final EditForm form) { + verifyCrudMode(form.crudMode, CrudMode.DELETE); + validate(form, messages -> {}, toEditHtml()); + final String id = form.id; + overlappingHostService.getOverlappingHost(id).ifPresent(entity -> { + overlappingHostService.delete(entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); return redirect(getClass()); } // =================================================================================== // Assist Logic // ============ - protected void loadOverlappingHost(final OverlappingHostEditForm form) { - copyBeanToBean(getOverlappingHost(form), form, op -> op.exclude("crudMode")); - } - - protected OverlappingHost getOverlappingHost(final OverlappingHostEditForm form) { - final OverlappingHost overlappingHost = overlappingHostService.getOverlappingHost(createKeyMap(form)); - if (overlappingHost == null) { - throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), toEditHtml()); - } - return overlappingHost; - } - - protected OverlappingHost createOverlappingHost(final OverlappingHostEditForm form) { - OverlappingHost overlappingHost; + protected OptionalEntity createOverlappingHost(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); - if (form.crudMode == CrudMode.EDIT) { - overlappingHost = getOverlappingHost(form); - } else { - overlappingHost = new OverlappingHost(); - overlappingHost.setCreatedBy(username); - overlappingHost.setCreatedTime(currentTime); + switch (form.crudMode) { + case CrudMode.CREATE: + if (form instanceof CreateForm) { + final OverlappingHost entity = new OverlappingHost(); + entity.setCreatedBy(username); + entity.setCreatedTime(currentTime); + entity.setUpdatedBy(username); + entity.setUpdatedTime(currentTime); + return OptionalEntity.of(entity); + } + break; + case CrudMode.EDIT: + if (form instanceof EditForm) { + return overlappingHostService.getOverlappingHost(((EditForm) form).id).map(entity -> { + entity.setUpdatedBy(username); + entity.setUpdatedTime(currentTime); + return entity; + }); + } + break; + default: + break; } - overlappingHost.setUpdatedBy(username); - overlappingHost.setUpdatedTime(currentTime); - copyBeanToBean(form, overlappingHost, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); - return overlappingHost; - } - - protected Map createKeyMap(final OverlappingHostEditForm form) { - final Map keys = new HashMap(); - keys.put("id", form.id); - return keys; + return OptionalEntity.empty(); } // =================================================================================== // Small Helper // ============ - protected void verifyCrudMode(final OverlappingHostEditForm form, final int expectedMode) { - if (form.crudMode != expectedMode) { + protected void verifyCrudMode(final int crudMode, final int expectedMode) { + if (crudMode != expectedMode) { throwValidationError(messages -> { - messages.addErrorsCrudInvalidMode(GLOBAL, String.valueOf(expectedMode), String.valueOf(form.crudMode)); + messages.addErrorsCrudInvalidMode(GLOBAL, String.valueOf(expectedMode), String.valueOf(crudMode)); }, toEditHtml()); } } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/CreateForm.java new file mode 100644 index 000000000..f3e138b11 --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/CreateForm.java @@ -0,0 +1,65 @@ +/* + * 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.overlappinghost; + +import java.io.Serializable; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.Size; + +import org.codelibs.fess.app.web.CrudMode; +import org.codelibs.fess.util.ComponentUtil; +import org.lastaflute.web.validation.Required; + +/** + * @author codelibs + * @author Keiichi Watanabe + */ +public class CreateForm implements Serializable { + + private static final long serialVersionUID = 1L; + + public Integer crudMode; + + @Required + @Size(max = 1000) + public String regularName; + + @Required + @Size(max = 1000) + public String overlappingName; + + @Required + @Min(value = 0) + @Max(value = 2147483647) + public Integer sortOrder; + + @Required + @Size(max = 1000) + public String createdBy; + + @Required + public Long createdTime; + + public void initialize() { + crudMode = CrudMode.CREATE; + sortOrder = 0; + createdBy = ComponentUtil.getSystemHelper().getUsername(); + createdTime = ComponentUtil.getSystemHelper().getCurrentTimeAsLong(); + } +} diff --git a/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/EditForm.java new file mode 100644 index 000000000..e4a651ae2 --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/EditForm.java @@ -0,0 +1,42 @@ +/* + * 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.overlappinghost; + +import javax.validation.constraints.Size; + +import org.lastaflute.web.validation.Required; + +/** + * @author Keiichi Watanabe + */ +public class EditForm extends CreateForm { + + private static final long serialVersionUID = 1L; + + @Required + @Size(max = 1000) + public String id; + + @Size(max = 1000) + public String updatedBy; + + public Long updatedTime; + + @Required + public Integer versionNo; + +} diff --git a/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/OverlappingHostEditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/OverlappingHostEditForm.java deleted file mode 100644 index edacf072b..000000000 --- a/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/OverlappingHostEditForm.java +++ /dev/null @@ -1,80 +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.overlappinghost; - -import java.io.Serializable; - -import org.codelibs.fess.util.ComponentUtil; - -/** - * @author codelibs - * @author Keiichi Watanabe - */ -public class OverlappingHostEditForm implements Serializable { - - private static final long serialVersionUID = 1L; - - //@IntegerType - public int crudMode; - - //@Required(target = "confirmfromupdate,update,delete") - //@Maxbytelength(maxbytelength = 1000) - public String id; - - //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - //@Maxbytelength(maxbytelength = 1000) - public String regularName; - - //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - //@Maxbytelength(maxbytelength = 1000) - public String overlappingName; - - //@Required(target = "confirmfromupdate,update,delete") - //@IntRange(min = 0, max = 2147483647) - public String sortOrder; - - //@Required(target = "confirmfromupdate,update,delete") - //@Maxbytelength(maxbytelength = 255) - public String createdBy; - - //@Required(target = "confirmfromupdate,update,delete") - //@LongType - public String createdTime; - - //@Maxbytelength(maxbytelength = 255) - public String updatedBy; - - //@LongType - public String updatedTime; - - //@Required(target = "confirmfromupdate,update,delete") - //@IntegerType - public String versionNo; - - public void initialize() { - id = null; - regularName = null; - overlappingName = null; - sortOrder = null; - createdBy = "system"; - createdTime = Long.toString(ComponentUtil.getSystemHelper().getCurrentTimeAsLong()); - updatedBy = null; - updatedTime = null; - versionNo = null; - sortOrder = "0"; - } -} diff --git a/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/OverlappingHostSearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/SearchForm.java similarity index 81% rename from src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/OverlappingHostSearchForm.java rename to src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/SearchForm.java index d9eaf267b..4969f4f55 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/OverlappingHostSearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/SearchForm.java @@ -17,16 +17,14 @@ package org.codelibs.fess.app.web.admin.overlappinghost; import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; /** * @author codelibs * @author Keiichi Watanabe */ -public class OverlappingHostSearchForm implements Serializable { +public class SearchForm implements Serializable { private static final long serialVersionUID = 1L; - public Map searchParams = new HashMap(); + public String id; } diff --git a/src/main/webapp/WEB-INF/view/admin/overlappinghost/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/overlappinghost/confirm.jsp index 577f1f483..14b362fdd 100644 --- a/src/main/webapp/WEB-INF/view/admin/overlappinghost/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/overlappinghost/confirm.jsp @@ -106,7 +106,7 @@ <%-- Box Footer --%>
- " /> + " /> " />