diff --git a/src/main/java/org/codelibs/fess/crud/service/BsScheduledJobService.java b/src/main/java/org/codelibs/fess/crud/service/BsScheduledJobService.java deleted file mode 100644 index 1404d9eab..000000000 --- a/src/main/java/org/codelibs/fess/crud/service/BsScheduledJobService.java +++ /dev/null @@ -1,101 +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.crud.service; - -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - -import org.codelibs.fess.crud.CommonConstants; -import org.codelibs.fess.crud.CrudMessageException; -import org.codelibs.fess.db.cbean.ScheduledJobCB; -import org.codelibs.fess.db.exbhv.ScheduledJobBhv; -import org.codelibs.fess.db.exentity.ScheduledJob; -import org.codelibs.fess.pager.ScheduledJobPager; -import org.dbflute.cbean.result.PagingResultBean; -import org.seasar.framework.beans.util.Beans; - -public abstract class BsScheduledJobService { - - @Resource - protected ScheduledJobBhv scheduledJobBhv; - - public BsScheduledJobService() { - super(); - } - - public List getScheduledJobList(final ScheduledJobPager scheduledJobPager) { - - final PagingResultBean scheduledJobList = scheduledJobBhv.selectPage(cb -> { - cb.paging(scheduledJobPager.getPageSize(), scheduledJobPager.getCurrentPageNumber()); - setupListCondition(cb, scheduledJobPager); - }); - - // update pager - Beans.copy(scheduledJobList, scheduledJobPager).includes(CommonConstants.PAGER_CONVERSION_RULE).execute(); - scheduledJobPager.setPageNumberList(scheduledJobList.pageRange(op -> { - op.rangeSize(5); - }).createPageNumberList()); - - return scheduledJobList; - } - - public ScheduledJob getScheduledJob(final Map keys) { - final ScheduledJob scheduledJob = scheduledJobBhv.selectEntity(cb -> { - cb.query().setId_Equal(Long.parseLong(keys.get("id"))); - setupEntityCondition(cb, keys); - }).orElse(null);//TODO - if (scheduledJob == null) { - // TODO exception? - return null; - } - - return scheduledJob; - } - - public void store(final ScheduledJob scheduledJob) throws CrudMessageException { - setupStoreCondition(scheduledJob); - - scheduledJobBhv.insertOrUpdate(scheduledJob); - - } - - public void delete(final ScheduledJob scheduledJob) throws CrudMessageException { - setupDeleteCondition(scheduledJob); - - scheduledJobBhv.delete(scheduledJob); - - } - - protected void setupListCondition(final ScheduledJobCB cb, final ScheduledJobPager scheduledJobPager) { - - if (scheduledJobPager.id != null) { - cb.query().setId_Equal(Long.parseLong(scheduledJobPager.id)); - } - // TODO Long, Integer, String supported only. - } - - protected void setupEntityCondition(final ScheduledJobCB cb, final Map keys) { - } - - protected void setupStoreCondition(final ScheduledJob scheduledJob) { - } - - protected void setupDeleteCondition(final ScheduledJob scheduledJob) { - } -} \ No newline at end of file diff --git a/src/main/java/org/codelibs/fess/service/ScheduledJobService.java b/src/main/java/org/codelibs/fess/service/ScheduledJobService.java index 780e21328..c23593f76 100644 --- a/src/main/java/org/codelibs/fess/service/ScheduledJobService.java +++ b/src/main/java/org/codelibs/fess/service/ScheduledJobService.java @@ -23,22 +23,71 @@ import java.util.Map; import javax.annotation.Resource; import org.codelibs.fess.Constants; -import org.codelibs.fess.crud.service.BsScheduledJobService; +import org.codelibs.fess.crud.CommonConstants; +import org.codelibs.fess.crud.CrudMessageException; import org.codelibs.fess.db.cbean.ScheduledJobCB; +import org.codelibs.fess.db.exbhv.ScheduledJobBhv; import org.codelibs.fess.db.exentity.ScheduledJob; import org.codelibs.fess.job.JobScheduler; import org.codelibs.fess.pager.ScheduledJobPager; +import org.dbflute.cbean.result.PagingResultBean; +import org.seasar.framework.beans.util.Beans; -public class ScheduledJobService extends BsScheduledJobService implements Serializable { +public class ScheduledJobService implements Serializable { private static final long serialVersionUID = 1L; + @Resource + protected ScheduledJobBhv scheduledJobBhv; + + public ScheduledJobService() { + super(); + } + + public List getScheduledJobList(final ScheduledJobPager scheduledJobPager) { + + final PagingResultBean scheduledJobList = scheduledJobBhv.selectPage(cb -> { + cb.paging(scheduledJobPager.getPageSize(), scheduledJobPager.getCurrentPageNumber()); + setupListCondition(cb, scheduledJobPager); + }); + + // update pager + Beans.copy(scheduledJobList, scheduledJobPager).includes(CommonConstants.PAGER_CONVERSION_RULE).execute(); + scheduledJobPager.setPageNumberList(scheduledJobList.pageRange(op -> { + op.rangeSize(5); + }).createPageNumberList()); + + return scheduledJobList; + } + + public ScheduledJob getScheduledJob(final Map keys) { + final ScheduledJob scheduledJob = scheduledJobBhv.selectEntity(cb -> { + cb.query().setId_Equal(Long.parseLong(keys.get("id"))); + setupEntityCondition(cb, keys); + }).orElse(null);//TODO + if (scheduledJob == null) { + // TODO exception? + return null; + } + + return scheduledJob; + } + + public void delete(final ScheduledJob scheduledJob) throws CrudMessageException { + setupDeleteCondition(scheduledJob); + + scheduledJobBhv.delete(scheduledJob); + + } + @Resource protected JobScheduler jobScheduler; - @Override protected void setupListCondition(final ScheduledJobCB cb, final ScheduledJobPager scheduledJobPager) { - super.setupListCondition(cb, scheduledJobPager); + if (scheduledJobPager.id != null) { + cb.query().setId_Equal(Long.parseLong(scheduledJobPager.id)); + } + // TODO Long, Integer, String supported only. // setup condition cb.query().setDeletedBy_IsNull(); @@ -49,26 +98,20 @@ public class ScheduledJobService extends BsScheduledJobService implements Serial } - @Override protected void setupEntityCondition(final ScheduledJobCB cb, final Map keys) { - super.setupEntityCondition(cb, keys); // setup condition cb.query().setDeletedBy_IsNull(); } - @Override protected void setupStoreCondition(final ScheduledJob scheduledJob) { - super.setupStoreCondition(scheduledJob); // setup condition } - @Override protected void setupDeleteCondition(final ScheduledJob scheduledJob) { - super.setupDeleteCondition(scheduledJob); // setup condition @@ -82,11 +125,12 @@ public class ScheduledJobService extends BsScheduledJobService implements Serial }); } - @Override public void store(final ScheduledJob scheduledJob) { final boolean isNew = scheduledJob.getId() == null; final boolean isDelete = scheduledJob.getDeletedBy() != null; - super.store(scheduledJob); + setupStoreCondition(scheduledJob); + + scheduledJobBhv.insertOrUpdate(scheduledJob); if (!isNew) { jobScheduler.unregister(scheduledJob); }