diff --git a/src/main/java/org/codelibs/fess/app/service/FileConfigService.java b/src/main/java/org/codelibs/fess/app/service/FileConfigService.java index f444d002d..1142b379a 100644 --- a/src/main/java/org/codelibs/fess/app/service/FileConfigService.java +++ b/src/main/java/org/codelibs/fess/app/service/FileConfigService.java @@ -34,6 +34,7 @@ import org.codelibs.fess.es.exentity.FileConfig; import org.codelibs.fess.es.exentity.FileConfigToLabel; import org.codelibs.fess.es.exentity.FileConfigToRole; import org.dbflute.cbean.result.PagingResultBean; +import org.dbflute.optional.OptionalEntity; public class FileConfigService implements Serializable { @@ -102,39 +103,32 @@ public class FileConfigService implements Serializable { return list; } - public FileConfig getFileConfig(final Map keys) { - final FileConfig fileConfig = fileConfigBhv.selectEntity(cb -> { - cb.query().docMeta().setId_Equal(keys.get("id")); - setupEntityCondition(cb, keys); - }).orElse(null);//TODO - - if (fileConfig != null) { + public OptionalEntity getFileConfig(final String id) { + return fileConfigBhv.selectByPK(id).map(entity -> { final List fctrtmList = fileConfigToRoleBhv.selectList(fctrtmCb -> { - fctrtmCb.query().setFileConfigId_Equal(fileConfig.getId()); + fctrtmCb.query().setFileConfigId_Equal(entity.getId()); }); if (!fctrtmList.isEmpty()) { final List roleTypeIds = new ArrayList(fctrtmList.size()); for (final FileConfigToRole mapping : fctrtmList) { roleTypeIds.add(mapping.getRoleTypeId()); } - fileConfig.setRoleTypeIds(roleTypeIds.toArray(new String[roleTypeIds.size()])); + entity.setRoleTypeIds(roleTypeIds.toArray(new String[roleTypeIds.size()])); } final List fctltmList = fileConfigToLabelBhv.selectList(fctltmCb -> { - fctltmCb.query().setFileConfigId_Equal(fileConfig.getId()); + fctltmCb.query().setFileConfigId_Equal(entity.getId()); }); if (!fctltmList.isEmpty()) { final List labelTypeIds = new ArrayList(fctltmList.size()); for (final FileConfigToLabel mapping : fctltmList) { labelTypeIds.add(mapping.getLabelTypeId()); } - fileConfig.setLabelTypeIds(labelTypeIds.toArray(new String[labelTypeIds.size()])); + entity.setLabelTypeIds(labelTypeIds.toArray(new String[labelTypeIds.size()])); } - - } - - return fileConfig; + return entity; + }); } public void store(final FileConfig fileConfig) { @@ -271,10 +265,4 @@ public class FileConfigService implements Serializable { } - public FileConfig getFileConfig(final String id) { - return fileConfigBhv.selectEntity(cb -> { - cb.query().docMeta().setId_Equal(id); - }).orElse(null);//TODO - } - } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java index f73faa7cd..8b83f685a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java @@ -16,9 +16,6 @@ package org.codelibs.fess.app.web.admin.fileconfig; -import java.util.HashMap; -import java.util.Map; - import javax.annotation.Resource; import org.codelibs.fess.Constants; @@ -28,9 +25,13 @@ import org.codelibs.fess.app.service.FileConfigService; import org.codelibs.fess.app.service.LabelTypeService; import org.codelibs.fess.app.service.RoleTypeService; import org.codelibs.fess.app.web.CrudMode; +import org.codelibs.fess.app.web.admin.fileconfig.CreateForm; +import org.codelibs.fess.app.web.admin.fileconfig.EditForm; +import org.codelibs.fess.app.web.admin.fileconfig.SearchForm; import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.es.exentity.FileConfig; 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,11 +52,11 @@ public class AdminFileconfigAction extends FessAdminAction { @Resource private FileConfigPager fileConfigPager; @Resource + private RoleTypeService roleTypeService; + @Resource + private LabelTypeService labelTypeService; + @Resource private SystemHelper systemHelper; - @Resource - protected RoleTypeService roleTypeService; - @Resource - protected LabelTypeService labelTypeService; // =================================================================================== // Hook @@ -70,14 +71,14 @@ public class AdminFileconfigAction extends FessAdminAction { // Search Execute // ============== @Execute - public HtmlResponse index(final FileConfigSearchForm form) { + public HtmlResponse index(final SearchForm form) { return asHtml(path_AdminFileconfig_IndexJsp).renderWith(data -> { searchPaging(data, form); }); } @Execute - public HtmlResponse list(final Integer pageNumber, final FileConfigSearchForm form) { + public HtmlResponse list(final Integer pageNumber, final SearchForm form) { fileConfigPager.setCurrentPageNumber(pageNumber); return asHtml(path_AdminFileconfig_IndexJsp).renderWith(data -> { searchPaging(data, form); @@ -85,15 +86,15 @@ public class AdminFileconfigAction extends FessAdminAction { } @Execute - public HtmlResponse search(final FileConfigSearchForm form) { - copyBeanToBean(form.searchParams, fileConfigPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + public HtmlResponse search(final SearchForm form) { + copyBeanToBean(form, fileConfigPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); return asHtml(path_AdminFileconfig_IndexJsp).renderWith(data -> { searchPaging(data, form); }); } @Execute - public HtmlResponse reset(final FileConfigSearchForm form) { + public HtmlResponse reset(final SearchForm form) { fileConfigPager.clear(); return asHtml(path_AdminFileconfig_IndexJsp).renderWith(data -> { searchPaging(data, form); @@ -101,17 +102,17 @@ public class AdminFileconfigAction extends FessAdminAction { } @Execute - public HtmlResponse back(final FileConfigSearchForm form) { + public HtmlResponse back(final SearchForm form) { return asHtml(path_AdminFileconfig_IndexJsp).renderWith(data -> { searchPaging(data, form); }); } - protected void searchPaging(final RenderData data, final FileConfigSearchForm form) { + protected void searchPaging(final RenderData data, final SearchForm form) { data.register("fileConfigItems", fileConfigService.getFileConfigList(fileConfigPager)); // page navi // restore from pager - copyBeanToBean(fileConfigPager, form.searchParams, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + copyBeanToBean(fileConfigPager, form, op -> op.include("id")); } // =================================================================================== @@ -122,9 +123,42 @@ public class AdminFileconfigAction extends FessAdminAction { // ---------- @Token(save = true, validate = false) @Execute - public HtmlResponse createpage(final FileConfigEditForm form) { - form.initialize(); - form.crudMode = CrudMode.CREATE; + public HtmlResponse createpage() { + return asHtml(path_AdminFileconfig_EditJsp).useForm(CreateForm.class, op -> { + op.setup(form -> { + form.initialize(); + form.crudMode = CrudMode.CREATE; + }); + }).renderWith(data -> { + registerRolesAndLabels(data); + }); + } + + @Token(save = true, validate = false) + @Execute + public HtmlResponse editpage(final int crudMode, final String id) { + verifyCrudMode(crudMode, CrudMode.EDIT); + return asHtml(path_AdminFileconfig_EditJsp).useForm(EditForm.class, op -> { + op.setup(form -> { + fileConfigService.getFileConfig(id).ifPresent(entity -> { + copyBeanToBean(entity, form, copyOp -> { + copyOp.excludeNull(); + }); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); + form.crudMode = crudMode; + }); + }).renderWith(data -> { + registerRolesAndLabels(data); + }); + } + + @Token(save = true, validate = false) + @Execute + public HtmlResponse createagain(final CreateForm form) { + verifyCrudMode(form.crudMode, CrudMode.CREATE); + validate(form, messages -> {}, toEditHtml()); return asHtml(path_AdminFileconfig_EditJsp).renderWith(data -> { registerRolesAndLabels(data); }); @@ -132,11 +166,9 @@ public class AdminFileconfigAction extends FessAdminAction { @Token(save = true, validate = false) @Execute - public HtmlResponse editpage(final int crudMode, final String id, final FileConfigEditForm form) { - form.crudMode = crudMode; - form.id = id; - verifyCrudMode(form, CrudMode.EDIT); - loadFileConfig(form); + public HtmlResponse editagain(final EditForm form) { + verifyCrudMode(form.crudMode, CrudMode.EDIT); + validate(form, messages -> {}, toEditHtml()); return asHtml(path_AdminFileconfig_EditJsp).renderWith(data -> { registerRolesAndLabels(data); }); @@ -144,17 +176,15 @@ public class AdminFileconfigAction extends FessAdminAction { @Token(save = true, validate = false) @Execute - public HtmlResponse editagain(final FileConfigEditForm form) { - return asHtml(path_AdminFileconfig_EditJsp).renderWith(data -> { - registerRolesAndLabels(data); - }); - } - - @Token(save = true, validate = false) - @Execute - public HtmlResponse editfromconfirm(final FileConfigEditForm form) { + public HtmlResponse editfromconfirm(final EditForm form) { + validate(form, messages -> {}, toEditHtml()); form.crudMode = CrudMode.EDIT; - loadFileConfig(form); + final String id = form.id; + fileConfigService.getFileConfig(id).ifPresent(entity -> { + copyBeanToBean(entity, form, op -> {}); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); return asHtml(path_AdminFileconfig_EditJsp).renderWith(data -> { registerRolesAndLabels(data); }); @@ -162,21 +192,35 @@ public class AdminFileconfigAction extends FessAdminAction { @Token(save = true, validate = false) @Execute - public HtmlResponse deletepage(final int crudMode, final String id, final FileConfigEditForm form) { - form.crudMode = crudMode; - form.id = id; - verifyCrudMode(form, CrudMode.DELETE); - loadFileConfig(form); - return asHtml(path_AdminFileconfig_ConfirmJsp).renderWith(data -> { + public HtmlResponse deletepage(final int crudMode, final String id) { + verifyCrudMode(crudMode, CrudMode.DELETE); + return asHtml(path_AdminFileconfig_ConfirmJsp).useForm(EditForm.class, op -> { + op.setup(form -> { + fileConfigService.getFileConfig(id).ifPresent(entity -> { + copyBeanToBean(entity, form, copyOp -> { + copyOp.excludeNull(); + }); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); + form.crudMode = crudMode; + }); + }).renderWith(data -> { registerRolesAndLabels(data); }); } @Token(save = true, validate = false) @Execute - public HtmlResponse deletefromconfirm(final FileConfigEditForm form) { + public HtmlResponse deletefromconfirm(final EditForm form) { + validate(form, messages -> {}, toEditHtml()); form.crudMode = CrudMode.DELETE; - loadFileConfig(form); + final String id = form.id; + fileConfigService.getFileConfig(id).ifPresent(entity -> { + copyBeanToBean(entity, form, op -> {}); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); return asHtml(path_AdminFileconfig_ConfirmJsp).renderWith(data -> { registerRolesAndLabels(data); }); @@ -186,25 +230,29 @@ public class AdminFileconfigAction extends FessAdminAction { // Confirm // ------- @Execute - public HtmlResponse confirmpage(final int crudMode, final String id, final FileConfigEditForm form) { - try { - form.crudMode = crudMode; - form.id = id; - verifyCrudMode(form, CrudMode.CONFIRM); - loadFileConfig(form); - return asHtml(path_AdminFileconfig_ConfirmJsp).renderWith(data -> { - registerRolesAndLabels(data); + public HtmlResponse confirmpage(final int crudMode, final String id) { + verifyCrudMode(crudMode, CrudMode.CONFIRM); + return asHtml(path_AdminFileconfig_ConfirmJsp).useForm(EditForm.class, op -> { + op.setup(form -> { + fileConfigService.getFileConfig(id).ifPresent(entity -> { + copyBeanToBean(entity, form, copyOp -> { + copyOp.excludeNull(); + }); + form.crudMode = crudMode; + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); }); - } catch (final Exception e) { - e.printStackTrace(); - return asHtml(path_AdminFileconfig_ConfirmJsp); - } + }).renderWith(data -> { + registerRolesAndLabels(data); + }); } @Token(save = false, validate = true, keep = true) @Execute - public HtmlResponse confirmfromcreate(final FileConfigEditForm form) { + public HtmlResponse confirmfromcreate(final CreateForm form) { validate(form, messages -> {}, toEditHtml()); + form.crudMode = CrudMode.CREATE; return asHtml(path_AdminFileconfig_ConfirmJsp).renderWith(data -> { registerRolesAndLabels(data); }); @@ -212,8 +260,9 @@ public class AdminFileconfigAction extends FessAdminAction { @Token(save = false, validate = true, keep = true) @Execute - public HtmlResponse confirmfromupdate(final FileConfigEditForm form) { + public HtmlResponse confirmfromupdate(final EditForm form) { validate(form, messages -> {}, toEditHtml()); + form.crudMode = CrudMode.EDIT; return asHtml(path_AdminFileconfig_ConfirmJsp).renderWith(data -> { registerRolesAndLabels(data); }); @@ -224,66 +273,78 @@ public class AdminFileconfigAction extends FessAdminAction { // ------------- @Token(save = false, validate = true) @Execute - public HtmlResponse create(final FileConfigEditForm form) { + public HtmlResponse create(final CreateForm form) { + verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - fileConfigService.store(createFileConfig(form)); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + createFileConfig(form).ifPresent(entity -> { + copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); + fileConfigService.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 FileConfigEditForm form) { + public HtmlResponse update(final EditForm form) { + verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - fileConfigService.store(createFileConfig(form)); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + createFileConfig(form).ifPresent(entity -> { + copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); + fileConfigService.store(entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), toEditHtml()); + }); return redirect(getClass()); } @Execute - public HtmlResponse delete(final FileConfigEditForm form) { - verifyCrudMode(form, CrudMode.DELETE); - fileConfigService.delete(getFileConfig(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; + fileConfigService.getFileConfig(id).ifPresent(entity -> { + fileConfigService.delete(entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); return redirect(getClass()); } // =================================================================================== // Assist Logic // ============ - protected void loadFileConfig(final FileConfigEditForm form) { - copyBeanToBean(getFileConfig(form), form, op -> op.exclude("crudMode")); - } - - protected FileConfig getFileConfig(final FileConfigEditForm form) { - final FileConfig fileConfig = fileConfigService.getFileConfig(createKeyMap(form)); - if (fileConfig == null) { - throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), toEditHtml()); - } - return fileConfig; - } - - protected FileConfig createFileConfig(final FileConfigEditForm form) { - FileConfig fileConfig; + protected OptionalEntity createFileConfig(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); - if (form.crudMode == CrudMode.EDIT) { - fileConfig = getFileConfig(form); - } else { - fileConfig = new FileConfig(); - fileConfig.setCreatedBy(username); - fileConfig.setCreatedTime(currentTime); + switch (form.crudMode) { + case CrudMode.CREATE: + if (form instanceof CreateForm) { + final FileConfig entity = new FileConfig(); + 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 fileConfigService.getFileConfig(((EditForm) form).id).map(entity -> { + entity.setUpdatedBy(username); + entity.setUpdatedTime(currentTime); + return entity; + }); + } + break; + default: + break; } - fileConfig.setUpdatedBy(username); - fileConfig.setUpdatedTime(currentTime); - copyBeanToBean(form, fileConfig, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); - return fileConfig; - } - - protected Map createKeyMap(final FileConfigEditForm form) { - final Map keys = new HashMap(); - keys.put("id", form.id); - return keys; + return OptionalEntity.empty(); } protected void registerRolesAndLabels(final RenderData data) { @@ -294,10 +355,10 @@ public class AdminFileconfigAction extends FessAdminAction { // =================================================================================== // Small Helper // ============ - protected void verifyCrudMode(final FileConfigEditForm 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/fileconfig/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java new file mode 100644 index 000000000..4a555b786 --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java @@ -0,0 +1,117 @@ +/* + * 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.fileconfig; + +import java.io.Serializable; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.Size; + +import org.codelibs.fess.Constants; +import org.codelibs.fess.annotation.UriType; +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 String[] roleTypeIds; + + public String[] labelTypeIds; + + public Integer crudMode; + + @Required + @Size(max = 200) + public String name; + + @Required + @UriType(protocols = "file:,smb:") + @Size(max = 4000) + public String paths; + + @Size(max = 4000) + public String includedPaths; + + @Size(max = 4000) + public String excludedPaths; + + @Size(max = 4000) + public String includedDocPaths; + + @Size(max = 4000) + public String excludedDocPaths; + + @Size(max = 4000) + public String configParameter; + + @Min(value = 0) + @Max(value = 2147483647) + public Integer depth; + + @Min(value = 0) + @Max(value = 9223372036854775807l) + public Long maxAccessCount; + + @Required + @Min(value = 0) + @Max(value = 2147483647) + public Integer numOfThread; + + @Required + @Min(value = 0) + @Max(value = 2147483647) + public Integer intervalTime; + + @Required + @Min(value = 0) + @Max(value = 2147483647) + public Integer boost; + + @Required + @Size(max = 5) + public String available; + + @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; + boost = 1; + numOfThread = Constants.DEFAULT_NUM_OF_THREAD_FOR_FS; + intervalTime = Constants.DEFAULT_INTERVAL_TIME_FOR_FS; + sortOrder = 0; + createdBy = ComponentUtil.getSystemHelper().getUsername(); + createdTime = ComponentUtil.getSystemHelper().getCurrentTimeAsLong(); + } +} diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/EditForm.java new file mode 100644 index 000000000..58828fe81 --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/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.fileconfig; + +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/fileconfig/FileConfigEditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/FileConfigEditForm.java deleted file mode 100644 index e51588223..000000000 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/FileConfigEditForm.java +++ /dev/null @@ -1,138 +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.fileconfig; - -import java.io.Serializable; - -import org.codelibs.fess.Constants; -import org.codelibs.fess.annotation.UriType; -import org.codelibs.fess.util.ComponentUtil; - -/** - * @author codelibs - * @author Keiichi Watanabe - */ -public class FileConfigEditForm implements Serializable { - - private static final long serialVersionUID = 1L; - - public String[] roleTypeIds; - - public String[] labelTypeIds; - - //@IntegerType - public int crudMode; - - //@Required(target = "confirmfromupdate,update,delete") - //@Maxbytelength(maxbytelength = 1000) - public String id; - - //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - //@Maxbytelength(maxbytelength = 200) - public String name; - - //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - @UriType(protocols = "file:,smb:") - //@Maxbytelength(maxbytelength = 4000) - public String paths; - - //@Maxbytelength(maxbytelength = 4000) - public String includedPaths; - - //@Maxbytelength(maxbytelength = 4000) - public String excludedPaths; - - //@Maxbytelength(maxbytelength = 4000) - public String includedDocPaths; - - //@Maxbytelength(maxbytelength = 4000) - public String excludedDocPaths; - - //@Maxbytelength(maxbytelength = 4000) - public String configParameter; - - //@IntRange(min = 0, max = 2147483647) - public String depth; - - //@LongRange(min = 0, max = 9223372036854775807l) - public String maxAccessCount; - - //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - //@IntRange(min = 0, max = 2147483647) - public String numOfThread; - - //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - //@IntRange(min = 0, max = 2147483647) - public String intervalTime; - - //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - //@IntRange(min = 0, max = 2147483647) - public String boost; - - //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - //@Maxbytelength(maxbytelength = 5) - public String available; - - //@Required(target = "confirmfromupdate,update,delete") - //@IntegerType - //@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; - name = null; - paths = null; - includedPaths = null; - excludedPaths = null; - includedDocPaths = null; - excludedDocPaths = null; - configParameter = null; - depth = null; - maxAccessCount = null; - numOfThread = null; - intervalTime = null; - boost = "1"; - available = null; - sortOrder = null; - createdBy = "system"; - createdTime = Long.toString(ComponentUtil.getSystemHelper().getCurrentTimeAsLong()); - updatedBy = null; - updatedTime = null; - versionNo = null; - sortOrder = "0"; - numOfThread = Integer.toString(Constants.DEFAULT_NUM_OF_THREAD_FOR_FS); - intervalTime = Integer.toString(Constants.DEFAULT_INTERVAL_TIME_FOR_FS); - } -} diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/FileConfigSearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/SearchForm.java similarity index 81% rename from src/main/java/org/codelibs/fess/app/web/admin/fileconfig/FileConfigSearchForm.java rename to src/main/java/org/codelibs/fess/app/web/admin/fileconfig/SearchForm.java index cce7404a8..6c15a6677 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/FileConfigSearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/SearchForm.java @@ -17,16 +17,14 @@ package org.codelibs.fess.app.web.admin.fileconfig; import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; /** * @author codelibs * @author Keiichi Watanabe */ -public class FileConfigSearchForm 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/es/exentity/FileAuthentication.java b/src/main/java/org/codelibs/fess/es/exentity/FileAuthentication.java index 1b2ccea33..3070f86f5 100644 --- a/src/main/java/org/codelibs/fess/es/exentity/FileAuthentication.java +++ b/src/main/java/org/codelibs/fess/es/exentity/FileAuthentication.java @@ -33,7 +33,7 @@ public class FileAuthentication extends BsFileAuthentication { public FileConfig getFileConfig() { if (fileConfig == null) { final FileConfigService fileConfigService = ComponentUtil.getComponent(FileConfigService.class); - fileConfig = fileConfigService.getFileConfig(getFileConfigId()); + fileConfig = fileConfigService.getFileConfig(getFileConfigId()).get(); } return fileConfig; } diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java index a86b4f0f2..cf3c7ab7b 100644 --- a/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CrawlingConfigHelper.java @@ -76,7 +76,7 @@ public class CrawlingConfigHelper implements Serializable { return webConfigService.getWebConfig(id).get(); case FILE: final FileConfigService fileConfigService = SingletonLaContainer.getComponent(FileConfigService.class); - return fileConfigService.getFileConfig(id); + return fileConfigService.getFileConfig(id).get(); case DATA: final DataConfigService dataConfigService = SingletonLaContainer.getComponent(DataConfigService.class); return dataConfigService.getDataConfig(id); diff --git a/src/main/java/org/codelibs/fess/helper/ViewHelper.java b/src/main/java/org/codelibs/fess/helper/ViewHelper.java index dfc35fb0e..a03242b94 100644 --- a/src/main/java/org/codelibs/fess/helper/ViewHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ViewHelper.java @@ -499,7 +499,7 @@ public class ViewHelper implements Serializable { config = webConfigService.getWebConfig(crawlingConfigHelper.getId(configId)).get(); } else if (ConfigType.FILE == configType) { final FileConfigService fileConfigService = SingletonLaContainer.getComponent(FileConfigService.class); - config = fileConfigService.getFileConfig(crawlingConfigHelper.getId(configId)); + config = fileConfigService.getFileConfig(crawlingConfigHelper.getId(configId)).get(); } else if (ConfigType.DATA == configType) { final DataConfigService dataConfigService = SingletonLaContainer.getComponent(DataConfigService.class); config = dataConfigService.getDataConfig(crawlingConfigHelper.getId(configId)); diff --git a/src/main/webapp/WEB-INF/view/admin/fileconfig/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/fileconfig/confirm.jsp index 6a4e9ff11..313da77f5 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileconfig/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/confirm.jsp @@ -191,7 +191,7 @@ <%-- Box Footer --%>
- " /> + " /> " />