diff --git a/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java b/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java index d98a7ebd8..cff46b194 100644 --- a/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java +++ b/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java @@ -29,6 +29,7 @@ import org.codelibs.fess.es.config.exbhv.ScheduledJobBhv; import org.codelibs.fess.es.config.exentity.ScheduledJob; import org.codelibs.fess.job.JobScheduler; import org.dbflute.cbean.result.PagingResultBean; +import org.dbflute.optional.OptionalEntity; public class ScheduledJobService implements Serializable { @@ -57,17 +58,8 @@ public class ScheduledJobService implements Serializable { return scheduledJobList; } - public ScheduledJob getScheduledJob(final Map keys) { - final ScheduledJob scheduledJob = scheduledJobBhv.selectEntity(cb -> { - cb.query().docMeta().setId_Equal(keys.get("id")); - setupEntityCondition(cb, keys); - }).orElse(null);//TODO - if (scheduledJob == null) { - // TODO exception? - return null; - } - - return scheduledJob; + public OptionalEntity getScheduledJob(final String id) { + return scheduledJobBhv.selectByPK(id); } public void delete(final ScheduledJob scheduledJob) { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java index 75f774608..d90225d54 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java @@ -15,9 +15,6 @@ */ package org.codelibs.fess.app.web.admin.scheduledjob; -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.es.config.exentity.ScheduledJob; import org.codelibs.fess.helper.JobHelper; import org.codelibs.fess.helper.SystemHelper; import org.codelibs.fess.job.JobExecutor; +import org.dbflute.optional.OptionalEntity; import org.lastaflute.web.Execute; import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; @@ -38,6 +36,7 @@ import org.lastaflute.web.validation.VaErrorHook; /** * @author shinsuke + * @author Keiichi Watanabe */ public class AdminScheduledjobAction extends FessAdminAction { @@ -46,13 +45,10 @@ public class AdminScheduledjobAction extends FessAdminAction { // ========= @Resource private ScheduledJobService scheduledJobService; - @Resource private ScheduledJobPager scheduledJobPager; - @Resource - protected SystemHelper systemHelper; - + private SystemHelper systemHelper; @Resource protected JobHelper jobHelper; @@ -71,14 +67,14 @@ public class AdminScheduledjobAction extends FessAdminAction { // Search Execute // ============== @Execute - public HtmlResponse index(final ScheduledjobSearchForm form) { + public HtmlResponse index(final SearchForm form) { return asHtml(path_AdminScheduledjob_IndexJsp).renderWith(data -> { searchPaging(data, form); }); } @Execute - public HtmlResponse list(final Integer pageNumber, final ScheduledjobSearchForm form) { + public HtmlResponse list(final Integer pageNumber, final SearchForm form) { scheduledJobPager.setCurrentPageNumber(pageNumber); return asHtml(path_AdminScheduledjob_IndexJsp).renderWith(data -> { searchPaging(data, form); @@ -86,15 +82,15 @@ public class AdminScheduledjobAction extends FessAdminAction { } @Execute - public HtmlResponse search(final ScheduledjobSearchForm form) { - copyBeanToBean(form.searchParams, scheduledJobPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + public HtmlResponse search(final SearchForm form) { + copyBeanToBean(form, scheduledJobPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); return asHtml(path_AdminScheduledjob_IndexJsp).renderWith(data -> { searchPaging(data, form); }); } @Execute - public HtmlResponse reset(final ScheduledjobSearchForm form) { + public HtmlResponse reset(final SearchForm form) { scheduledJobPager.clear(); return asHtml(path_AdminScheduledjob_IndexJsp).renderWith(data -> { searchPaging(data, form); @@ -102,17 +98,17 @@ public class AdminScheduledjobAction extends FessAdminAction { } @Execute - public HtmlResponse back(final ScheduledjobSearchForm form) { + public HtmlResponse back(final SearchForm form) { return asHtml(path_AdminScheduledjob_IndexJsp).renderWith(data -> { searchPaging(data, form); }); } - protected void searchPaging(final RenderData data, final ScheduledjobSearchForm form) { + protected void searchPaging(final RenderData data, final SearchForm form) { data.register("scheduledJobItems", scheduledJobService.getScheduledJobList(scheduledJobPager)); // page navi // restore from pager - copyBeanToBean(scheduledJobPager, form.searchParams, op -> op.exclude(Constants.PAGER_CONVERSION_RULE)); + copyBeanToBean(scheduledJobPager, form, op -> op.include("id")); } // =================================================================================== @@ -122,46 +118,82 @@ public class AdminScheduledjobAction extends FessAdminAction { // Entry Page // ---------- @Execute(token = TxToken.SAVE) - public HtmlResponse createpage(final ScheduledjobEditForm form) { - form.initialize(); - form.crudMode = CrudMode.CREATE; + public HtmlResponse createpage() { + return asHtml(path_AdminScheduledjob_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_AdminScheduledjob_EditJsp).useForm(EditForm.class, op -> { + op.setup(form -> { + scheduledJobService.getScheduledJob(id).ifPresent(entity -> { + loadScheduledJob(form, entity); + }).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_AdminScheduledjob_EditJsp); } @Execute(token = TxToken.SAVE) - public HtmlResponse editpage(final int crudMode, final String id, final ScheduledjobEditForm form) { - form.crudMode = crudMode; - form.id = id; - verifyCrudMode(form, CrudMode.EDIT); - loadScheduledJob(form); + public HtmlResponse editagain(final EditForm form) { + verifyCrudMode(form.crudMode, CrudMode.EDIT); + validate(form, messages -> {}, toEditHtml()); return asHtml(path_AdminScheduledjob_EditJsp); } @Execute(token = TxToken.SAVE) - public HtmlResponse editagain(final ScheduledjobEditForm form) { - return asHtml(path_AdminScheduledjob_EditJsp); - } - - @Execute(token = TxToken.SAVE) - public HtmlResponse editfromconfirm(final ScheduledjobEditForm form) { + public HtmlResponse editfromconfirm(final EditForm form) { + validate(form, messages -> {}, toEditHtml()); form.crudMode = CrudMode.EDIT; - loadScheduledJob(form); + final String id = form.id; + scheduledJobService.getScheduledJob(id).ifPresent(entity -> { + loadScheduledJob(form, entity); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); return asHtml(path_AdminScheduledjob_EditJsp); } @Execute(token = TxToken.SAVE) - public HtmlResponse deletepage(final int crudMode, final String id, final ScheduledjobEditForm form) { - form.crudMode = crudMode; - form.id = id; - verifyCrudMode(form, CrudMode.DELETE); - loadScheduledJob(form); - return asHtml(path_AdminScheduledjob_ConfirmJsp); + public HtmlResponse deletepage(final int crudMode, final String id) { + verifyCrudMode(crudMode, CrudMode.DELETE); + return asHtml(path_AdminScheduledjob_ConfirmJsp).useForm(EditForm.class, op -> { + op.setup(form -> { + scheduledJobService.getScheduledJob(id).ifPresent(entity -> { + loadScheduledJob(form, entity); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); + form.crudMode = crudMode; + }); + }); } @Execute(token = TxToken.SAVE) - public HtmlResponse deletefromconfirm(final ScheduledjobEditForm form) { + public HtmlResponse deletefromconfirm(final EditForm form) { + validate(form, messages -> {}, toEditHtml()); form.crudMode = CrudMode.DELETE; - loadScheduledJob(form); + final String id = form.id; + scheduledJobService.getScheduledJob(id).ifPresent(entity -> { + loadScheduledJob(form, entity); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); return asHtml(path_AdminScheduledjob_ConfirmJsp); } @@ -169,27 +201,35 @@ public class AdminScheduledjobAction extends FessAdminAction { // Confirm // ------- @Execute - public HtmlResponse confirmpage(final int crudMode, final String id, final ScheduledjobEditForm form) { - form.crudMode = crudMode; - form.id = id; - verifyCrudMode(form, CrudMode.CONFIRM); - loadScheduledJob(form); + public HtmlResponse confirmpage(final int crudMode, final String id) { + verifyCrudMode(crudMode, CrudMode.CONFIRM); + return asHtml(path_AdminScheduledjob_ConfirmJsp).useForm(EditForm.class, op -> { + op.setup(form -> { + scheduledJobService.getScheduledJob(id).ifPresent(entity -> { + loadScheduledJob(form, entity); + form.crudMode = crudMode; + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); + }); + }).renderWith(data -> { + data.register("running", running); + }); + } + + @Execute(token = TxToken.VALIDATE_KEEP) + public HtmlResponse confirmfromcreate(final CreateForm form) { + validate(form, messages -> {}, toEditHtml()); + form.crudMode = CrudMode.CREATE; return asHtml(path_AdminScheduledjob_ConfirmJsp).renderWith(data -> { data.register("running", running); }); } @Execute(token = TxToken.VALIDATE_KEEP) - public HtmlResponse confirmfromcreate(final ScheduledjobEditForm form) { - validate(form, messages -> {}, toEditHtml()); - return asHtml(path_AdminScheduledjob_ConfirmJsp).renderWith(data -> { - data.register("running", running); - }); - } - - @Execute(token = TxToken.VALIDATE_KEEP) - public HtmlResponse confirmfromupdate(final ScheduledjobEditForm form) { + public HtmlResponse confirmfromupdate(final EditForm form) { validate(form, messages -> {}, toEditHtml()); + form.crudMode = CrudMode.EDIT; return asHtml(path_AdminScheduledjob_ConfirmJsp).renderWith(data -> { data.register("running", running); }); @@ -199,113 +239,139 @@ public class AdminScheduledjobAction extends FessAdminAction { // Actually Crud // ------------- @Execute(token = TxToken.VALIDATE) - public HtmlResponse create(final ScheduledjobEditForm form) { + public HtmlResponse create(final CreateForm form) { + verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - scheduledJobService.store(createScheduledJob(form)); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + createScheduledJob(form).ifPresent(entity -> { + copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); + scheduledJobService.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 ScheduledjobEditForm form) { + public HtmlResponse update(final EditForm form) { + verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - scheduledJobService.store(createScheduledJob(form)); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + createScheduledJob(form).ifPresent(entity -> { + copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); + scheduledJobService.store(entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), toEditHtml()); + }); return redirect(getClass()); } @Execute - public HtmlResponse delete(final ScheduledjobEditForm form) { - verifyCrudMode(form, CrudMode.DELETE); - scheduledJobService.delete(getScheduledJob(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; + scheduledJobService.getScheduledJob(id).ifPresent(entity -> { + scheduledJobService.delete(entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); return redirect(getClass()); } @Execute - public HtmlResponse start(final ScheduledjobEditForm form) { - verifyCrudMode(form, CrudMode.CONFIRM); - final ScheduledJob scheduledJob = getScheduledJob(form); - try { - scheduledJob.start(); - saveInfo(messages -> messages.addSuccessJobStarted(GLOBAL, scheduledJob.getName())); - } catch (final Exception e) { - throwValidationError(messages -> { - messages.addErrorsFailedToStartJob(GLOBAL, scheduledJob.getName()); - }, toEditHtml()); - } + public HtmlResponse start(final EditForm form) { + final String id = form.id; + scheduledJobService.getScheduledJob(id).ifPresent(entity -> { + try { + entity.start(); + saveInfo(messages -> messages.addSuccessJobStarted(GLOBAL, entity.getName())); + } catch (final Exception e) { + throwValidationError(messages -> { + messages.addErrorsFailedToStartJob(GLOBAL, entity.getName()); + }, toEditHtml()); + } + }).orElse(() -> { + // TODO + }); return redirect(getClass()); } @Execute - public HtmlResponse stop(final ScheduledjobEditForm form) { - verifyCrudMode(form, CrudMode.CONFIRM); - final ScheduledJob scheduledJob = getScheduledJob(form); - try { - final JobExecutor jobExecutoer = jobHelper.getJobExecutoer(scheduledJob.getId()); - jobExecutoer.shutdown(); - saveInfo(messages -> messages.addSuccessJobStopped(GLOBAL, scheduledJob.getName())); - } catch (final Exception e) { - throwValidationError(messages -> { - messages.addErrorsFailedToStopJob(GLOBAL, scheduledJob.getName()); - }, toEditHtml()); - } + public HtmlResponse stop(final EditForm form) { + verifyCrudMode(form.crudMode, CrudMode.CONFIRM); + final String id = form.id; + scheduledJobService.getScheduledJob(id).ifPresent(entity -> { + try { + final JobExecutor jobExecutoer = jobHelper.getJobExecutoer(entity.getId()); + jobExecutoer.shutdown(); + saveInfo(messages -> messages.addSuccessJobStopped(GLOBAL, entity.getName())); + } catch (final Exception e) { + throwValidationError(messages -> { + messages.addErrorsFailedToStopJob(GLOBAL, entity.getName()); + }, toEditHtml()); + } + }).orElse(() -> { + // TODO + }); return redirect(getClass()); } // =================================================================================== // Assist Logic // ============ - protected void loadScheduledJob(final ScheduledjobEditForm form) { - final ScheduledJob scheduledJob = getScheduledJob(form); - copyBeanToBean(scheduledJob, form, op -> op.exclude("crudMode")); - form.jobLogging = scheduledJob.isLoggingEnabled() ? Constants.ON : null; - form.crawler = scheduledJob.isCrawlerJob() ? Constants.ON : null; - form.available = scheduledJob.isEnabled() ? Constants.ON : null; - running = scheduledJob.isRunning(); + protected void loadScheduledJob(final EditForm form, ScheduledJob entity) { + copyBeanToBean(entity, form, op -> op.exclude("crudMode").excludeNull()); + form.jobLogging = entity.isLoggingEnabled() ? Constants.ON : null; + form.crawler = entity.isCrawlerJob() ? Constants.ON : null; + form.available = entity.isEnabled() ? Constants.ON : null; } - protected ScheduledJob getScheduledJob(final ScheduledjobEditForm form) { - final ScheduledJob scheduledJob = scheduledJobService.getScheduledJob(createKeyMap(form)); - if (scheduledJob == null) { - throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), toEditHtml()); - } - return scheduledJob; - } - - protected ScheduledJob createScheduledJob(final ScheduledjobEditForm form) { - ScheduledJob scheduledJob; + protected OptionalEntity createScheduledJob(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); - if (form.crudMode == CrudMode.EDIT) { - scheduledJob = getScheduledJob(form); - } else { - scheduledJob = new ScheduledJob(); - scheduledJob.setCreatedBy(username); - scheduledJob.setCreatedTime(currentTime); + switch (form.crudMode) { + case CrudMode.CREATE: + if (form instanceof CreateForm) { + final ScheduledJob entity = new ScheduledJob(); + entity.setCreatedBy(username); + entity.setCreatedTime(currentTime); + entity.setUpdatedBy(username); + entity.setUpdatedTime(currentTime); + copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); + entity.setJobLogging(Constants.ON.equals(form.jobLogging) ? Constants.T : Constants.F); + entity.setCrawler(Constants.ON.equals(form.crawler) ? Constants.T : Constants.F); + entity.setAvailable(Constants.ON.equals(form.available) ? Constants.T : Constants.F); + return OptionalEntity.of(entity); + } + break; + case CrudMode.EDIT: + if (form instanceof EditForm) { + return scheduledJobService.getScheduledJob(((EditForm) form).id).map(entity -> { + entity.setUpdatedBy(username); + entity.setUpdatedTime(currentTime); + copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); + entity.setJobLogging(Constants.ON.equals(form.jobLogging) ? Constants.T : Constants.F); + entity.setCrawler(Constants.ON.equals(form.crawler) ? Constants.T : Constants.F); + entity.setAvailable(Constants.ON.equals(form.available) ? Constants.T : Constants.F); + return entity; + }); + } + break; + default: + break; } - scheduledJob.setUpdatedBy(username); - scheduledJob.setUpdatedTime(currentTime); - copyBeanToBean(form, scheduledJob, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); - scheduledJob.setJobLogging(Constants.ON.equals(form.jobLogging) ? Constants.T : Constants.F); - scheduledJob.setCrawler(Constants.ON.equals(form.crawler) ? Constants.T : Constants.F); - scheduledJob.setAvailable(Constants.ON.equals(form.available) ? Constants.T : Constants.F); - return scheduledJob; - } - - protected Map createKeyMap(final ScheduledjobEditForm form) { - final Map keys = new HashMap(); - keys.put("id", form.id); - return keys; + return OptionalEntity.empty(); } // =================================================================================== // Small Helper // ============ - protected void verifyCrudMode(final ScheduledjobEditForm 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/scheduledjob/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/CreateForm.java new file mode 100644 index 000000000..1190a59fb --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/CreateForm.java @@ -0,0 +1,92 @@ +/* + * 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.scheduledjob; + +import java.io.Serializable; + +import javax.validation.constraints.Digits; +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.CronExpression; +import org.codelibs.fess.util.ComponentUtil; +import org.lastaflute.web.validation.Required; + +/** + * @author shinsuke + */ +public class CreateForm implements Serializable { + + private static final long serialVersionUID = 1L; + + @Digits(integer = 10, fraction = 0) + public int crudMode; + + @Required + @Size(max = 100) + public String name; + + @Required + @Size(max = 100) + public String target; + + @Required + @Size(max = 100) + @CronExpression + public String cronExpression; + + @Required + @Size(max = 100) + public String scriptType; + + @Size(max = 4000) + public String scriptData; + + // ignore + public String crawler; + + // ignore + public String jobLogging; + + // ignore + public String available; + + @Required + @Min(value = 0) + @Max(value = 2147483647) + @Digits(integer = 10, fraction = 0) + public Integer sortOrder; + + @Required + @Size(max = 1000) + public String createdBy; + + @Required + @Digits(integer = 19, fraction = 0) + public Long createdTime; + + public void initialize() { + target = Constants.DEFAULT_JOB_TARGET; + cronExpression = Constants.DEFAULT_CRON_EXPRESSION; + scriptType = Constants.DEFAULT_JOB_SCRIPT_TYPE; + sortOrder = 0; + createdBy = ComponentUtil.getSystemHelper().getUsername(); + createdTime = ComponentUtil.getSystemHelper().getCurrentTimeAsLong(); + + } +} diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/EditForm.java new file mode 100644 index 000000000..454b88bfa --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/EditForm.java @@ -0,0 +1,38 @@ +/* + * 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.scheduledjob; + +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; + + @Required + @Digits(integer = 10, fraction = 0) + public Integer versionNo; + +} \ No newline at end of file diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/ScheduledjobEditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/ScheduledjobEditForm.java deleted file mode 100644 index b0bbdd423..000000000 --- a/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/ScheduledjobEditForm.java +++ /dev/null @@ -1,109 +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.scheduledjob; - -import java.io.Serializable; - -import org.codelibs.fess.Constants; -import org.codelibs.fess.annotation.CronExpression; -import org.codelibs.fess.util.ComponentUtil; - -/** - * @author shinsuke - */ -public class ScheduledjobEditForm implements Serializable { - - private static final long serialVersionUID = 1L; - - //@Digits(integer=10, fraction=0) - public int crudMode; - - //@Required(target = "confirmfromupdate,update,delete") - //@Maxbytelength(maxbytelength = 1000) - public String id; - - //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - //@Maxbytelength(maxbytelength = 100) - public String name; - - //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - //@Maxbytelength(maxbytelength = 100) - public String target; - - //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - //@Maxbytelength(maxbytelength = 100) - @CronExpression - public String cronExpression; - - //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - //@Maxbytelength(maxbytelength = 100) - public String scriptType; - - //@Maxbytelength(maxbytelength = 4000) - public String scriptData; - - // ignore - public String crawler; - - // ignore - public String jobLogging; - - // ignore - public String available; - - //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - //@Digits(integer=10, fraction=0) - //@IntRange(min = 0, max = 2147483647) - public String sortOrder; - - //@Required(target = "confirmfromupdate,update,delete") - public String createdBy; - - //@Required(target = "confirmfromupdate,update,delete") - //@Digits(integer=19, fraction=0) - public String createdTime; - - 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; - name = null; - target = null; - cronExpression = null; - scriptType = null; - scriptData = null; - crawler = null; - jobLogging = null; - available = null; - sortOrder = null; - createdBy = "system"; - createdTime = Long.toString(ComponentUtil.getSystemHelper().getCurrentTimeAsLong()); - updatedBy = null; - updatedTime = null; - versionNo = null; - target = Constants.DEFAULT_JOB_TARGET; - cronExpression = Constants.DEFAULT_CRON_EXPRESSION; - scriptType = Constants.DEFAULT_JOB_SCRIPT_TYPE; - sortOrder = "0"; - } -} diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/ScheduledjobSearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/SearchForm.java similarity index 80% rename from src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/ScheduledjobSearchForm.java rename to src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/SearchForm.java index 67a9f10a4..02893f676 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/ScheduledjobSearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/SearchForm.java @@ -16,15 +16,13 @@ package org.codelibs.fess.app.web.admin.scheduledjob; import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; /** * @author shinsuke */ -public class ScheduledjobSearchForm implements Serializable { +public class SearchForm implements Serializable { private static final long serialVersionUID = 1L; - public Map searchParams = new HashMap(); + public String id; }