diff --git a/src/main/java/org/codelibs/fess/crud/service/BsRequestHeaderService.java b/src/main/java/org/codelibs/fess/crud/service/BsRequestHeaderService.java deleted file mode 100644 index 95614be4c..000000000 --- a/src/main/java/org/codelibs/fess/crud/service/BsRequestHeaderService.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.RequestHeaderCB; -import org.codelibs.fess.db.exbhv.RequestHeaderBhv; -import org.codelibs.fess.db.exentity.RequestHeader; -import org.codelibs.fess.pager.RequestHeaderPager; -import org.dbflute.cbean.result.PagingResultBean; -import org.seasar.framework.beans.util.Beans; - -public abstract class BsRequestHeaderService { - - @Resource - protected RequestHeaderBhv requestHeaderBhv; - - public BsRequestHeaderService() { - super(); - } - - public List getRequestHeaderList(final RequestHeaderPager requestHeaderPager) { - - final PagingResultBean requestHeaderList = requestHeaderBhv.selectPage(cb -> { - cb.paging(requestHeaderPager.getPageSize(), requestHeaderPager.getCurrentPageNumber()); - setupListCondition(cb, requestHeaderPager); - }); - - // update pager - Beans.copy(requestHeaderList, requestHeaderPager).includes(CommonConstants.PAGER_CONVERSION_RULE).execute(); - requestHeaderPager.setPageNumberList(requestHeaderList.pageRange(op -> { - op.rangeSize(5); - }).createPageNumberList()); - - return requestHeaderList; - } - - public RequestHeader getRequestHeader(final Map keys) { - final RequestHeader requestHeader = requestHeaderBhv.selectEntity(cb -> { - cb.query().setId_Equal(Long.parseLong(keys.get("id"))); - setupEntityCondition(cb, keys); - }).orElse(null);//TODO - if (requestHeader == null) { - // TODO exception? - return null; - } - - return requestHeader; - } - - public void store(final RequestHeader requestHeader) throws CrudMessageException { - setupStoreCondition(requestHeader); - - requestHeaderBhv.insertOrUpdate(requestHeader); - - } - - public void delete(final RequestHeader requestHeader) throws CrudMessageException { - setupDeleteCondition(requestHeader); - - requestHeaderBhv.delete(requestHeader); - - } - - protected void setupListCondition(final RequestHeaderCB cb, final RequestHeaderPager requestHeaderPager) { - - if (requestHeaderPager.id != null) { - cb.query().setId_Equal(Long.parseLong(requestHeaderPager.id)); - } - // TODO Long, Integer, String supported only. - } - - protected void setupEntityCondition(final RequestHeaderCB cb, final Map keys) { - } - - protected void setupStoreCondition(final RequestHeader requestHeader) { - } - - protected void setupDeleteCondition(final RequestHeader requestHeader) { - } -} \ No newline at end of file diff --git a/src/main/java/org/codelibs/fess/service/RequestHeaderService.java b/src/main/java/org/codelibs/fess/service/RequestHeaderService.java index 92ffe0eaa..45b3d5132 100644 --- a/src/main/java/org/codelibs/fess/service/RequestHeaderService.java +++ b/src/main/java/org/codelibs/fess/service/RequestHeaderService.java @@ -20,18 +20,76 @@ import java.io.Serializable; import java.util.List; import java.util.Map; -import org.codelibs.fess.crud.service.BsRequestHeaderService; +import javax.annotation.Resource; + +import org.codelibs.fess.crud.CommonConstants; +import org.codelibs.fess.crud.CrudMessageException; import org.codelibs.fess.db.cbean.RequestHeaderCB; +import org.codelibs.fess.db.exbhv.RequestHeaderBhv; import org.codelibs.fess.db.exentity.RequestHeader; import org.codelibs.fess.pager.RequestHeaderPager; +import org.dbflute.cbean.result.PagingResultBean; +import org.seasar.framework.beans.util.Beans; -public class RequestHeaderService extends BsRequestHeaderService implements Serializable { +public class RequestHeaderService implements Serializable { private static final long serialVersionUID = 1L; - @Override + @Resource + protected RequestHeaderBhv requestHeaderBhv; + + public RequestHeaderService() { + super(); + } + + public List getRequestHeaderList(final RequestHeaderPager requestHeaderPager) { + + final PagingResultBean requestHeaderList = requestHeaderBhv.selectPage(cb -> { + cb.paging(requestHeaderPager.getPageSize(), requestHeaderPager.getCurrentPageNumber()); + setupListCondition(cb, requestHeaderPager); + }); + + // update pager + Beans.copy(requestHeaderList, requestHeaderPager).includes(CommonConstants.PAGER_CONVERSION_RULE).execute(); + requestHeaderPager.setPageNumberList(requestHeaderList.pageRange(op -> { + op.rangeSize(5); + }).createPageNumberList()); + + return requestHeaderList; + } + + public RequestHeader getRequestHeader(final Map keys) { + final RequestHeader requestHeader = requestHeaderBhv.selectEntity(cb -> { + cb.query().setId_Equal(Long.parseLong(keys.get("id"))); + setupEntityCondition(cb, keys); + }).orElse(null);//TODO + if (requestHeader == null) { + // TODO exception? + return null; + } + + return requestHeader; + } + + public void store(final RequestHeader requestHeader) throws CrudMessageException { + setupStoreCondition(requestHeader); + + requestHeaderBhv.insertOrUpdate(requestHeader); + + } + + public void delete(final RequestHeader requestHeader) throws CrudMessageException { + setupDeleteCondition(requestHeader); + + requestHeaderBhv.delete(requestHeader); + + } + protected void setupListCondition(final RequestHeaderCB cb, final RequestHeaderPager requestHeaderPager) { - super.setupListCondition(cb, requestHeaderPager); + if (requestHeaderPager.id != null) { + cb.query().setId_Equal(Long.parseLong(requestHeaderPager.id)); + } + // TODO Long, Integer, String supported only. // setup condition cb.setupSelect_WebCrawlingConfig(); @@ -43,26 +101,20 @@ public class RequestHeaderService extends BsRequestHeaderService implements Seri } - @Override protected void setupEntityCondition(final RequestHeaderCB cb, final Map keys) { - super.setupEntityCondition(cb, keys); // setup condition cb.query().setDeletedBy_IsNull(); } - @Override protected void setupStoreCondition(final RequestHeader requestHeader) { - super.setupStoreCondition(requestHeader); // setup condition } - @Override protected void setupDeleteCondition(final RequestHeader requestHeader) { - super.setupDeleteCondition(requestHeader); // setup condition