diff --git a/src/main/java/org/codelibs/fess/app/service/SuggestBadWordService.java b/src/main/java/org/codelibs/fess/app/service/SuggestBadWordService.java index f1bc8b6cb..4174c487e 100644 --- a/src/main/java/org/codelibs/fess/app/service/SuggestBadWordService.java +++ b/src/main/java/org/codelibs/fess/app/service/SuggestBadWordService.java @@ -37,6 +37,7 @@ import org.codelibs.fess.es.config.exentity.SuggestBadWord; import org.codelibs.fess.util.ComponentUtil; import org.dbflute.bhv.readable.EntityRowHandler; import org.dbflute.cbean.result.PagingResultBean; +import org.dbflute.optional.OptionalEntity; import com.orangesignal.csv.CsvConfig; import com.orangesignal.csv.CsvReader; @@ -73,17 +74,8 @@ public class SuggestBadWordService implements Serializable { return suggestBadWordList; } - public SuggestBadWord getSuggestBadWord(final Map keys) { - final SuggestBadWord suggestBadWord = suggestBadWordBhv.selectEntity(cb -> { - cb.query().docMeta().setId_Equal(keys.get("id")); - setupEntityCondition(cb, keys); - }).orElse(null);//TODO - if (suggestBadWord == null) { - // TODO exception? - return null; - } - - return suggestBadWord; + public OptionalEntity getSuggestBadWord(final String id) { + return suggestBadWordBhv.selectByPK(id); } public void store(final SuggestBadWord suggestBadWord) { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/AdminSuggestbadwordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/AdminSuggestbadwordAction.java index 062e9d2e2..e8643da51 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/AdminSuggestbadwordAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/AdminSuggestbadwordAction.java @@ -25,8 +25,6 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.io.Reader; import java.io.Writer; -import java.util.HashMap; -import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -42,6 +40,7 @@ import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.config.exentity.SuggestBadWord; import org.codelibs.fess.exception.FessSystemException; 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; @@ -51,7 +50,7 @@ import org.lastaflute.web.util.LaResponseUtil; import org.lastaflute.web.validation.VaErrorHook; /** - * @author shinsuke + * @author Keiichi Watanabe */ public class AdminSuggestbadwordAction extends FessAdminAction { @@ -80,14 +79,14 @@ public class AdminSuggestbadwordAction extends FessAdminAction { // Search Execute // ============== @Execute - public HtmlResponse index(final SuggestBadWordSearchForm form) { + public HtmlResponse index(final SearchForm form) { return asHtml(path_AdminSuggestbadword_IndexJsp).renderWith(data -> { searchPaging(data, form); }); } @Execute - public HtmlResponse list(final Integer pageNumber, final SuggestBadWordSearchForm form) { + public HtmlResponse list(final Integer pageNumber, final SearchForm form) { suggestBadWordPager.setCurrentPageNumber(pageNumber); return asHtml(path_AdminSuggestbadword_IndexJsp).renderWith(data -> { searchPaging(data, form); @@ -95,15 +94,15 @@ public class AdminSuggestbadwordAction extends FessAdminAction { } @Execute - public HtmlResponse search(final SuggestBadWordSearchForm form) { - copyBeanToBean(form.searchParams, suggestBadWordPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + public HtmlResponse search(final SearchForm form) { + copyBeanToBean(form, suggestBadWordPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); return asHtml(path_AdminSuggestbadword_IndexJsp).renderWith(data -> { searchPaging(data, form); }); } @Execute - public HtmlResponse reset(final SuggestBadWordSearchForm form) { + public HtmlResponse reset(final SearchForm form) { suggestBadWordPager.clear(); return asHtml(path_AdminSuggestbadword_IndexJsp).renderWith(data -> { searchPaging(data, form); @@ -111,16 +110,17 @@ public class AdminSuggestbadwordAction extends FessAdminAction { } @Execute - public HtmlResponse back(final SuggestBadWordSearchForm form) { + public HtmlResponse back(final SearchForm form) { return asHtml(path_AdminSuggestbadword_IndexJsp).renderWith(data -> { searchPaging(data, form); }); } - protected void searchPaging(final RenderData data, final SuggestBadWordSearchForm form) { + protected void searchPaging(final RenderData data, final SearchForm form) { data.register("suggestBadWordItems", suggestBadWordService.getSuggestBadWordList(suggestBadWordPager)); // page navi + // restore from pager - copyBeanToBean(suggestBadWordPager, form.searchParams, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + copyBeanToBean(suggestBadWordPager, form, op -> op.include("id")); } // =================================================================================== @@ -130,46 +130,86 @@ public class AdminSuggestbadwordAction extends FessAdminAction { // Entry Page // ---------- @Execute(token = TxToken.SAVE) - public HtmlResponse createpage(final SuggestBadWordEditForm form) { - form.initialize(); - form.crudMode = CrudMode.CREATE; + public HtmlResponse createpage() { + return asHtml(path_AdminSuggestbadword_EditJsp).useForm(CreateForm.class, op -> { + op.setup(form -> { + form.initialize(); + form.crudMode = CrudMode.CREATE; + }); + }); + } + + @Execute(token = TxToken.SAVE) + public HtmlResponse editpage(final int crudMode, final String id) { + verifyCrudMode(crudMode, CrudMode.EDIT); + return asHtml(path_AdminSuggestbadword_EditJsp).useForm(EditForm.class, op -> { + op.setup(form -> { + suggestBadWordService.getSuggestBadWord(id).ifPresent(entity -> { + copyBeanToBean(entity, form, copyOp -> { + copyOp.excludeNull(); + }); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); + form.crudMode = crudMode; + }); + }); + } + + @Execute(token = TxToken.SAVE) + public HtmlResponse createagain(final CreateForm form) { + verifyCrudMode(form.crudMode, CrudMode.CREATE); + validate(form, messages -> {}, toEditHtml()); return asHtml(path_AdminSuggestbadword_EditJsp); } @Execute(token = TxToken.SAVE) - public HtmlResponse editpage(final int crudMode, final String id, final SuggestBadWordEditForm form) { - form.crudMode = crudMode; - form.id = id; - verifyCrudMode(form, CrudMode.EDIT); - loadSuggestBadWord(form); + public HtmlResponse editagain(final EditForm form) { + verifyCrudMode(form.crudMode, CrudMode.EDIT); + validate(form, messages -> {}, toEditHtml()); return asHtml(path_AdminSuggestbadword_EditJsp); } @Execute(token = TxToken.SAVE) - public HtmlResponse editagain(final SuggestBadWordEditForm form) { - return asHtml(path_AdminSuggestbadword_EditJsp); - } - - @Execute(token = TxToken.SAVE) - public HtmlResponse editfromconfirm(final SuggestBadWordEditForm form) { + public HtmlResponse editfromconfirm(final EditForm form) { + validate(form, messages -> {}, toEditHtml()); form.crudMode = CrudMode.EDIT; - loadSuggestBadWord(form); + final String id = form.id; + suggestBadWordService.getSuggestBadWord(id).ifPresent(entity -> { + copyBeanToBean(entity, form, op -> {}); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); return asHtml(path_AdminSuggestbadword_EditJsp); } @Execute(token = TxToken.SAVE) - public HtmlResponse deletepage(final int crudMode, final String id, final SuggestBadWordEditForm form) { - form.crudMode = crudMode; - form.id = id; - verifyCrudMode(form, CrudMode.DELETE); - loadSuggestBadWord(form); - return asHtml(path_AdminSuggestbadword_ConfirmJsp); + public HtmlResponse deletepage(final int crudMode, final String id) { + verifyCrudMode(crudMode, CrudMode.DELETE); + return asHtml(path_AdminSuggestbadword_ConfirmJsp).useForm(EditForm.class, op -> { + op.setup(form -> { + suggestBadWordService.getSuggestBadWord(id).ifPresent(entity -> { + copyBeanToBean(entity, form, copyOp -> { + copyOp.excludeNull(); + }); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); + form.crudMode = crudMode; + }); + }); } @Execute(token = TxToken.SAVE) - public HtmlResponse deletefromconfirm(final SuggestBadWordEditForm form) { + public HtmlResponse deletefromconfirm(final EditForm form) { + validate(form, messages -> {}, toEditHtml()); form.crudMode = CrudMode.DELETE; - loadSuggestBadWord(form); + final String id = form.id; + suggestBadWordService.getSuggestBadWord(id).ifPresent(entity -> { + copyBeanToBean(entity, form, op -> {}); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); return asHtml(path_AdminSuggestbadword_ConfirmJsp); } @@ -177,36 +217,46 @@ public class AdminSuggestbadwordAction extends FessAdminAction { // Confirm // ------- @Execute - public HtmlResponse confirmpage(final int crudMode, final String id, final SuggestBadWordEditForm form) { - form.crudMode = crudMode; - form.id = id; - verifyCrudMode(form, CrudMode.CONFIRM); - loadSuggestBadWord(form); + public HtmlResponse confirmpage(final int crudMode, final String id) { + verifyCrudMode(crudMode, CrudMode.CONFIRM); + return asHtml(path_AdminSuggestbadword_ConfirmJsp).useForm(EditForm.class, op -> { + op.setup(form -> { + suggestBadWordService.getSuggestBadWord(id).ifPresent(entity -> { + copyBeanToBean(entity, form, copyOp -> { + copyOp.excludeNull(); + }); + form.crudMode = crudMode; + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); + }); + }); + } + + @Execute(token = TxToken.VALIDATE_KEEP) + public HtmlResponse confirmfromcreate(final CreateForm form) { + validate(form, messages -> {}, toEditHtml()); + form.crudMode = CrudMode.CREATE; return asHtml(path_AdminSuggestbadword_ConfirmJsp); } @Execute(token = TxToken.VALIDATE_KEEP) - public HtmlResponse confirmfromcreate(final SuggestBadWordEditForm form) { - validate(form, messages -> {}, toEditHtml()); - return asHtml(path_AdminSuggestbadword_ConfirmJsp); - } - - @Execute(token = TxToken.VALIDATE_KEEP) - public HtmlResponse confirmfromupdate(final SuggestBadWordEditForm form) { + public HtmlResponse confirmfromupdate(final EditForm form) { validate(form, messages -> {}, toEditHtml()); + form.crudMode = CrudMode.EDIT; return asHtml(path_AdminSuggestbadword_ConfirmJsp); } // ----------------------------------------------------- // Download // ------- - @Execute(token = TxToken.VALIDATE) - public HtmlResponse downloadpage(final SuggestBadWordSearchForm form) { + @Execute(token = TxToken.SAVE) + public HtmlResponse downloadpage(final SearchForm form) { return asHtml(path_AdminSuggestbadword_DownloadJsp); } @Execute(token = TxToken.VALIDATE) - public HtmlResponse download(final SuggestBadWordSearchForm form) { + public HtmlResponse download(final SearchForm form) { final HttpServletResponse response = LaResponseUtil.getResponse(); response.setContentType("application/octet-stream"); response.setHeader("Content-Disposition", "attachment; filename=\"" + "badword.csv" + "\""); @@ -223,8 +273,8 @@ public class AdminSuggestbadwordAction extends FessAdminAction { // ----------------------------------------------------- // Upload // ------- - @Execute(token = TxToken.VALIDATE) - public HtmlResponse uploadpage(final SuggestBadWordUploadForm form) { + @Execute(token = TxToken.SAVE) + public HtmlResponse uploadpage(final UploadForm form) { return asHtml(path_AdminSuggestbadword_UploadJsp); } @@ -232,31 +282,49 @@ public class AdminSuggestbadwordAction extends FessAdminAction { // Actually Crud // ------------- @Execute(token = TxToken.VALIDATE) - public HtmlResponse create(final SuggestBadWordEditForm form) { + public HtmlResponse create(final CreateForm form) { + verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - suggestBadWordService.store(createSuggestBadWord(form)); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + createSuggestBadWord(form).ifPresent(entity -> { + copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); + suggestBadWordService.store(entity); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL), toEditHtml()); + }); return redirect(getClass()); } @Execute(token = TxToken.VALIDATE) - public HtmlResponse update(final SuggestBadWordEditForm form) { + public HtmlResponse update(final EditForm form) { + verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - suggestBadWordService.store(createSuggestBadWord(form)); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + createSuggestBadWord(form).ifPresent(entity -> { + copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); + suggestBadWordService.store(entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), toEditHtml()); + }); return redirect(getClass()); } @Execute - public HtmlResponse delete(final SuggestBadWordEditForm form) { - verifyCrudMode(form, CrudMode.DELETE); - suggestBadWordService.delete(getSuggestBadWord(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; + suggestBadWordService.getSuggestBadWord(id).ifPresent(entity -> { + suggestBadWordService.delete(entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); return redirect(getClass()); } @Execute(token = TxToken.VALIDATE) - public HtmlResponse upload(final SuggestBadWordUploadForm form) { + public HtmlResponse upload(final UploadForm form) { BufferedInputStream is = null; File tempFile = null; FileOutputStream fos = null; @@ -310,58 +378,45 @@ public class AdminSuggestbadwordAction extends FessAdminAction { return redirect(getClass()); } - //=================================================================================== + // =================================================================================== // Assist Logic // ============ - protected void loadSuggestBadWord(final SuggestBadWordEditForm form) { - copyBeanToBean(getSuggestBadWord(form), form, op -> op.exclude("crudMode")); - } - - protected SuggestBadWord getSuggestBadWord(final SuggestBadWordEditForm form) { - final SuggestBadWord suggestBadWord = suggestBadWordService.getSuggestBadWord(createKeyMap(form)); - if (suggestBadWord == null) { - throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), toEditHtml()); - } - return suggestBadWord; - } - - protected SuggestBadWord createSuggestBadWord(final SuggestBadWordEditForm form) { - SuggestBadWord suggestBadWord; + protected OptionalEntity createSuggestBadWord(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); - if (form.crudMode == CrudMode.EDIT) { - suggestBadWord = getSuggestBadWord(form); - } else { - suggestBadWord = new SuggestBadWord(); - suggestBadWord.setCreatedBy(username); - suggestBadWord.setCreatedTime(currentTime); + switch (form.crudMode) { + case CrudMode.CREATE: + if (form instanceof CreateForm) { + final SuggestBadWord entity = new SuggestBadWord(); + 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 suggestBadWordService.getSuggestBadWord(((EditForm) form).id).map(entity -> { + entity.setUpdatedBy(username); + entity.setUpdatedTime(currentTime); + return entity; + }); + } + break; + default: + break; } - suggestBadWord.setUpdatedBy(username); - suggestBadWord.setUpdatedTime(currentTime); - copyBeanToBean(form, suggestBadWord, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); - return suggestBadWord; - } - - protected Map createKeyMap(final SuggestBadWordEditForm form) { - final Map keys = new HashMap(); - keys.put("id", form.id); - return keys; - } - - protected Map createItem(final String label, final String value) { - final Map map = new HashMap(2); - map.put(Constants.ITEM_LABEL, label); - map.put(Constants.ITEM_VALUE, value); - return map; + return OptionalEntity.empty(); } // =================================================================================== // Small Helper // ============ - protected void verifyCrudMode(final SuggestBadWordEditForm 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/suggestbadword/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/CreateForm.java new file mode 100644 index 000000000..62c46e055 --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/CreateForm.java @@ -0,0 +1,52 @@ +/* + * Copyright 2012-2015 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.app.web.admin.suggestbadword; + +import java.io.Serializable; + +import javax.validation.constraints.Digits; +import javax.validation.constraints.Size; + +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; + + @Digits(integer = 10, fraction = 0) + public int crudMode; + + @Required + public String suggestWord; + + @Required + @Size(max = 1000) + public String createdBy; + + @Required + @Digits(integer = 19, fraction = 0) + public Long createdTime; + + public void initialize() { + createdBy = ComponentUtil.getSystemHelper().getUsername(); + createdTime = ComponentUtil.getSystemHelper().getCurrentTimeAsLong(); + } +} diff --git a/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/EditForm.java new file mode 100644 index 000000000..06a3e410e --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/EditForm.java @@ -0,0 +1,44 @@ +/* + * Copyright 2012-2015 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ +package org.codelibs.fess.app.web.admin.suggestbadword; + +import javax.validation.constraints.Digits; +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; + + @Digits(integer = 19, fraction = 0) + public Long updatedTime; + + @Required + @Digits(integer = 10, fraction = 0) + public Integer versionNo; + +} diff --git a/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/SuggestBadWordSearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/SearchForm.java similarity index 81% rename from src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/SuggestBadWordSearchForm.java rename to src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/SearchForm.java index 7658a29c3..855de3faa 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/SuggestBadWordSearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/SearchForm.java @@ -16,16 +16,14 @@ package org.codelibs.fess.app.web.admin.suggestbadword; import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; /** * @author codelibs * @author Keiichi Watanabe */ -public class SuggestBadWordSearchForm 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/java/org/codelibs/fess/app/web/admin/suggestbadword/SuggestBadWordEditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/SuggestBadWordEditForm.java deleted file mode 100644 index 465424060..000000000 --- a/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/SuggestBadWordEditForm.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright 2012-2015 CodeLibs Project and the Others. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ -package org.codelibs.fess.app.web.admin.suggestbadword; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; - -import org.codelibs.fess.util.ComponentUtil; - -/** - * @author codelibs - * @author Keiichi Watanabe - */ -public class SuggestBadWordEditForm implements Serializable { - - private static final long serialVersionUID = 1L; - - //@Digits(integer=10, fraction=0) - public String pageNumber; - - public Map searchParams = new HashMap(); - - //@Digits(integer=10, fraction=0) - public int crudMode; - - public String getCurrentPageNumber() { - return pageNumber; - } - - //@Required(target = "confirmfromupdate,update,delete") - //@Maxbytelength(maxbytelength = 1000) - public String id; - - //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - public String suggestWord; - - public String reading; - - public String targetRole; - - public String targetLabel; - - //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - //@FloatType - public String boost; - - //@Required(target = "confirmfromupdate,update,delete") - //@Maxbytelength(maxbytelength = 255) - public String createdBy; - - //@Required(target = "confirmfromupdate,update,delete") - //@Digits(integer=19, fraction=0) - public String createdTime; - - //@Maxbytelength(maxbytelength = 255) - public String updatedBy; - - //@Digits(integer=19, fraction=0) - public String updatedTime; - - //@Required(target = "confirmfromupdate,update,delete") - //@Digits(integer=10, fraction=0) - public String versionNo; - - public void initialize() { - id = null; - suggestWord = null; - reading = null; - targetRole = null; - targetLabel = null; - boost = null; - createdBy = "system"; - createdTime = Long.toString(ComponentUtil.getSystemHelper().getCurrentTimeAsLong()); - updatedBy = null; - updatedTime = null; - versionNo = null; - boost = "100"; - } -} diff --git a/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/SuggestBadWordUploadForm.java b/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/UploadForm.java similarity index 93% rename from src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/SuggestBadWordUploadForm.java rename to src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/UploadForm.java index 765d255b8..fefc7d47c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/SuggestBadWordUploadForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/UploadForm.java @@ -23,7 +23,7 @@ import org.lastaflute.web.ruts.multipart.MultipartFormFile; * @author codelibs * @author Keiichi Watanabe */ -public class SuggestBadWordUploadForm implements Serializable { +public class UploadForm implements Serializable { private static final long serialVersionUID = 1L;